From f13f0db33a18040e660b6ed76ad43d1870f096a2 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 2 Jun 2013 17:39:05 +0200 Subject: osx: create macosx_events to deal with keyDown events On OSX with Cocoa enabled keyDown events are now handled with addLocalMonitorForEventsMatchingMask:handler:. This allows to respond to events even when there is no VO initialized but the GUI is focused. --- core/input/input.c | 7 +++++++ core/mplayer.c | 1 + 2 files changed, 8 insertions(+) (limited to 'core') diff --git a/core/input/input.c b/core/input/input.c index c9958753cd..0154fa11aa 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -61,6 +61,10 @@ #include #endif +#ifdef CONFIG_COCOA +#include "osdep/macosx_events.h" +#endif + #define MP_MAX_KEY_DOWN 4 struct cmd_bind { @@ -1474,6 +1478,9 @@ static void read_all_fd_events(struct input_ctx *ictx, int time) static void read_all_events(struct input_ctx *ictx, int time) { getch2_poll(); +#ifdef CONFIG_COCOA + cocoa_check_events(); +#endif read_all_fd_events(ictx, time); } diff --git a/core/mplayer.c b/core/mplayer.c index 52aa34058c..89e79ef044 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -3999,6 +3999,7 @@ static void init_input(struct MPContext *mpctx) #ifdef CONFIG_COCOA cocoa_set_input_context(mpctx->input); + cocoa_set_key_fifo(mpctx->key_fifo); #endif } -- cgit v1.2.3