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

* Source/x11/XGServerEvent.m (_handleTakeFocusAtom:forContext:): key_window

Browse source 
definition moved to the `if` block where it's used.
This commit is contained in:
Sergii Stoian 2020-01-16 19:47:48 +02:00
parent a1f08ad8ca
commit 9cc708e9e8
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/x11/XGServerEvent.m
View file

@ -1911,14 +1911,9 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
- (NSEvent *)_handleTakeFocusAtom: (XEvent)xEvent
forContext: (NSGraphicsContext *)gcontext
{
int key_num;
NSWindow *keyWindow;
NSWindow *keyWindow = [NSApp keyWindow];
int key_num = [keyWindow windowNumber];
NSEvent *e = nil;
gswindow_device_t *key_window;
keyWindow = [NSApp keyWindow];
key_num = [keyWindow windowNumber];
key_window = [XGServer _windowWithTag:key_num];
NSDebugLLog(@"Focus",
@"TakeFocus received by: %li (%lu) (focused = %lu, key = %d)",
@ -1968,9 +1963,10 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
NSDebugLLog(@"Focus", @"Reasserting key window");
[GSServerForWindow(keyWindow) setinputfocus: key_num];
}
else if (key_num
else if (key_num
&& cWin->number == [[[NSApp mainMenu] window] windowNumber])
{
gswindow_device_t *key_window = [XGServer _windowWithTag:key_num];
/* This might occur when the window manager just wants someone
to become key, so it tells the main menu (typically the first
menu in the list), but since we already have a window that