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

Nicer signal handling in cocoa for the notification run loop

Browse Source
This commit is contained in:
Kovid Goyal 2019-01-30 14:50:04 +05:30
parent c7a0626c69
commit 10f5461cd8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kitty/cocoa_window.m
View File

@ -177,11 +177,6 @@ cocoa_send_notification(PyObject *self UNUSED, PyObject *args) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static void
SIGTERM_handler(int signum UNUSED) {
exit(EXIT_FAILURE);
}
static void static void
call_timer_callback(PyObject *timer_callback) { call_timer_callback(PyObject *timer_callback) {
PyObject *ret = PyObject_CallObject(timer_callback, NULL); PyObject *ret = PyObject_CallObject(timer_callback, NULL);
@ -194,12 +189,22 @@ cocoa_run_notification_loop(PyObject *self UNUSED, PyObject *args) {
PyObject *timer_callback; PyObject *timer_callback;
double timeout; double timeout;
if (!PyArg_ParseTuple(args, "OOd", &notification_activated_callback, &timer_callback, &timeout)) return NULL; if (!PyArg_ParseTuple(args, "OOd", &notification_activated_callback, &timer_callback, &timeout)) return NULL;
signal(SIGTERM, SIGTERM_handler);
signal(SIGINT, SIGTERM_handler);
NSAutoreleasePool *pool = [NSAutoreleasePool new]; NSAutoreleasePool *pool = [NSAutoreleasePool new];
NSApplication * application = [NSApplication sharedApplication]; NSApplication * application = [NSApplication sharedApplication];
// prevent icon in dock // prevent icon in dock
[application setActivationPolicy:NSApplicationActivationPolicyAccessory]; [application setActivationPolicy:NSApplicationActivationPolicyAccessory];
signal(SIGTERM, SIG_IGN);
signal(SIGINT, SIG_IGN);
dispatch_source_t sigint = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGINT, 0, dispatch_get_main_queue());
dispatch_source_set_event_handler(sigint, ^{
[application terminate:nil];
});
dispatch_resume(sigint);
dispatch_source_t sigterm = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGINT, 0, dispatch_get_main_queue());
dispatch_source_set_event_handler(sigterm, ^{
[application terminate:nil];
});
dispatch_resume(sigterm);
// timer will fire after timeout, so fire it once at the start // timer will fire after timeout, so fire it once at the start
call_timer_callback(timer_callback); call_timer_callback(timer_callback);
[NSTimer scheduledTimerWithTimeInterval:timeout [NSTimer scheduledTimerWithTimeInterval:timeout