Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some error handling in case we can't remap a key.

Browse Source
This commit is contained in:
Felix Geyer 2013-12-01 19:14:07 +01:00
parent cdcea91b50
commit 23f338b0c3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/autotype/x11/AutoTypeX11.cpp
View File

@ -494,6 +494,10 @@ int AutoTypePlatformX11::x11ErrorHandler(Display* display, XErrorEvent* error)
*/ */
int AutoTypePlatformX11::AddKeysym(KeySym keysym) int AutoTypePlatformX11::AddKeysym(KeySym keysym)
{ {
if (m_specialCharacterKeycode == 0) {
return 0;
}
int inx = (m_specialCharacterKeycode - m_minKeycode) * m_keysymPerKeycode; int inx = (m_specialCharacterKeycode - m_minKeycode) * m_keysymPerKeycode;
m_keysymTable[inx] = keysym; m_keysymTable[inx] = keysym;
XChangeKeyboardMapping(m_dpy, m_specialCharacterKeycode, m_keysymPerKeycode, &m_keysymTable[inx], 1); XChangeKeyboardMapping(m_dpy, m_specialCharacterKeycode, m_keysymPerKeycode, &m_keysymTable[inx], 1);
@ -614,11 +618,16 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym)
saved_mask = mask; saved_mask = mask;
XGetInputFocus(m_dpy, &cur_focus, &revert_to); XGetInputFocus(m_dpy, &cur_focus, &revert_to);
/* determine keycode and mask for the given keysym */
keycode = GetKeycode(keysym, &mask);
if (keycode < 8 || keycode > 255) {
qWarning("Unable to get valid keycode for key: keysym=0x%lX", static_cast<long>(keysym));
return;
}
/* release all modifiers */ /* release all modifiers */
SendModifier(&event, mask, KeyRelease); SendModifier(&event, mask, KeyRelease);
/* determine keycode and mask for the given keysym */
keycode = GetKeycode(keysym, &mask);
SendModifier(&event, mask, KeyPress); SendModifier(&event, mask, KeyPress);
/* press and release key */ /* press and release key */