fix #385 inbox#765 macOS accelerators

- re-fix Cmd-Q confirmation dialog (#383) without the numbers typing regression (#385)
- re-fix Alt modifiers (inbox#765)
- fix Cmd-A select all text (inbox#765)

4 files changed, 51 insertions, 6 deletions

diff --git a/src/include/macros.h b/src/include/macros.h
index 21ddaff9e..ff049ddf1 100644
--- a/src/include/macros.h
+++ b/src/include/macros.h
@@ -20,14 +20,25 @@
 
 #define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
 
+// "primary" modifier: Ctrl on Linux/Windows and Cmd on macOS.
+// note: Could query this at runtime with
+// `gdk_keymap_get_modifier_mask(..., GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR)`
+#ifdef GDK_WINDOWING_QUARTZ
+#define INK_GDK_PRIMARY_MASK GDK_MOD2_MASK
+#else
+#define INK_GDK_PRIMARY_MASK GDK_CONTROL_MASK
+#endif
+
+// all modifiers used by Inkscape
+#define INK_GDK_MODIFIER_MASK (GDK_SHIFT_MASK | INK_GDK_PRIMARY_MASK | GDK_MOD1_MASK)
 
 // keyboard modifiers in an event
 #define MOD__SHIFT(event) ((event)->key.state & GDK_SHIFT_MASK)
-#define MOD__CTRL(event) ((event)->key.state & GDK_CONTROL_MASK)
+#define MOD__CTRL(event) ((event)->key.state & INK_GDK_PRIMARY_MASK)
 #define MOD__ALT(event) ((event)->key.state & GDK_MOD1_MASK)
-#define MOD__SHIFT_ONLY(event) (((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK))
-#define MOD__CTRL_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && ((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK))
-#define MOD__ALT_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && ((event)->key.state & GDK_MOD1_MASK))
+#define MOD__SHIFT_ONLY(event) (((event)->key.state & INK_GDK_MODIFIER_MASK) == GDK_SHIFT_MASK)
+#define MOD__CTRL_ONLY(event) (((event)->key.state & INK_GDK_MODIFIER_MASK) == INK_GDK_PRIMARY_MASK)
+#define MOD__ALT_ONLY(event) (((event)->key.state & INK_GDK_MODIFIER_MASK) == GDK_MOD1_MASK)
 
 #endif  // SEEN_MACROS_H
 
diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index 3629b45f3..27ca5309b 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -120,11 +120,24 @@ InkscapeWindow::change_document(SPDocument* document)
     }
 }
 
+/**
+ * Return true if this is the Cmd-Q shortcut on macOS
+ */
+inline bool is_Cmd_Q(GdkEventKey *event)
+{
+#ifdef GDK_WINDOWING_QUARTZ
+    return (event->keyval == 'q' && event->state == (GDK_MOD2_MASK | GDK_META_MASK));
+#else
+    return false;
+#endif
+}
+
 bool
 InkscapeWindow::on_key_press_event(GdkEventKey* event)
 {
     // Need to call base class method first or text tool won't work!
-    bool done = Gtk::Window::on_key_press_event(event);
+    // Intercept Cmd-Q on macOS to not bypass confirmation dialog
+    bool done = !is_Cmd_Q(event) && Gtk::Window::on_key_press_event(event);
     if (done) {
         return true;
     }
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 4d30740c9..eb2f2119a 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -1320,7 +1320,26 @@ guint get_latin_keyval(GdkEventKey const *event, guint *consumed_modifiers /*= N
             &keyval, nullptr, nullptr, &modifiers);
 
     if (consumed_modifiers) {
+#ifndef GDK_WINDOWING_QUARTZ
         *consumed_modifiers = modifiers;
+#else
+        // gdk_quartz_keymap_translate_keyboard_state fills the `consumed_modifiers`
+        // incorrectly, e.g. assigns 0xB instead of 0x0 when no modifiers pressed.
+
+        *consumed_modifiers = 0;
+
+        for (unsigned mod = 1, statemask = (event->state & GDK_MODIFIER_MASK); mod <= statemask; mod <<= 1) {
+            if ((mod & statemask)) {
+                guint keyval_no_mod = 0;
+                gdk_keymap_translate_keyboard_state(Gdk::Display::get_default()->get_keymap(), event->hardware_keycode,
+                                                    (GdkModifierType)(event->state & ~mod), group, &keyval_no_mod,
+                                                    nullptr, nullptr, nullptr);
+                if (keyval_no_mod != keyval) {
+                    *consumed_modifiers |= mod;
+                }
+            }
+        }
+#endif
     }
     return keyval;
 }
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 09797dd32..8ccba0319 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -952,7 +952,9 @@ sp_desktop_widget_realize (GtkWidget *widget)
     if (osxapp && menushell && window) {
         menushell->set_parent(*window);
         gtkosx_application_set_menu_bar(osxapp, menushell->gobj());
-        gtkosx_application_set_use_quartz_accelerators(osxapp, true);
+        // using quartz accelerators gives menu shortcuts priority over everything else,
+        // messes up text input because Inkscape has single key shortcuts (e.g. 1-6).
+        gtkosx_application_set_use_quartz_accelerators(osxapp, false);
         gtkosx_application_set_help_menu(osxapp, _get_help_menu(menushell->gobj()));
         gtkosx_application_set_window_menu(osxapp, nullptr);
     }