gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-25 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update for new window methods

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@13258 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2002-03-28 04:08:55 +00:00
parent 685bcf200f
commit 921c204394
5 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2002-03-27 Adam Fedor <fedor@gnu.org>
* Source/x11/GNUmakefile: Get headers from right place.
* Source/xlib/GNUmakefile: Remove invalid header.
* Source/x11/XGServerWindow.m (-window:::): Change method to
match frontend (including setting of style).
2002-03-27 Adam Fedor <fedor@gnu.org> 2002-03-27 Adam Fedor <fedor@gnu.org>
* Version: Initial version (most code extracted from xgps). * Version: Initial version (most code extracted from xgps).

2
Source/x11/GNUmakefile
View file

@ -65,7 +65,7 @@ XGDragView.m \
XGSlideView.m \ XGSlideView.m \
XIMInputServer.m XIMInputServer.m
x11_HEADER_FILES_DIR = ../Headers/x11 x11_HEADER_FILES_DIR = ../../Headers/x11
x11_HEADER_FILES_INSTALL_DIR = gnustep/x11 x11_HEADER_FILES_INSTALL_DIR = gnustep/x11
x11_HEADER_FILES = \ x11_HEADER_FILES = \

15
Source/x11/XGServerWindow.m
View file

@ -868,7 +868,7 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
XSetWindowBackgroundPixmap(XDPY, window->ident, window->buffer); XSetWindowBackgroundPixmap(XDPY, window->ident, window->buffer);
} }
- (int) window: (NSRect)frame : (NSBackingStoreType)type - (int) window: (NSRect)frame : (NSBackingStoreType)type : (unsigned int)style
{ {
static int last_win_num = 0; static int last_win_num = 0;
gswindow_device_t *window; gswindow_device_t *window;
@ -951,9 +951,11 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
/* /*
* Prepare size/position hints, but don't set them now - ordering * Prepare size/position hints, but don't set them now - ordering
* the window in should automatically do it. * the window in should automatically do it.
* Note: These hints are most likely wrong, but should be fixed up
* when DPSstylewindow is called.
*/ */
window->win_attrs.flags |= GSWindowStyleAttr;
window->win_attrs.window_style = style;
frame = [self _XFrameToOSFrame: window->xframe for: window];
frame = [self _OSFrameToXHints: frame for: window];
window->siz_hints.x = NSMinX(frame); window->siz_hints.x = NSMinX(frame);
window->siz_hints.y = NSMinY(frame); window->siz_hints.y = NSMinY(frame);
window->siz_hints.width = NSWidth(frame); window->siz_hints.width = NSWidth(frame);
@ -1022,7 +1024,7 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
return; return;
} }
NSDebugLLog(@"XGTrace", @"DPSwindow: %d", win); NSDebugLLog(@"XGTrace", @"DPStermwindow: %d", win);
if (window->ic) if (window->ic)
{ {
[inputServer ximCloseIC: window->ic]; [inputServer ximCloseIC: window->ic];
@ -1174,6 +1176,11 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
} }
} }
- (void) windowbacking: (NSBackingStoreType)type
{
[self subclassResponsibility: _cmd];
}
- (void) titlewindow: (NSString *)window_title : (int) win - (void) titlewindow: (NSString *)window_title : (int) win
{ {
XTextProperty windowName; XTextProperty windowName;

3
Source/xlib/GNUmakefile
View file

@ -62,8 +62,7 @@ xlib_HEADER_FILES = \
XGContext.h \ XGContext.h \
XGPrivate.h \ XGPrivate.h \
XGGeometry.h \ XGGeometry.h \
XGGState.h \ XGGState.h
XGGStateOps.h
-include GNUmakefile.preamble -include GNUmakefile.preamble

28
config.h
View file

@ -1,28 +0,0 @@
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
/* Define if the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
#define XSHM 1
#define WITH_WRASTER 1
#define HAVE_XFT 1
/* #undef USE_XIM */
/* #undef BUILD_XLIB */
#define BUILD_XDPS 1
#define BUILD_X11 1
/* #undef BUILD_WIN32 */
/* #undef BUILD_WINLIB */
/* Define if you have the <DPS/dpsNXargs.h> header file. */
#define HAVE_DPS_DPSNXARGS_H 1
/* Define if you have the <DPS/dpsclient.h> header file. */
#define HAVE_DPS_DPSCLIENT_H 1
/* Define if you have the <wraster.h> header file. */
/* #undef HAVE_WRASTER_H */