gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-06-02 18:21:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert unintended change

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@18366 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-01-10 20:02:26 +00:00
parent 47c37caf62
commit fa9714776f
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Headers/x11/XGGeneric.h
View file

@ -76,7 +76,6 @@ struct XGGeneric {
long currentFocusWindow; long currentFocusWindow;
long desiredFocusWindow; long desiredFocusWindow;
unsigned long focusRequestNumber; unsigned long focusRequestNumber;
unsigned long desiredOrderedWindow;
unsigned char lMouse; unsigned char lMouse;
unsigned char mMouse; unsigned char mMouse;
unsigned char rMouse; unsigned char rMouse;

6
Source/x11/XGServerEvent.m
View file

@ -1300,12 +1300,6 @@ static inline int check_modifier (XEvent *xEvent, KeyCode key_code)
NSDebugLLog(@"Focus", @"Key window is already %d", key_num); NSDebugLLog(@"Focus", @"Key window is already %d", key_num);
[GSServerForWindow(key_win) setinputfocus: key_num]; [GSServerForWindow(key_win) setinputfocus: key_num];
} }
else if (generic.desiredOrderedWindow == cWin->number)
{
/* We just want to order the window, not give it focus */
NSDebugLLog(@"Focus", @"Ignoring focus request");
generic.desiredOrderedWindow = 0;
}
else else
{ {
NSPoint eventLocation; NSPoint eventLocation;

3
Source/x11/XGServerWindow.m
View file

@ -1577,8 +1577,6 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
XMoveWindow(dpy, window->ident, window->siz_hints.x, XMoveWindow(dpy, window->ident, window->siz_hints.x,
window->siz_hints.y); window->siz_hints.y);
setNormalHints(dpy, window); setNormalHints(dpy, window);
/* Set this to ignore any take focus events for this window */
generic.desiredOrderedWindow = winNum;
} }
switch (op) switch (op)
@ -2353,7 +2351,6 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
NSDebugLLog(@"Focus", @"Setting focus to %d", window->number); NSDebugLLog(@"Focus", @"Setting focus to %d", window->number);
generic.desiredFocusWindow = win; generic.desiredFocusWindow = win;
generic.focusRequestNumber = XNextRequest(dpy); generic.focusRequestNumber = XNextRequest(dpy);
generic.desiredOrderedWindow = 0;
XSetInputFocus(dpy, window->ident, RevertToParent, generic.lastTime); XSetInputFocus(dpy, window->ident, RevertToParent, generic.lastTime);
[inputServer ximFocusICWindow: window]; [inputServer ximFocusICWindow: window];
} }