rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed handling of number pad keys with num-lock off. Was 

synthesizing events for the numbers even with num-lock off.  Now
synthesizing the cursor movements.
This commit is contained in:
crs 2004-11-06 16:13:01 +00:00
parent b7f0311eb2
commit 01dc8fa337
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/platform/CMSWindowsKeyState.cpp
View File

@ -712,6 +712,7 @@ CMSWindowsKeyState::CMSWindowsKeyState(CMSWindowsDesks* desks) :
m_desks(desks), m_desks(desks),
m_keyLayout(GetKeyboardLayout(0)) m_keyLayout(GetKeyboardLayout(0))
{ {
// do nothing
} }
CMSWindowsKeyState::~CMSWindowsKeyState() CMSWindowsKeyState::~CMSWindowsKeyState()
@ -751,7 +752,6 @@ KeyID
CMSWindowsKeyState::mapKeyFromEvent(WPARAM charAndVirtKey, CMSWindowsKeyState::mapKeyFromEvent(WPARAM charAndVirtKey,
LPARAM info, KeyModifierMask* maskOut) const LPARAM info, KeyModifierMask* maskOut) const
{ {
// FIXME -- look into this
// note: known microsoft bugs // note: known microsoft bugs
// Q72583 -- MapVirtualKey() maps keypad keys incorrectly // Q72583 -- MapVirtualKey() maps keypad keys incorrectly
// 95,98: num pad vk code -> invalid scan code // 95,98: num pad vk code -> invalid scan code
@ -1017,6 +1017,7 @@ CMSWindowsKeyState::doUpdateKeys()
{ {
// clear scan code to/from virtual key mapping // clear scan code to/from virtual key mapping
memset(m_scanCodeToVirtKey, 0, sizeof(m_scanCodeToVirtKey)); memset(m_scanCodeToVirtKey, 0, sizeof(m_scanCodeToVirtKey));
memset(m_scanCodeToVirtKeyNumLock, 0, sizeof(m_scanCodeToVirtKeyNumLock));
memset(m_virtKeyToScanCode, 0, sizeof(m_virtKeyToScanCode)); memset(m_virtKeyToScanCode, 0, sizeof(m_virtKeyToScanCode));
// add modifiers. note that ModeSwitch is mapped to VK_RMENU and // add modifiers. note that ModeSwitch is mapped to VK_RMENU and
@ -1076,10 +1077,21 @@ CMSWindowsKeyState::doUpdateKeys()
continue; continue;
} }
// okay, now we have the scan code for the virtual key. // okay, now we have the scan code for the virtual key. the
m_scanCodeToVirtKey[button] = i; // numpad causes some confusion. buttons on the numpad are
m_scanCodeToVirtKey[button2] = i; // used for two virtual keys (one for num lock off and one
m_virtKeyToScanCode[i] = button; // for num lock on). keep a separate map for virtual keys
// used when num lock is on.
if ((i >= VK_NUMPAD0 && i <= VK_NUMPAD9) ||
i == VK_SEPARATOR || i == VK_DECIMAL) {
m_scanCodeToVirtKeyNumLock[button] = i;
m_scanCodeToVirtKeyNumLock[button2] = i;
}
else {
m_scanCodeToVirtKey[button] = i;
m_scanCodeToVirtKey[button2] = i;
}
m_virtKeyToScanCode[i] = button;
// if the virtual key is VK_DELETE then use the extended // if the virtual key is VK_DELETE then use the extended
// scan code. this is important for simulating ctrl+alt+del // scan code. this is important for simulating ctrl+alt+del
@ -1117,7 +1129,13 @@ void
CMSWindowsKeyState::doFakeKeyEvent(KeyButton button, CMSWindowsKeyState::doFakeKeyEvent(KeyButton button,
bool press, bool isAutoRepeat) bool press, bool isAutoRepeat)
{ {
UINT vk = m_scanCodeToVirtKey[button]; UINT vk = 0;
if ((getActiveModifiers() & KeyModifierNumLock) != 0) {
vk = m_scanCodeToVirtKeyNumLock[button];
}
if (vk == 0) {
vk = m_scanCodeToVirtKey[button];
}
m_desks->fakeKeyEvent(button, vk, press, isAutoRepeat); m_desks->fakeKeyEvent(button, vk, press, isAutoRepeat);
} }

1
lib/platform/CMSWindowsKeyState.h
View File

@ -125,6 +125,7 @@ private:
HKL m_keyLayout; HKL m_keyLayout;
CString m_keyName; CString m_keyName;
UINT m_scanCodeToVirtKey[512]; UINT m_scanCodeToVirtKey[512];
UINT m_scanCodeToVirtKeyNumLock[512];
KeyButton m_virtKeyToScanCode[256]; KeyButton m_virtKeyToScanCode[256];
static const char* s_vkToName[]; static const char* s_vkToName[];