OSX: use native Cocoa's event loop

Schedule mpv's playloop as a high frequency timer inside the main Cocoa event
loop. This has the benefit to allow accessing menus as well as resizing the
window without the playback being blocked and allows to remove countless hacks
from the code that involved manually pumping the event loop as well simulating
manually some of the Cocoa default behaviours.

A huge improvement consists in removing NSApplicationLoad. This is a C function
defined in the Cocoa header and implements a minimal OSX application under ther
hood so that you can use the Cocoa GUI toolkit from C/C++ without having to
respect the Cocoa standards in terms of application initialization. This was
bad because the behaviour implemented by NSApplicationLoad was hard to customize
and had several gotchas especially in the menu department.

mpv was changed to be just a nib-less application. All the Cocoa part is still
generated in code but the event handling is now not dissimilar to what is
present in a stock Mac application.

As a part of reviewing the initialization process, I also removed all of
`osdep/macosx_finder_args`. The useful parts of the code were moved to
`osdep/macosx_appication` which has the broaded responsibility of managing the
full lifecycle of the Cocoa application. By consequence the
`--enable-macosx-finder` configure switch was killed as well, as this feature
is always enabled.

Another change the users will notice is that when using a bundle the `--quiet`
option will be inserted much earlier in the initializaion process. This results
in mpv not spamming mpv.log anymore with all the initialization outputs.

1 files changed, 14 insertions, 139 deletions

diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 8e06e637a4..fba906c9b2 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -39,6 +39,8 @@
 #include "osx_common.h"
 #include "core/mp_msg.h"
 
+#include "osdep/macosx_application.h"
+
 #ifndef NSOpenGLPFAOpenGLProfile
 #define NSOpenGLPFAOpenGLProfile 99
 #endif
@@ -101,7 +103,6 @@ static bool RightAltPressed(NSEvent *event)
 @end
 
 struct vo_cocoa_state {
-    NSAutoreleasePool *pool;
     GLMPlayerWindow *window;
     NSOpenGLContext *glContext;
     NSOpenGLPixelFormat *pixelFormat;
@@ -136,13 +137,10 @@ struct vo_cocoa_state {
 
 static int _instances = 0;
 
-static void create_menu(void);
-
 static struct vo_cocoa_state *vo_cocoa_init_state(struct vo *vo)
 {
     struct vo_cocoa_state *s = talloc_ptrtype(vo, s);
     *s = (struct vo_cocoa_state){
-        .pool = [[NSAutoreleasePool alloc] init],
         .did_resize = NO,
         .current_video_size = {0,0},
         .previous_video_size = {0,0},
@@ -211,10 +209,6 @@ int vo_cocoa_init(struct vo *vo)
     vo->cocoa = vo_cocoa_init_state(vo);
     vo->wakeup_period = 0.02;
     _instances++;
-
-    NSApplicationLoad();
-    NSApp = [NSApplication sharedApplication];
-    [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular];
     disable_power_management(vo);
 
     return 1;
@@ -231,8 +225,6 @@ void vo_cocoa_uninit(struct vo *vo)
     s->window = nil;
     [s->glContext release];
     s->glContext = nil;
-    [s->pool release];
-    s->pool = nil;
 
     _instances--;
 }
@@ -399,8 +391,13 @@ static int create_window(struct vo *vo, uint32_t d_width, uint32_t d_height,
         [[NSOpenGLContext alloc] initWithFormat:s->pixelFormat
                                    shareContext:nil];
 
-    create_menu();
+    cocoa_register_menu_item_action(MPM_H_SIZE,   @selector(halfSize));
+    cocoa_register_menu_item_action(MPM_N_SIZE,   @selector(normalSize));
+    cocoa_register_menu_item_action(MPM_D_SIZE,   @selector(doubleSize));
+    cocoa_register_menu_item_action(MPM_MINIMIZE, @selector(performMiniaturize:));
+    cocoa_register_menu_item_action(MPM_ZOOM,     @selector(performZoom:));
 
+    [s->window setRestorable:NO];
     [s->window setContentView:glView];
     [glView release];
     [s->window setAcceptsMouseMovedEvents:YES];
@@ -408,8 +405,8 @@ static int create_window(struct vo *vo, uint32_t d_width, uint32_t d_height,
     [s->glContext makeCurrentContext];
     [s->window setVideoOutput:vo];
 
-    [NSApp setDelegate:s->window];
     [s->window setDelegate:s->window];
+    [s->window makeMainWindow];
 
     [s->window setContentSize:s->current_video_size keepCentered:YES];
     [s->window setContentAspectRatio:s->current_video_size];
@@ -519,31 +516,13 @@ int vo_cocoa_check_events(struct vo *vo)
         s->cursor_timer = ms_time;
     }
 
-    int result = 0;
-
-    for (;;) {
-        NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil
-                       inMode:NSEventTrackingRunLoopMode dequeue:YES];
-        if (event == nil)
-            break;
-        [NSApp sendEvent:event];
-
-        if (s->did_resize) {
-            s->did_resize = NO;
-            resize_window(vo);
-            result |= VO_EVENT_RESIZE;
-        }
-        // Without SDL's bootstrap code (include SDL.h in mplayer.c),
-        // on Leopard, we have trouble to get the play window automatically focused
-        // when the app is actived. The Following code fix this problem.
-        if ([event type] == NSAppKitDefined
-                && [event subtype] == NSApplicationActivatedEventType) {
-            [s->window makeMainWindow];
-            [s->window makeKeyAndOrderFront:nil];
-        }
+    if (s->did_resize) {
+        s->did_resize = NO;
+        resize_window(vo);
+        return VO_EVENT_RESIZE;
     }
 
-    return result;
+    return 0;
 }
 
 void vo_cocoa_fullscreen(struct vo *vo)
@@ -587,53 +566,6 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
     return 8;
 }
 
-static NSMenuItem *new_menu_item(NSMenu *parent_menu, NSString *title,
-                                 SEL action, NSString *key_equivalent)
-{
-    NSMenuItem *new_item =
-        [[NSMenuItem alloc] initWithTitle:title action:action
-                                         keyEquivalent:key_equivalent];
-    [parent_menu addItem:new_item];
-    return [new_item autorelease];
-}
-
-static NSMenuItem *new_main_menu_item(NSMenu *parent_menu, NSMenu *child_menu,
-                                      NSString *title)
-{
-    NSMenuItem *new_item =
-        [[NSMenuItem alloc] initWithTitle:title action:nil
-                                         keyEquivalent:@""];
-    [new_item setSubmenu:child_menu];
-    [parent_menu addItem:new_item];
-    return [new_item autorelease];
-}
-
-void create_menu()
-{
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-    NSMenu *main_menu, *m_menu, *w_menu;
-    NSMenuItem *app_menu_item;
-
-    main_menu = [[NSMenu new] autorelease];
-    app_menu_item = [[NSMenuItem new] autorelease];
-    [main_menu addItem:app_menu_item];
-    [NSApp setMainMenu: main_menu];
-
-    m_menu = [[[NSMenu alloc] initWithTitle:@"Movie"] autorelease];
-    new_menu_item(m_menu, @"Half Size", @selector(halfSize), @"0");
-    new_menu_item(m_menu, @"Normal Size", @selector(normalSize), @"1");
-    new_menu_item(m_menu, @"Double Size", @selector(doubleSize), @"2");
-
-    new_main_menu_item(main_menu, m_menu, @"Movie");
-
-    w_menu = [[[NSMenu alloc] initWithTitle:@"Window"] autorelease];
-    new_menu_item(w_menu, @"Minimize", @selector(performMiniaturize:), @"m");
-    new_menu_item(w_menu, @"Zoom", @selector(performZoom:), @"z");
-
-    new_main_menu_item(main_menu, w_menu, @"Window");
-    [pool release];
-}
-
 @implementation GLMPlayerWindow
 - (void)setVideoOutput:(struct vo *)vo
 {
@@ -706,12 +638,6 @@ void create_menu()
     }
 }
 
-- (void)handleQuitEvent:(NSAppleEventDescriptor*)e
-         withReplyEvent:(NSAppleEventDescriptor*)r
-{
-    mplayer_put_key(_vo->key_fifo, MP_KEY_CLOSE_WIN);
-}
-
 - (void)keyDown:(NSEvent *)theEvent
 {
     NSString *chars;
@@ -837,57 +763,6 @@ void create_menu()
     }
 }
 
-- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    NSArray *sorted_filenames = [filenames
-        sortedArrayUsingSelector:@selector(compare:)];
-
-    for (int i = 0; i < [sorted_filenames count]; i++) {
-        NSString *filename = [sorted_filenames objectAtIndex:i];
-        NSString *escaped_filename = escape_loadfile_name(filename);
-
-        char *cmd = talloc_asprintf(NULL, "loadfile \"%s\"%s",
-                                    [escaped_filename UTF8String],
-                                    (i == 0) ? "" : " append");
-        mp_input_queue_cmd(_vo->input_ctx, mp_input_parse_cmd(bstr0(cmd), ""));
-        talloc_free(cmd);
-    }
-
-    [pool release];
-}
-
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification
-{
-    if (_vo->opts->fs && current_screen_has_dock_or_menubar(_vo)) {
-        struct vo_cocoa_state *s = _vo->cocoa;
-        [self setLevel:s->window_level];
-        [NSApp setPresentationOptions:NSApplicationPresentationHideDock|
-                                      NSApplicationPresentationHideMenuBar];
-    }
-}
-
-- (void)applicationWillResignActive:(NSNotification *)aNotification
-{
-    if (_vo->opts->fs) {
-        [self setLevel:NSNormalWindowLevel];
-        [NSApp setPresentationOptions:NSApplicationPresentationDefault];
-    }
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification*)notification
-{
-    // Install an event handler so the Quit menu entry works
-    // The proper way using NSApp setDelegate: and
-    // applicationShouldTerminate: does not work,
-    // probably NSApplication never installs its handler.
-    [[NSAppleEventManager sharedAppleEventManager]
-        setEventHandler:self
-        andSelector:@selector(handleQuitEvent:withReplyEvent:)
-        forEventClass:kCoreEventClass
-        andEventID:kAEQuitApplication];
-}
-
 - (void)normalSize { [self mulSize:1.0f]; }
 
 - (void)halfSize { [self mulSize:0.5f];}