Minki/abaddon
1
0
Fork 0
mirror of https://github.com/uowuo/abaddon.git synced 2024-09-20 06:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ouwou 2023-10-02 23:05:34 -04:00
parent e68a086bca
commit bddf22ef87
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/chatinput.cpp
View File

@ -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

15
src/misc/events.cpp Normal file
View File

@ -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

7
src/misc/events.hpp Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#include <gdk/gdkkeys.h>
// idk it wont let me forward declare
namespace EventsUtil {
unsigned shortcut_key(GdkEventKey *event);
}