use group(?)-agnostic keyval for paste shortcut (fixes #228)

uowuo · Oct 3, 2023 · bddf22e · bddf22e
1 parent e68a086
commit bddf22e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp
@@ -1,5 +1,6 @@
 #include "chatinput.hpp"
 #include "constants.hpp"
+#include "misc/events.hpp"
 #include <filesystem>
 
 ChatInputText::ChatInputText() {
@@ -41,12 +42,14 @@ bool ChatInputText::ProcessKeyPress(GdkEventKey *event) {
         return true;
     }
 
+    const auto shortcut = EventsUtil::shortcut_key(event);
+
 #ifdef __APPLE__
-    if ((event->state & GDK_MOD2_MASK) && event->keyval == GDK_KEY_v) {
+    if ((event->state & GDK_MOD2_MASK) && shortcut == GDK_KEY_v) {
         return CheckHandleClipboardPaste();
     }
 #else
-    if ((event->state & GDK_CONTROL_MASK) && event->keyval == GDK_KEY_v) {
+    if ((event->state & GDK_CONTROL_MASK) && shortcut == GDK_KEY_v) {
         return CheckHandleClipboardPaste();
     }
 #endif

diff --git a/src/misc/events.cpp b/src/misc/events.cpp
@@ -0,0 +1,15 @@
+#include "events.hpp"
+
+namespace EventsUtil {
+unsigned shortcut_key(GdkEventKey *event) {
+    // thanks inkscape
+    unsigned shortcut_key = 0;
+    gdk_keymap_translate_keyboard_state(
+        gdk_keymap_get_for_display(gdk_display_get_default()),
+        event->hardware_keycode,
+        static_cast<GdkModifierType>(event->state),
+        0,
+        &shortcut_key, nullptr, nullptr, nullptr);
+    return shortcut_key;
+}
+} // namespace EventsUtil
diff --git a/src/misc/events.hpp b/src/misc/events.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <gdk/gdkkeys.h>
+// idk it wont let me forward declare
+
+namespace EventsUtil {
+unsigned shortcut_key(GdkEventKey *event);
+}