KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix move to GLFW event loop breaking using macOS native quit action with no windows open.

Browse Source 
Fixes #1476
This commit is contained in:
Kovid Goyal 2019-03-17 12:27:41 +05:30
parent e9e4ac13ee
commit 136f15e647
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/glfw.c
View File

@ -123,6 +123,14 @@ window_close_callback(GLFWwindow* window) {
global_state.callback_os_window = NULL; global_state.callback_os_window = NULL;
} }
#ifdef __APPLE__
static void
application_quit_canary_close_requested(GLFWwindow *window UNUSED) {
global_state.has_pending_closes = true;
request_tick_callback();
}
#endif
static void static void
window_occlusion_callback(GLFWwindow *window, bool occluded UNUSED) { window_occlusion_callback(GLFWwindow *window, bool occluded UNUSED) {
if (!set_callback_window(window)) return; if (!set_callback_window(window)) return;
@ -539,6 +547,7 @@ create_os_window(PyObject UNUSED *self, PyObject *args) {
#ifdef __APPLE__ #ifdef __APPLE__
if (is_first_window && !application_quit_canary) { if (is_first_window && !application_quit_canary) {
application_quit_canary = glfwCreateWindow(100, 200, "quit_canary", NULL, NULL); application_quit_canary = glfwCreateWindow(100, 200, "quit_canary", NULL, NULL);
glfwSetWindowCloseCallback(application_quit_canary, application_quit_canary_close_requested);
} }
if (!common_context) common_context = application_quit_canary; if (!common_context) common_context = application_quit_canary;
#endif #endif