From db509850408d61f0bdbf652a962e23b15a24faa1 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 23 Jul 2019 09:52:17 -0500 Subject: [PATCH] Format the @autoreleasepool blocks in kitty/cocoa_window.m like in GLFW --- kitty/cocoa_window.m | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m index 01007b756..78231bb98 100644 --- a/kitty/cocoa_window.m +++ b/kitty/cocoa_window.m @@ -232,6 +232,7 @@ cocoa_send_notification(PyObject *self UNUSED, PyObject *args) { void cocoa_create_global_menu(void) { @autoreleasepool { + NSString* app_name = find_app_name(); NSMenu* bar = [[NSMenu alloc] init]; GlobalMenuTarget *global_menu_target = [GlobalMenuTarget shared_instance]; @@ -323,7 +324,8 @@ cocoa_create_global_menu(void) { [NSApp setServicesProvider:[[[ServiceProvider alloc] init] autorelease]]; - } + + } // autoreleasepool } void @@ -394,6 +396,7 @@ cocoa_get_workspace_ids(void *w, size_t *workspace_ids, size_t array_sz) { static PyObject* cocoa_get_lang(PyObject UNUSED *self) { @autoreleasepool { + NSString* locale = nil; NSString* lang_code = [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]; NSString* country_code = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode]; @@ -404,12 +407,14 @@ cocoa_get_lang(PyObject UNUSED *self) { } if (!locale) { Py_RETURN_NONE; } return Py_BuildValue("s", [locale UTF8String]); - } + + } // autoreleasepool } double cocoa_cursor_blink_interval(void) { @autoreleasepool { + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; double on_period_ms = [defaults doubleForKey:@"NSTextInsertionPointBlinkPeriodOn"]; double off_period_ms = [defaults doubleForKey:@"NSTextInsertionPointBlinkPeriodOff"]; @@ -421,7 +426,8 @@ cocoa_cursor_blink_interval(void) { ans = period_ms; } return ans > max_value ? 0.0 : ans; - } + + } // autoreleasepool } void @@ -433,6 +439,7 @@ void cocoa_set_titlebar_color(void *w, color_type titlebar_color) { @autoreleasepool { + NSWindow *window = (NSWindow *)w; double red = ((titlebar_color >> 16) & 0xFF) / 255.0; @@ -454,17 +461,20 @@ cocoa_set_titlebar_color(void *w, color_type titlebar_color) } else { [window setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]]; } - } + + } // autoreleasepool } static void cleanup() { @autoreleasepool { + if (dockMenu) [dockMenu release]; dockMenu = nil; if (notification_activated_callback) Py_DECREF(notification_activated_callback); notification_activated_callback = NULL; - } + + } // autoreleasepool } static PyMethodDef module_methods[] = {