add --keyboard-layout-independent option, implemented for cocoa

Author: MadFishTheOne

mpvcore/options.c

@@ -604,6 +604,7 @@ const m_option_t mp_opts[] = {
     // set fullscreen switch method (workaround for buggy WMs)
     OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096),
     OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, 0),
+    OPT_FLAG("keyboard-layout-independent", vo.keyboard_layout_independent, 0),
     OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0),
     OPT_FLOATRANGE("video-zoom", vo.zoom, 0, -20.0, 20.0),
     OPT_FLOATRANGE("video-pan-x", vo.pan_x, 0, -3.0, 3.0),

mpvcore/options.h

@@ -17,6 +17,7 @@ typedef struct mp_vo_opts {
     char *winname;
     char** fstype_list;
     int native_keyrepeat;
+    int keyboard_layout_independent;
 
     float panscan;
     float zoom;

mpvcore/player/main.c

@@ -126,6 +126,7 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx,
 
 #if HAVE_COCOA
     cocoa_set_input_context(NULL);
+    cocoa_set_options(NULL);
 #endif
 
     command_uninit(mpctx);
@@ -323,6 +324,10 @@ static int mpv_main(int argc, char *argv[])
     mpctx->global = talloc_zero(mpctx, struct mpv_global);
     mpctx->global->opts = opts;
 
+#if HAVE_COCOA
+    cocoa_set_options(opts);
+#endif
+
     // Nothing must call mp_msg() before this
     mp_msg_init(mpctx->global);
     mpctx->log = mp_log_new(mpctx, mpctx->global->log, "!cplayer");

osdep/macosx_application.h

@@ -20,6 +20,7 @@
 #define MPV_MACOSX_APPLICATION
 
 struct input_ctx;
+struct MPOpts;
 
 typedef int (*mpv_main_fn)(int, char**);
 
@@ -47,6 +48,7 @@ void cocoa_stop_runloop(void);
 void cocoa_post_fake_event(void);
 
 void cocoa_set_input_context(struct input_ctx *input_context);
+void cocoa_set_options(struct MPOpts *opts);
 
 void macosx_finder_args_preinit(int *argc, char ***argv);
 

osdep/macosx_application.m

@@ -75,6 +75,7 @@ @implementation Application
 @synthesize willStopOnOpenEvent = _will_stop_on_open_event;
 
 @synthesize inputContext = _input_context;
+@synthesize options = _options;
 @synthesize eventsResponder = _events_responder;
 @synthesize menuItems = _menu_items;
 @synthesize input_ready = _input_ready;
@@ -396,6 +397,11 @@ void cocoa_set_input_context(struct input_ctx *input_context)
     mpv_shared_app().inputContext = input_context;
 }
 
+void cocoa_set_options(struct MPOpts *opts)
+{
+    mpv_shared_app().options = opts;
+}
+
 void cocoa_post_fake_event(void)
 {
     NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined

osdep/macosx_application_objc.h

@@ -38,6 +38,7 @@
 - (void)stopPlayback;
 
 @property(nonatomic, assign) struct input_ctx *inputContext;
+@property(nonatomic, assign) struct MPOpts *options;
 @property(nonatomic, retain) EventsResponder *eventsResponder;
 @property(nonatomic, retain) NSMutableDictionary *menuItems;
 @property(nonatomic, retain) NSArray *files;

osdep/macosx_events.m

@@ -80,14 +80,53 @@ static bool RightAltPressed(int mask)
     {kVK_ANSI_Keypad6, MP_KEY_KP6}, {kVK_ANSI_Keypad7, MP_KEY_KP7},
     {kVK_ANSI_Keypad8, MP_KEY_KP8}, {kVK_ANSI_Keypad9, MP_KEY_KP9},
 
-    {0, 0}
+    {-1, 0}
 };
 
-static int convert_key(unsigned key, unsigned charcode)
+static const struct mp_keymap keymap_english_us[] = {
+    {kVK_ANSI_Grave, '`'}, {kVK_ANSI_1, '1'}, {kVK_ANSI_2, '2'}, {kVK_ANSI_3, '3'},
+    {kVK_ANSI_4, '4'}, {kVK_ANSI_5, '5'}, {kVK_ANSI_6, '6'}, {kVK_ANSI_7, '7'},
+    {kVK_ANSI_8, '8'}, {kVK_ANSI_9, '9'}, {kVK_ANSI_0, '0'}, {kVK_ANSI_Minus, '-'},
+    {kVK_ANSI_Equal, '='}, {kVK_ANSI_Q, 'q'}, {kVK_ANSI_W, 'w'}, {kVK_ANSI_E, 'e'},
+    {kVK_ANSI_R, 'r'}, {kVK_ANSI_T, 't'}, {kVK_ANSI_Y, 'y'}, {kVK_ANSI_U, 'u'},
+    {kVK_ANSI_I, 'i'}, {kVK_ANSI_O, 'o'}, {kVK_ANSI_P, 'p'}, {kVK_ANSI_LeftBracket, '['},
+    {kVK_ANSI_RightBracket, ']'}, {kVK_ANSI_Backslash, '\\'}, {kVK_ANSI_A, 'a'},
+    {kVK_ANSI_S, 's'}, {kVK_ANSI_D, 'd'}, {kVK_ANSI_F, 'f'}, {kVK_ANSI_G, 'g'},
+    {kVK_ANSI_H, 'h'}, {kVK_ANSI_J, 'j'}, {kVK_ANSI_K, 'k'}, {kVK_ANSI_L, 'l'},
+    {kVK_ANSI_Semicolon, ';'}, {kVK_ANSI_Quote, '\''}, {kVK_ANSI_Z, 'z'}, {kVK_ANSI_X, 'x'},
+    {kVK_ANSI_C, 'c'}, {kVK_ANSI_V, 'v'}, {kVK_ANSI_B, 'b'}, {kVK_ANSI_N, 'n'},
+    {kVK_ANSI_M, 'm'}, {kVK_ANSI_Comma, ','}, {kVK_ANSI_Period, '.'}, {kVK_ANSI_Slash, '/'},
+
+    {-1, 0}
+};
+
+static const struct mp_keymap keymap_english_us_shift[] = {
+    {kVK_ANSI_Grave, '~'}, {kVK_ANSI_1, '!'}, {kVK_ANSI_2, '@'}, {kVK_ANSI_3, '#'},
+    {kVK_ANSI_4, '$'}, {kVK_ANSI_5, '%'}, {kVK_ANSI_6, '^'}, {kVK_ANSI_7, '&'},
+    {kVK_ANSI_8, '*'}, {kVK_ANSI_9, '('}, {kVK_ANSI_0, ')'}, {kVK_ANSI_Minus, '_'},
+    {kVK_ANSI_Equal, '+'}, {kVK_ANSI_Q, 'Q'}, {kVK_ANSI_W, 'W'}, {kVK_ANSI_E, 'E'},
+    {kVK_ANSI_R, 'R'}, {kVK_ANSI_T, 'T'}, {kVK_ANSI_Y, 'Y'}, {kVK_ANSI_U, 'U'},
+    {kVK_ANSI_I, 'I'}, {kVK_ANSI_O, 'O'}, {kVK_ANSI_P, 'P'}, {kVK_ANSI_LeftBracket, '{'},
+    {kVK_ANSI_RightBracket, '}'}, {kVK_ANSI_Backslash, '|'}, {kVK_ANSI_A, 'A'},
+    {kVK_ANSI_S, 'S'}, {kVK_ANSI_D, 'D'}, {kVK_ANSI_F, 'F'}, {kVK_ANSI_G, 'G'},
+    {kVK_ANSI_H, 'H'}, {kVK_ANSI_J, 'J'}, {kVK_ANSI_K, 'K'}, {kVK_ANSI_L, 'L'},
+    {kVK_ANSI_Semicolon, ':'}, {kVK_ANSI_Quote, '\"'}, {kVK_ANSI_Z, 'Z'}, {kVK_ANSI_X, 'X'},
+    {kVK_ANSI_C, 'C'}, {kVK_ANSI_V, 'V'}, {kVK_ANSI_B, 'B'}, {kVK_ANSI_N, 'N'},
+    {kVK_ANSI_M, 'M'}, {kVK_ANSI_Comma, '<'}, {kVK_ANSI_Period, '>'}, {kVK_ANSI_Slash, '?'},
+
+    {-1, 0}
+};
+
+static int convert_key(unsigned key, unsigned charcode, bool layout_independent, bool shift)
 {
     int mpkey = lookup_keymap_table(keymap, key);
     if (mpkey)
         return mpkey;
+    if (layout_independent) {
+        mpkey = lookup_keymap_table(shift ? keymap_english_us_shift : keymap_english_us, key);
+        if (mpkey)
+            return mpkey;
+    }
     return charcode;
 }
 
@@ -338,7 +377,12 @@ - (NSEvent*)handleKey:(NSEvent *)event
     else
         chars = [event charactersIgnoringModifiers];
 
-    int key = convert_key([event keyCode], *[chars UTF8String]);
+    bool layout_independent = false;
+    if (mpv_shared_app().options)
+        layout_independent = mpv_shared_app().options->vo.keyboard_layout_independent;
+
+    int key = convert_key([event keyCode], *[chars UTF8String], layout_independent,
+        [event modifierFlags] & NSShiftKeyMask);
 
     if (key > -1) {
         if ([self isAppKeyEquivalent:chars withEvent:event])

video/out/vo.c

@@ -453,7 +453,7 @@ int vo_reconfig(struct vo *vo, struct mp_image_params *params, int flags)
  *         if not found.
  */
 int lookup_keymap_table(const struct mp_keymap *map, int key) {
-  while (map->from && map->from != key) map++;
+  while (map->from != -1 && map->from != key) map++;
   return map->to;
 }
 

video/out/vo_caca.c

@@ -155,7 +155,7 @@ static const struct mp_keymap keysym_map[] = {
     {CACA_KEY_F11, MP_KEY_F+11}, {CACA_KEY_F12, MP_KEY_F+12},
     {CACA_KEY_F13, MP_KEY_F+13}, {CACA_KEY_F14, MP_KEY_F+14},
     {CACA_KEY_F15, MP_KEY_F+15},
-    {0, 0}
+    {-1, 0}
 };
 
 static void check_events(struct vo *vo)

video/out/w32_common.c

@@ -60,7 +60,7 @@ static const struct mp_keymap vk_map[] = {
     {VK_NUMPAD6, MP_KEY_KP6}, {VK_NUMPAD7, MP_KEY_KP7}, {VK_NUMPAD8, MP_KEY_KP8},
     {VK_NUMPAD9, MP_KEY_KP9}, {VK_DECIMAL, MP_KEY_KPDEC},
 
-    {0, 0}
+    {-1, 0}
 };
 
 static void add_window_borders(HWND hwnd, RECT *rc)

video/out/wayland_common.c

@@ -106,7 +106,7 @@ static const struct mp_keymap keymap[] = {
     {XKB_KEY_KP_Up,     MP_KEY_KP8},   {XKB_KEY_KP_Page_Up,   MP_KEY_KP9},
     {XKB_KEY_KP_Delete, MP_KEY_KPDEL},
 
-    {0, 0}
+    {-1, 0}
 };
 
 

video/out/x11_common.c

@@ -589,7 +589,7 @@ static const struct mp_keymap keymap[] = {
     {XF86XK_Search, MP_KEY_SEARCH}, {XF86XK_Sleep, MP_KEY_SLEEP},
 #endif
 
-    {0, 0}
+    {-1, 0}
 };
 
 static int vo_x11_lookupkey(int key)