summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/macos.m6
-rw-r--r--src/main.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/src/macos.m b/src/macos.m
index a4f2b079..35594b7b 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -402,8 +402,10 @@ void registerURLHandler_MacOS(void) {
402 [handler release]; 402 [handler release];
403} 403}
404 404
405void setupApplication_MacOS(void) { 405void setupApplication_MacOS(void) {
406 NSApplication *app = [NSApplication sharedApplication]; 406 NSApplication *app = [NSApplication sharedApplication];
407 [app setActivationPolicy:NSApplicationActivationPolicyRegular];
408 [app activateIgnoringOtherApps:YES];
407 /* Our delegate will override SDL's delegate. */ 409 /* Our delegate will override SDL's delegate. */
408 MyDelegate *myDel = [[MyDelegate alloc] initWithSDLDelegate:app.delegate]; 410 MyDelegate *myDel = [[MyDelegate alloc] initWithSDLDelegate:app.delegate];
409 [myDel setAppearance:currentSystemAppearance_()]; 411 [myDel setAppearance:currentSystemAppearance_()];
@@ -539,7 +541,7 @@ enum iColorId removeColorEscapes_String(iString *d) {
539 return color; 541 return color;
540} 542}
541 543
542// returns the selected item, if any 544/* returns the selected item, if any */
543static NSMenuItem *makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iMenuItem *items, size_t n) { 545static NSMenuItem *makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iMenuItem *items, size_t n) {
544 NSMenuItem *selectedItem = nil; 546 NSMenuItem *selectedItem = nil;
545 for (size_t i = 0; i < n && items[i].label; ++i) { 547 for (size_t i = 0; i < n && items[i].label; ++i) {
diff --git a/src/main.c b/src/main.c
index e735f713..f7ac6522 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,6 +68,7 @@ int main(int argc, char **argv) {
68 SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1"); 68 SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
69 SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1"); 69 SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
70 SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0"); 70 SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
71 SDL_SetHint(SDL_HINT_MAC_BACKGROUND_APP, "1");
71#if 0 72#if 0
72 SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1"); /* debugging! */ 73 SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1"); /* debugging! */
73#endif 74#endif