darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-23 04:00:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround freezing bug on window close requests

Browse Source 
I'm not entirely sure what was wrong with the old approach of calling it directly, but scheduling the call onto the run loop fixes the freezing.

This commit also fixes a segfault when accessing an invalid window via `lastFocusedWindow`. The issue is that we sometimes don't get FocusOut before a window dies, so we have to set it to nil when it tells us that it's dying.
This commit is contained in:
Ariel Abreu 2021-01-25 23:22:30 -05:00
parent 94994590ac
commit f585c80808
No known key found for this signature in database
GPG Key ID: BB20848279B910AC
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
AppKit/X11.backend/X11Display.m
View File

@ -813,9 +813,17 @@ static NSDictionary *modeInfoToDictionary(const XRRModeInfo *mi, int depth) {
setObject: window
forKey: [NSNumber
numberWithUnsignedLong: (unsigned long) i]];
else
else {
[_windowsByID removeObjectForKey: [NSNumber numberWithUnsignedLong:
(unsigned long) i]];
// if "lastFocusedWindow" is dying, drop it
//
// this is an ugly hack because we miss FocusOut events sometimes and
// retaining the window causes it to keep popping back up endlessly even after dismissing it
if (lastFocusedWindow && [[lastFocusedWindow platformWindow] windowHandle] == i)
lastFocusedWindow = nil;
}
}
- (id) windowForID: (XID) i {
@ -1084,6 +1092,7 @@ static NSDictionary *modeInfoToDictionary(const XRRModeInfo *mi, int depth) {
break;
case FocusIn:
NSLog(@"FocusIn");
if ([delegate attachedSheet]) {
[[delegate attachedSheet] makeKeyAndOrderFront: delegate];
break;
@ -1098,6 +1107,7 @@ static NSDictionary *modeInfoToDictionary(const XRRModeInfo *mi, int depth) {
break;
case FocusOut:
NSLog(@"FocusOut");
[delegate platformWindowDeactivated: window
checkForAppDeactivation: NO];
lastFocusedWindow = nil;
@ -1219,8 +1229,20 @@ static NSDictionary *modeInfoToDictionary(const XRRModeInfo *mi, int depth) {
case ClientMessage:
if (ev->xclient.format == 32 &&
ev->xclient.data.l[0] ==
XInternAtom(_display, "WM_DELETE_WINDOW", False))
[delegate platformWindowWillClose: window];
XInternAtom(_display, "WM_DELETE_WINDOW", False)) {
NSLog(@"ClientMessage:WM_DELETE_WINDOW");
[[NSRunLoop currentRunLoop] cancelPerformSelector: @selector(platformWindowWillClose:)
target: delegate
argument: window];
[[NSRunLoop currentRunLoop] performSelector: @selector(platformWindowWillClose:)
target: delegate
argument: window
order: 0
modes: @[
NSDefaultRunLoopMode, NSModalPanelRunLoopMode,
NSEventTrackingRunLoopMode
]];
}
break;
case MappingNotify: