From c5bd231e7f326cc9538d7f38e756f7fc988e9866 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 27 Jul 2015 03:05:32 +0200 Subject: shortcuts: add missing win32 binding --- opentrack/win32-shortcuts.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/opentrack/win32-shortcuts.cpp b/opentrack/win32-shortcuts.cpp index dbf4f9fd..64ff01dc 100644 --- a/opentrack/win32-shortcuts.cpp +++ b/opentrack/win32-shortcuts.cpp @@ -109,6 +109,7 @@ QList windows_key_sequences = win_key(DIK_Z, Qt::Key::Key_Z ), win_key(DIK_RETURN, Qt::Key::Key_Return), win_key(DIK_INSERT, Qt::Key::Key_Insert), + win_key(DIK_SPACE, Qt::Key::Key_Space), }); bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods) -- cgit v1.2.3 From 44abe501830f7df0c994a7fc252244da8f477c35 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 27 Jul 2015 05:11:09 +0200 Subject: shortcuts: guard against modifiers pressed in different order --- facetracknoir/keyboard.h | 5 +++++ 1 file changed, 5 insertions(+) mode change 100644 => 100755 facetracknoir/keyboard.h diff --git a/facetracknoir/keyboard.h b/facetracknoir/keyboard.h old mode 100644 new mode 100755 index a7673f8f..3df295e1 --- a/facetracknoir/keyboard.h +++ b/facetracknoir/keyboard.h @@ -23,9 +23,14 @@ public: case 50331680: // shift case 150994979: // alt case 218103841: // ctrl+alt + case 218103843: // ctrl+alt case 117440545: // ctrl+shift + case 117440544: // ctrl+shift case 184549408: // alt+shift + case 184549411: // alt+shift case 251658272: // ctrl+alt+shift + case 251658275: // ctrl+alt+shift + case 251658273: // ctrl+alt+shift break; default: emit key_pressed(QKeySequence(event->key() | event->modifiers())); -- cgit v1.2.3 From 7d4abcf53b63c543721017d5cf787d5b689a8174 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 27 Jul 2015 05:11:39 +0200 Subject: shortcuts: extract key without modifiers for remap --- opentrack/win32-shortcuts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 opentrack/win32-shortcuts.cpp diff --git a/opentrack/win32-shortcuts.cpp b/opentrack/win32-shortcuts.cpp old mode 100644 new mode 100755 index 64ff01dc..67f71f41 --- a/opentrack/win32-shortcuts.cpp +++ b/opentrack/win32-shortcuts.cpp @@ -119,7 +119,7 @@ bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods) #ifdef _WIN32 const auto our_mods_ = our_mods; our_mods |= Qt::ShiftModifier; - switch (qt & ~Qt::ShiftModifier) + switch (qt & ~Qt::KeyboardModifierMask) { case Qt::Key::Key_BraceLeft: qt = Qt::Key::Key_BracketLeft; break; case Qt::Key::Key_BraceRight: qt = Qt::Key::Key_BracketRight; break; -- cgit v1.2.3