gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 17:31:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't set FocusWindow Attrib. Fixes crash on XCloseDisplay

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14153 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2002-07-15 03:11:11 +00:00
parent 05c16db3b3
commit df9e5ae1ce
4 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,8 +1,7 @@
2002-07-14 Adam Fedor <fedor@gnu.org> 2002-07-14 Adam Fedor <fedor@gnu.org>
* Source/x11/XGServer.m ([XGServer -dealloc]): Don't close * Source/x11/XIMInputServer.m (-ximCreateIC:): Don't set
the display (except when DEBUG), till we figure out why it FocusWindow attrib. Causes a segfault at XCloseDisplay..
always crashes here.
2002-07-13 Adam Fedor <fedor@gnu.org> 2002-07-13 Adam Fedor <fedor@gnu.org>

4
Source/x11/XGServer.m
View file

@ -420,11 +420,7 @@ _parse_display_name(NSString *name, int *dn, int *sn)
DESTROY(inputServer); DESTROY(inputServer);
[self _destroyServerWindows]; [self _destroyServerWindows];
NSFreeMapTable(screenList); NSFreeMapTable(screenList);
#ifdef DEBUG
/* FIXME: Avoid doing this until we figure out why we always
segfault here */
XCloseDisplay(dpy); XCloseDisplay(dpy);
#endif
[super dealloc]; [super dealloc];
} }

2
Source/x11/XGServerWindow.m
View file

@ -2140,7 +2140,7 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
NSDebugLLog(@"Focus", @"Setting focus to unknown win %d", win); NSDebugLLog(@"Focus", @"Setting focus to unknown win %d", win);
return; return;
} }
NSDebugLLog(@"XGTrace", @"DPSsetinputfocus: %d", win); NSDebugLLog(@"XGTrace", @"DPSsetinputfocus: %d", win);
/* /*
* If we have an outstanding request to set focus to this window, * If we have an outstanding request to set focus to this window,

2
Source/x11/XIMInputServer.m
View file

@ -313,7 +313,7 @@
{ {
XIC xic; XIC xic;
xic = XCreateIC(xim, XNClientWindow, w, XNInputStyle, xic = XCreateIC(xim, XNClientWindow, w, XNInputStyle,
xim_style, XNFocusWindow, w, NULL); xim_style, NULL);
if (xic==NULL) if (xic==NULL)
NSDebugLLog(@"XIM", @"Can't create the input context.\n"); NSDebugLLog(@"XIM", @"Can't create the input context.\n");
return xic; return xic;