From d1d9caaa5e36e8c9205e85640123874af4dc925b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Wed, 3 Aug 2022 23:33:13 +0200 Subject: Capitalize modifier names, prefer Command on macOS So far, the macOS special casing is only partial. Also, GtkShortcutsWindow confusingly labels Command as Meta. --- fiv-view.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'fiv-view.c') diff --git a/fiv-view.c b/fiv-view.c index 0bd81f9..c276743 100644 --- a/fiv-view.c +++ b/fiv-view.c @@ -1419,16 +1419,20 @@ fiv_view_class_init(FivViewClass *klass) widget_class->scroll_event = fiv_view_scroll_event; widget_class->key_press_event = fiv_view_key_press_event; + // _gtk_get_primary_accel_mod() is private. + GdkModifierType primary = GDK_CONTROL_MASK; + gtk_accelerator_parse_with_keycode("", NULL, NULL, &primary); + GtkBindingSet *bs = gtk_binding_set_by_class(klass); // First, the standard, intuitive bindings. - bind(bs, GDK_KEY_0, GDK_CONTROL_MASK, FIV_VIEW_COMMAND_ZOOM_1); - bind(bs, GDK_KEY_plus, GDK_CONTROL_MASK, FIV_VIEW_COMMAND_ZOOM_IN); - bind(bs, GDK_KEY_minus, GDK_CONTROL_MASK, FIV_VIEW_COMMAND_ZOOM_OUT); - bind(bs, GDK_KEY_p, GDK_CONTROL_MASK, FIV_VIEW_COMMAND_PRINT); - bind(bs, GDK_KEY_r, GDK_CONTROL_MASK, FIV_VIEW_COMMAND_RELOAD); - bind(bs, GDK_KEY_s, GDK_CONTROL_MASK, FIV_VIEW_COMMAND_SAVE_PAGE); - bind(bs, GDK_KEY_s, GDK_MOD1_MASK, FIV_VIEW_COMMAND_SAVE_FRAME); - bind(bs, GDK_KEY_Return, GDK_MOD1_MASK, FIV_VIEW_COMMAND_INFO); + bind(bs, GDK_KEY_0, primary, FIV_VIEW_COMMAND_ZOOM_1); + bind(bs, GDK_KEY_plus, primary, FIV_VIEW_COMMAND_ZOOM_IN); + bind(bs, GDK_KEY_minus, primary, FIV_VIEW_COMMAND_ZOOM_OUT); + bind(bs, GDK_KEY_p, primary, FIV_VIEW_COMMAND_PRINT); + bind(bs, GDK_KEY_r, primary, FIV_VIEW_COMMAND_RELOAD); + bind(bs, GDK_KEY_s, primary, FIV_VIEW_COMMAND_SAVE_PAGE); + bind(bs, GDK_KEY_s, GDK_MOD1_MASK, FIV_VIEW_COMMAND_SAVE_FRAME); + bind(bs, GDK_KEY_Return, GDK_MOD1_MASK, FIV_VIEW_COMMAND_INFO); // The scale-to-fit binding is from gThumb, which has more such modes. bind(bs, GDK_KEY_F5, 0, FIV_VIEW_COMMAND_RELOAD); -- cgit v1.2.3