From d25e8839835cfb88b4bf1586296c9f86dbcc2fef Mon Sep 17 00:00:00 2001 From: Albert Weichselbraun Date: Sun, 17 Nov 2013 07:48:25 +0100 Subject: [PATCH 1/5] Fixed bug #116 - certain characters not working with de keyboard layout --- src/autotype/x11/AutoTypeX11.cpp | 15 ++++++++++++--- src/autotype/x11/AutoTypeX11.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp index afa0e1de3..c30433095 100644 --- a/src/autotype/x11/AutoTypeX11.cpp +++ b/src/autotype/x11/AutoTypeX11.cpp @@ -551,6 +551,9 @@ void AutoTypePlatformX11::ReadKeymap() m_altgrMask = 0; m_altgrKeysym = NoSymbol; modifiers = XGetModifierMapping(m_dpy); + /* default value, used if we do not find a mapping */ + inx_altgr = 3; + for (i = 0; i < 8; i++) { for (pos = 0; pos < modifiers->max_keypermod; pos++) { keycode = modifiers->modifiermap[i * modifiers->max_keypermod + pos]; @@ -567,12 +570,18 @@ void AutoTypePlatformX11::ReadKeymap() m_altgrMask = 0x0101 << i; /* I don't know why, but 0x2000 was required for mod3 on my Linux box */ m_altgrKeysym = keysym; + + /* set the index of the XGetKeyboardMapping for the AltGr key */ + inx_altgr = i; } } else if (keysym == XK_ISO_Level3_Shift) { /* if no Mode_switch, try to use ISO_Level3_Shift instead */ /* however, it may not work as intended - I don't know why */ m_altgrMask = 1 << i; m_altgrKeysym = keysym; + + /* set the index of the XGetKeyboardMapping for the AltGr key */ + inx_altgr = i; } } } @@ -631,15 +640,15 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift) break; } } - if (!found && m_altgrMask && 3 <= m_keysymPerKeycode) { + if (!found && m_altgrMask && inx_altgr + 1 <= m_keysymPerKeycode) { for (keycode = m_minKeycode; !found && (keycode <= m_maxKeycode); keycode++) { inx = (keycode - m_minKeycode) * m_keysymPerKeycode; - if (m_keysymTable[inx + 2] == keysym) { + if (m_keysymTable[inx + inx_altgr] == keysym) { shift &= ~ShiftMask; shift |= m_altgrMask; found = TRUE; break; - } else if (4 <= m_keysymPerKeycode && m_keysymTable[inx + 3] == keysym) { + } else if (inx_altgr + 2 <= m_keysymPerKeycode && m_keysymTable[inx + inx_altgr + 1] == keysym) { shift |= ShiftMask | m_altgrMask; found = TRUE; break; diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index 7e67dc83f..0cb88fdaa 100644 --- a/src/autotype/x11/AutoTypeX11.h +++ b/src/autotype/x11/AutoTypeX11.h @@ -98,6 +98,8 @@ private: int m_altMask; int m_metaMask; int m_altgrMask; + /* index of the XGetKeyboardMapping for the AltGr key */ + int inx_altgr; KeySym m_altgrKeysym; }; From 68e1fc0cd0886739389003f1899d241de8d82cde Mon Sep 17 00:00:00 2001 From: Albert Weichselbraun Date: Sun, 17 Nov 2013 21:08:55 +0100 Subject: [PATCH 2/5] Use XKeysymToKeycode together with XkbTranslateKeyCode for translating KeySyms to the corresponding keycode and modifier sequences. --- src/autotype/x11/AutoTypeX11.cpp | 69 +++++++++++++++++--------------- src/autotype/x11/AutoTypeX11.h | 1 + 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp index afa0e1de3..96711bce3 100644 --- a/src/autotype/x11/AutoTypeX11.cpp +++ b/src/autotype/x11/AutoTypeX11.cpp @@ -606,54 +606,56 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift) int revert_to; XKeyEvent event; int keycode; - int phase, inx; + int phase; bool found; + KeySym ks; + unsigned int mods_rtrn = 0; + XkbDescPtr kbd = XkbGetKeyboard (m_dpy, XkbCompatMapMask | XkbGeometryMask, XkbUseCoreKbd); XGetInputFocus(m_dpy, &cur_focus, &revert_to); found = FALSE; keycode = 0; + if (keysym != NoSymbol) { for (phase = 0; phase < 2; phase++) { - for (keycode = m_minKeycode; !found && (keycode <= m_maxKeycode); keycode++) { - /* Determine keycode for the keysym: we use this instead - of XKeysymToKeycode() because we must know shift_state, too */ - inx = (keycode - m_minKeycode) * m_keysymPerKeycode; - if (m_keysymTable[inx] == keysym) { - shift &= ~m_altgrMask; - if (m_keysymTable[inx + 1] != NoSymbol) shift &= ~ShiftMask; - found = TRUE; - break; - } else if (m_keysymTable[inx + 1] == keysym) { - shift &= ~m_altgrMask; - shift |= ShiftMask; - found = TRUE; - break; - } - } - if (!found && m_altgrMask && 3 <= m_keysymPerKeycode) { - for (keycode = m_minKeycode; !found && (keycode <= m_maxKeycode); keycode++) { - inx = (keycode - m_minKeycode) * m_keysymPerKeycode; - if (m_keysymTable[inx + 2] == keysym) { - shift &= ~ShiftMask; - shift |= m_altgrMask; - found = TRUE; - break; - } else if (4 <= m_keysymPerKeycode && m_keysymTable[inx + 3] == keysym) { - shift |= ShiftMask | m_altgrMask; - found = TRUE; - break; + keycode = XKeysymToKeycode(m_dpy, keysym); + XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks); + if (ks == keysym) { + shift &= ~m_altgrMask; + found = TRUE; + } else { + + XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks); + if (ks == keysym) { + shift &= ~m_altgrMask; + shift |= ShiftMask; + found = TRUE; + } else { + + XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); + if (ks == keysym) { + shift &= ~ShiftMask; + shift |= m_altgrMask; + found = TRUE; + } else { + + XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); + if (ks == keysym) { + shift |= ShiftMask | m_altgrMask; + found = TRUE; + } } } } if (found) break; if (0xF000 <= keysym) { - /* for special keys such as function keys, - first try to add it in the non-shifted position of the keymap */ - if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE); + /* for special keys such as function keys, + first try to add it in the non-shifted position of the keymap */ + if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE); } else { - AddKeysym(keysym, FALSE); + AddKeysym(keysym, FALSE); } } } @@ -772,6 +774,7 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift) SendEvent(&event); event.state &= ~ControlMask; } + XkbFreeKeyboard(kbd, XkbAllComponentsMask, True); } int AutoTypePlatformX11::MyErrorHandler(Display* my_dpy, XErrorEvent* event) diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index 7e67dc83f..370e5504e 100644 --- a/src/autotype/x11/AutoTypeX11.h +++ b/src/autotype/x11/AutoTypeX11.h @@ -26,6 +26,7 @@ #include #include +#include #include #include "autotype/AutoTypePlatformPlugin.h" From 3fcfc348ede84d5592f87c835a0cc21d6989092f Mon Sep 17 00:00:00 2001 From: Albert Weichselbraun Date: Mon, 18 Nov 2013 06:17:56 +0100 Subject: [PATCH 3/5] Cleanup: use break rather than nested if/else constructs. --- src/autotype/x11/AutoTypeX11.cpp | 52 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp index a84f394cd..e74eb2f02 100644 --- a/src/autotype/x11/AutoTypeX11.cpp +++ b/src/autotype/x11/AutoTypeX11.cpp @@ -632,37 +632,39 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift) XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks); if (ks == keysym) { shift &= ~m_altgrMask; + shift &= ~ShiftMask; found = TRUE; - } else { + break; + } - XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks); - if (ks == keysym) { - shift &= ~m_altgrMask; - shift |= ShiftMask; - found = TRUE; - } else { + XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks); + if (ks == keysym) { + shift &= ~m_altgrMask; + shift |= ShiftMask; + found = TRUE; + break; + } - XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); - if (ks == keysym) { - shift &= ~ShiftMask; - shift |= m_altgrMask; - found = TRUE; - } else { - - XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); - if (ks == keysym) { - shift |= ShiftMask | m_altgrMask; - found = TRUE; - } - } - } - } + XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); + if (ks == keysym) { + shift &= ~ShiftMask; + shift |= m_altgrMask; + found = TRUE; + break; + } + + XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); + if (ks == keysym) { + shift |= ShiftMask | m_altgrMask; + found = TRUE; + break; + } if (found) break; if (0xF000 <= keysym) { - /* for special keys such as function keys, - first try to add it in the non-shifted position of the keymap */ - if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE); + /* for special keys such as function keys, + first try to add it in the non-shifted position of the keymap */ + if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE); } else { AddKeysym(keysym, FALSE); } From a26119ea20c533c090ae66dd1248c93c9471ada2 Mon Sep 17 00:00:00 2001 From: Albert Weichselbraun Date: Fri, 22 Nov 2013 07:49:13 +0100 Subject: [PATCH 4/5] Use a dedicated keycode for keys that require another modifier than shift. --- src/autotype/x11/AutoTypeX11.cpp | 406 ++++++++----------------------- src/autotype/x11/AutoTypeX11.h | 23 +- 2 files changed, 110 insertions(+), 319 deletions(-) diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp index e74eb2f02..d566c45ca 100644 --- a/src/autotype/x11/AutoTypeX11.cpp +++ b/src/autotype/x11/AutoTypeX11.cpp @@ -42,14 +42,20 @@ AutoTypePlatformX11::AutoTypePlatformX11() m_currentGlobalModifiers = 0; m_keysymTable = Q_NULLPTR; - m_altMask = 0; - m_metaMask = 0; - m_altgrMask = 0; - m_altgrKeysym = NoSymbol; + m_specialCharacterKeycode = 0; + m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask; updateKeymap(); } +/* + * Restore the KeyboardMapping to its original state. + */ +AutoTypePlatformX11::~AutoTypePlatformX11() { + AddKeysym(NoSymbol); +} + + QStringList AutoTypePlatformX11::windowTitles() { return windowTitlesRecursive(m_rootWindow); @@ -125,10 +131,10 @@ uint AutoTypePlatformX11::qtToNativeModifiers(Qt::KeyboardModifiers modifiers) nativeModifiers |= ControlMask; } if (modifiers & Qt::AltModifier) { - nativeModifiers |= m_altMask; + nativeModifiers |= Mod1Mask; } if (modifiers & Qt::MetaModifier) { - nativeModifiers |= m_metaMask; + nativeModifiers |= Mod4Mask; } return nativeModifiers; @@ -165,6 +171,7 @@ int AutoTypePlatformX11::platformEventFilter(void* event) return 1; } if (xevent->type == MappingNotify) { + XRefreshKeyboardMapping(reinterpret_cast(xevent)); updateKeymap(); } @@ -387,24 +394,45 @@ KeySym AutoTypePlatformX11::keyToKeySym(Qt::Key key) } } +/* + * Update the keyboard and modifier mapping. + * We need the KeyboardMapping for AddKeysym. + * Modifier mapping is required for clearing the modifiers. + */ void AutoTypePlatformX11::updateKeymap() { - ReadKeymap(); + int keycode, inx; + int mod_index, mod_key; + XModifierKeymap *modifiers; - if (!m_altgrMask) { - AddModifier(XK_Mode_switch); - } - if (!m_metaMask) { - m_metaMask = Mod4Mask; + XDisplayKeycodes(m_dpy, &m_minKeycode, &m_maxKeycode); + if (m_keysymTable != NULL) XFree(m_keysymTable); + m_keysymTable = XGetKeyboardMapping(m_dpy, + m_minKeycode, m_maxKeycode - m_minKeycode + 1, + &m_keysymPerKeycode); + + if (m_specialCharacterKeycode == 0) { + for (keycode = m_minKeycode; keycode <= m_maxKeycode; keycode++) { + inx = (keycode - m_minKeycode) * m_keysymPerKeycode; + if (m_keysymTable[inx] == NoSymbol) { + m_specialCharacterKeycode = keycode; + break; + } + } } - m_modifierMask = ControlMask | ShiftMask | m_altMask | m_metaMask; - - // TODO: figure out why this breaks after the first global auto-type - /*if (m_currentGlobalKey && m_currentGlobalModifiers) { - unregisterGlobalShortcut(m_currentGlobalKey, m_currentGlobalModifiers); - registerGlobalShortcut(m_currentGlobalKey, m_currentGlobalModifiers); - }*/ + modifiers = XGetModifierMapping(m_dpy); + for (mod_index = 0; mod_index < 8; mod_index ++) { + m_modifier_keycode[mod_index] = 0; + for (mod_key = 0; mod_key < modifiers->max_keypermod; mod_key++) { + keycode = modifiers->modifiermap[mod_index * modifiers->max_keypermod + mod_key]; + if (keycode) { + m_modifier_keycode[mod_index] = keycode; + break; + } + } + } + XFreeModifiermap(modifiers); } void AutoTypePlatformX11::startCatchXErrors() @@ -442,150 +470,19 @@ int AutoTypePlatformX11::x11ErrorHandler(Display* display, XErrorEvent* error) // -------------------------------------------------------------------------- /* - * Insert a specified keysym to unused position in the keymap table. - * This will be called to add required keysyms on-the-fly. - * if the second parameter is TRUE, the keysym will be added to the - * non-shifted position - this may be required for modifier keys - * (e.g. Mode_switch) and some special keys (e.g. F20). + * Insert a specified keysym on the dedicated position in the keymap + * table. */ -int AutoTypePlatformX11::AddKeysym(KeySym keysym, bool top) +int AutoTypePlatformX11::AddKeysym(KeySym keysym) { - int keycode, pos, max_pos, inx, phase; - - if (top) { - max_pos = 0; - } else { - max_pos = m_keysymPerKeycode - 1; - if (4 <= max_pos) max_pos = 3; - if (2 <= max_pos && m_altgrKeysym != XK_Mode_switch) max_pos = 1; - } - - for (phase = 0; phase < 2; phase++) { - for (keycode = m_maxKeycode; m_minKeycode <= keycode; keycode--) { - for (pos = max_pos; 0 <= pos; pos--) { - inx = (keycode - m_minKeycode) * m_keysymPerKeycode; - if ((phase != 0 || m_keysymTable[inx] == NoSymbol) && m_keysymTable[inx] < 0xFF00) { - /* In the first phase, to avoid modifing existing keys, */ - /* add the keysym only to the keys which has no keysym in the first position. */ - /* If no place fuond in the first phase, add the keysym for any keys except */ - /* for modifier keys and other special keys */ - if (m_keysymTable[inx + pos] == NoSymbol) { - m_keysymTable[inx + pos] = keysym; - XChangeKeyboardMapping(m_dpy, keycode, m_keysymPerKeycode, &m_keysymTable[inx], 1); - XFlush(m_dpy); - return keycode; - } - } - } - } - } - qWarning("Couldn't add \"%s\" to keymap", XKeysymToString(keysym)); - return NoSymbol; -} - -/* - * Add the specified key as a new modifier. - * This is used to use Mode_switch (AltGr) as a modifier. - */ -void AutoTypePlatformX11::AddModifier(KeySym keysym) -{ - XModifierKeymap *modifiers; - int keycode, i, pos; - - keycode = XKeysymToKeycode(m_dpy, keysym); - if (keycode == NoSymbol) keycode = AddKeysym(keysym, TRUE); - - modifiers = XGetModifierMapping(m_dpy); - for (i = 7; 3 < i; i--) { - if (modifiers->modifiermap[i * modifiers->max_keypermod] == NoSymbol - || ((m_keysymTable[(modifiers->modifiermap[i * modifiers->max_keypermod] - - m_minKeycode) * m_keysymPerKeycode]) == XK_ISO_Level3_Shift - && keysym == XK_Mode_switch)) - { - for (pos = 0; pos < modifiers->max_keypermod; pos++) { - if (modifiers->modifiermap[i * modifiers->max_keypermod + pos] == NoSymbol) { - modifiers->modifiermap[i * modifiers->max_keypermod + pos] = keycode; - XSetModifierMapping(m_dpy, modifiers); - return; - } - } - } - } - qWarning("Couldn't add \"%s\" as modifier", XKeysymToString(keysym)); -} - -/* - * Read keyboard mapping and modifier mapping. - * Keyboard mapping is used to know what keys are in shifted position. - * Modifier mapping is required because we should know Alt and Meta - * key are used as which modifier. - */ -void AutoTypePlatformX11::ReadKeymap() -{ - int i; - int keycode, inx, pos; - KeySym keysym; - XModifierKeymap *modifiers; - - XDisplayKeycodes(m_dpy, &m_minKeycode, &m_maxKeycode); - if (m_keysymTable != NULL) XFree(m_keysymTable); - m_keysymTable = XGetKeyboardMapping(m_dpy, - m_minKeycode, m_maxKeycode - m_minKeycode + 1, - &m_keysymPerKeycode); - for (keycode = m_minKeycode; keycode <= m_maxKeycode; keycode++) { - /* if the first keysym is alphabet and the second keysym is NoSymbol, - it is equivalent to pair of lowercase and uppercase alphabet */ - inx = (keycode - m_minKeycode) * m_keysymPerKeycode; - if (m_keysymTable[inx + 1] == NoSymbol - && ((XK_A <= m_keysymTable[inx] && m_keysymTable[inx] <= XK_Z) - || (XK_a <= m_keysymTable[inx] && m_keysymTable[inx] <= XK_z))) - { - if (XK_A <= m_keysymTable[inx] && m_keysymTable[inx] <= XK_Z) - m_keysymTable[inx] = m_keysymTable[inx] - XK_A + XK_a; - m_keysymTable[inx + 1] = m_keysymTable[inx] - XK_a + XK_A; - } - } - - m_altMask = 0; - m_metaMask = 0; - m_altgrMask = 0; - m_altgrKeysym = NoSymbol; - modifiers = XGetModifierMapping(m_dpy); - /* default value, used if we do not find a mapping */ - inx_altgr = 3; - - for (i = 0; i < 8; i++) { - for (pos = 0; pos < modifiers->max_keypermod; pos++) { - keycode = modifiers->modifiermap[i * modifiers->max_keypermod + pos]; - if (keycode < m_minKeycode || m_maxKeycode < keycode) continue; - - keysym = m_keysymTable[(keycode - m_minKeycode) * m_keysymPerKeycode]; - if (keysym == XK_Alt_L || keysym == XK_Alt_R) { - m_altMask = 1 << i; - } else if (keysym == XK_Meta_L || keysym == XK_Meta_R) { - m_metaMask = 1 << i; - } else if (keysym == XK_Mode_switch) { - if (m_altgrKeysym == XK_ISO_Level3_Shift) { - } else { - m_altgrMask = 0x0101 << i; - /* I don't know why, but 0x2000 was required for mod3 on my Linux box */ - m_altgrKeysym = keysym; - - /* set the index of the XGetKeyboardMapping for the AltGr key */ - inx_altgr = i; - } - } else if (keysym == XK_ISO_Level3_Shift) { - /* if no Mode_switch, try to use ISO_Level3_Shift instead */ - /* however, it may not work as intended - I don't know why */ - m_altgrMask = 1 << i; - m_altgrKeysym = keysym; - - /* set the index of the XGetKeyboardMapping for the AltGr key */ - inx_altgr = i; - } - } - } - XFreeModifiermap(modifiers); + int inx = (m_specialCharacterKeycode - m_minKeycode) * m_keysymPerKeycode; + m_keysymTable[inx] = keysym; + XChangeKeyboardMapping(m_dpy, m_specialCharacterKeycode, m_keysymPerKeycode, &m_keysymTable[inx], 1); + XFlush(m_dpy); + /* Xlib needs some time until the mapping is distributed to + all clients */ + usleep(10000); + return m_specialCharacterKeycode; } /* @@ -593,12 +490,13 @@ void AutoTypePlatformX11::ReadKeymap() * If input focus is specified explicitly, select the window * before send event to the window. */ -void AutoTypePlatformX11::SendEvent(XKeyEvent* event) +void AutoTypePlatformX11::SendEvent(XKeyEvent* event, int event_type) { XSync(event->display, FALSE); int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler); - XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress, 0); + event->type = event_type; + XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress , 0); XFlush(event->display); XSetErrorHandler(oldHandler); @@ -609,66 +507,17 @@ void AutoTypePlatformX11::SendEvent(XKeyEvent* event) * window to simulate keyboard. If modifiers (shift, control, etc) * are set ON, many events will be sent. */ -void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift) +void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym) { Window cur_focus; int revert_to; XKeyEvent event; int keycode; - int phase; - bool found; - KeySym ks; - unsigned int mods_rtrn = 0; - XkbDescPtr kbd = XkbGetKeyboard (m_dpy, XkbCompatMapMask | XkbGeometryMask, XkbUseCoreKbd); + int mod_index; - XGetInputFocus(m_dpy, &cur_focus, &revert_to); - - found = FALSE; - keycode = 0; - - if (keysym != NoSymbol) { - for (phase = 0; phase < 2; phase++) { - keycode = XKeysymToKeycode(m_dpy, keysym); - XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks); - if (ks == keysym) { - shift &= ~m_altgrMask; - shift &= ~ShiftMask; - found = TRUE; - break; - } - - XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks); - if (ks == keysym) { - shift &= ~m_altgrMask; - shift |= ShiftMask; - found = TRUE; - break; - } - - XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); - if (ks == keysym) { - shift &= ~ShiftMask; - shift |= m_altgrMask; - found = TRUE; - break; - } - - XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks); - if (ks == keysym) { - shift |= ShiftMask | m_altgrMask; - found = TRUE; - break; - } - if (found) break; - - if (0xF000 <= keysym) { - /* for special keys such as function keys, - first try to add it in the non-shifted position of the keymap */ - if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE); - } else { - AddKeysym(keysym, FALSE); - } - } + if (keysym == NoSymbol) { + qWarning("No such key: keysym=0x%lX", static_cast(keysym)); + return; } event.display = m_dpy; @@ -687,105 +536,44 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift) unsigned int mask; XQueryPointer(m_dpy, event.root, &root, &child, &root_x, &root_y, &x, &y, &mask); - - event.type = KeyRelease; + XGetInputFocus(m_dpy, &cur_focus, &revert_to); + + /* Release all set modifiers */ event.state = 0; - if (mask & ControlMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Control_L); - SendEvent(&event); - } - if (mask & m_altMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Alt_L); - SendEvent(&event); - } - if (mask & m_metaMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Meta_L); - SendEvent(&event); - } - if (mask & m_altgrMask) { - event.keycode = XKeysymToKeycode(m_dpy, m_altgrKeysym); - SendEvent(&event); - } - if (mask & ShiftMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Shift_L); - SendEvent(&event); - } - if (mask & LockMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Caps_Lock); - SendEvent(&event); - } - - event.type = KeyPress; - event.state = 0; - if (shift & ControlMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Control_L); - SendEvent(&event); - event.state |= ControlMask; - } - if (shift & m_altMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Alt_L); - SendEvent(&event); - event.state |= m_altMask; - } - if (shift & m_metaMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Meta_L); - SendEvent(&event); - event.state |= m_metaMask; - } - if (shift & m_altgrMask) { - event.keycode = XKeysymToKeycode(m_dpy, m_altgrKeysym); - SendEvent(&event); - event.state |= m_altgrMask; - } - if (shift & ShiftMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Shift_L); - SendEvent(&event); - event.state |= ShiftMask; - } - - if (keysym != NoSymbol) { /* send event for the key itself */ - event.keycode = found ? keycode : XKeysymToKeycode(m_dpy, keysym); - if (event.keycode == NoSymbol) { - if ((keysym & ~0x7f) == 0 && QChar(static_cast(keysym)).isPrint()) - qWarning("No such key: %c", static_cast(keysym)); - else if (XKeysymToString(keysym) != NULL) - qWarning("No such key: keysym=%s (0x%lX)", XKeysymToString(keysym), static_cast(keysym)); - else - qWarning("No such key: keysym=0x%lX", static_cast(keysym)); - } else { - SendEvent(&event); - event.type = KeyRelease; - SendEvent(&event); + for (mod_index = 0; mod_index < 8; mod_index ++) { + if (mask & m_modifier_mask[mod_index]) { + event.keycode = m_modifier_keycode[mod_index]; + SendEvent(&event, KeyRelease); } } + + /* Determine the keycode to press */ + keycode = XKeysymToKeycode(m_dpy, keysym); - event.type = KeyRelease; - if (shift & ShiftMask) { + /* Case 1: Pressing Shift is required */ + if (XkbKeycodeToKeysym(m_dpy, keycode, 0, 1) == keysym) { event.keycode = XKeysymToKeycode(m_dpy, XK_Shift_L); - SendEvent(&event); - event.state &= ~ShiftMask; + SendEvent(&event, KeyPress); + event.state |= ShiftMask; + } else { + /* Case 2: Obtaining a mapping is required */ + if (XkbKeycodeToKeysym(m_dpy, keycode, 0, 0) != keysym) { + keycode = AddKeysym(keysym); + } + /* Default Case: No shift or Mapping required */ } - if (shift & m_altgrMask) { - event.keycode = XKeysymToKeycode(m_dpy, m_altgrKeysym); - SendEvent(&event); - event.state &= ~m_altgrMask; + + /* Press and release key */ + event.keycode = keycode; + SendEvent(&event, KeyPress); + SendEvent(&event, KeyRelease); + + /* Release Shift, if it has been pressed */ + if (event.state & ShiftMask) { + event.keycode = XKeysymToKeycode(m_dpy, XK_Shift_L); + SendEvent(&event, KeyRelease); + event.state &= ShiftMask; } - if (shift & m_metaMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Meta_L); - SendEvent(&event); - event.state &= ~m_metaMask; - } - if (shift & m_altMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Alt_L); - SendEvent(&event); - event.state &= ~m_altMask; - } - if (shift & ControlMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Control_L); - SendEvent(&event); - event.state &= ~ControlMask; - } - XkbFreeKeyboard(kbd, XkbAllComponentsMask, True); } int AutoTypePlatformX11::MyErrorHandler(Display* my_dpy, XErrorEvent* event) diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index ed0339741..909f228d3 100644 --- a/src/autotype/x11/AutoTypeX11.h +++ b/src/autotype/x11/AutoTypeX11.h @@ -26,13 +26,16 @@ #include #include -#include #include +#include +#include #include "autotype/AutoTypePlatformPlugin.h" #include "autotype/AutoTypeAction.h" #include "core/Global.h" +#define N_MOD_INDICES (Mod5MapIndex + 1) + class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface { Q_OBJECT @@ -40,6 +43,7 @@ class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface public: AutoTypePlatformX11(); + ~AutoTypePlatformX11(); QStringList windowTitles(); WId activeWindow(); QString activeWindowTitle(); @@ -52,7 +56,7 @@ public: KeySym charToKeySym(const QChar& ch); KeySym keyToKeySym(Qt::Key key); - void SendKeyPressedEvent(KeySym keysym, unsigned int shift = 0); + void SendKeyPressedEvent(KeySym keysym); Q_SIGNALS: void globalShortcutTriggered(); @@ -69,10 +73,10 @@ private: static int x11ErrorHandler(Display* display, XErrorEvent* error); void updateKeymap(); - int AddKeysym(KeySym keysym, bool top); + int AddKeysym(KeySym keysym); void AddModifier(KeySym keysym); void ReadKeymap(); - void SendEvent(XKeyEvent* event); + void SendEvent(XKeyEvent* event, int event_type); static int MyErrorHandler(Display* my_dpy, XErrorEvent* event); Display* m_dpy; @@ -96,12 +100,11 @@ private: int m_minKeycode; int m_maxKeycode; int m_keysymPerKeycode; - int m_altMask; - int m_metaMask; - int m_altgrMask; - /* index of the XGetKeyboardMapping for the AltGr key */ - int inx_altgr; - KeySym m_altgrKeysym; + + /* dedicated 'special character' keycode */ + int m_specialCharacterKeycode; + int m_modifier_mask[N_MOD_INDICES]; + KeyCode m_modifier_keycode[N_MOD_INDICES]; }; class AutoTypeExecturorX11 : public AutoTypeExecutor From 62ea117f45a17c382df86c8fd7ec1f740e96c416 Mon Sep 17 00:00:00 2001 From: Albert Weichselbraun Date: Sun, 1 Dec 2013 11:46:22 +0100 Subject: [PATCH 5/5] Significantly reduce the number of re-mappings required by a) dynamically fetching the modifier masks for Mod1 to Mod5 (Alt, AltGr, Meta, etc.) b) integrating commit bfec222 from Felix Geyer which creates a unicode -> x11 keysym mapping table by parsing keysymdefs.h. This avoids adding new keysyms because keyboard layouts seem to prefer the lower keysyms over unicode | 0x01000000 mapping. An example of this is the euro sign with a German keyboard layout. --- src/autotype/x11/AutoTypeX11.cpp | 126 ++++++++++++++++------- src/autotype/x11/AutoTypeX11.h | 11 +- src/autotype/x11/KeySymMap.h | 169 +++++++++++++++++++++++++++++++ src/autotype/x11/keysymmap.py | 107 +++++++++++++++++++ 4 files changed, 372 insertions(+), 41 deletions(-) create mode 100644 src/autotype/x11/KeySymMap.h create mode 100755 src/autotype/x11/keysymmap.py diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp index d566c45ca..74b3cbef9 100644 --- a/src/autotype/x11/AutoTypeX11.cpp +++ b/src/autotype/x11/AutoTypeX11.cpp @@ -17,6 +17,7 @@ */ #include "AutoTypeX11.h" +#include "KeySymMap.h" bool AutoTypePlatformX11::m_catchXErrors = false; bool AutoTypePlatformX11::m_xErrorOccured = false; @@ -42,6 +43,7 @@ AutoTypePlatformX11::AutoTypePlatformX11() m_currentGlobalModifiers = 0; m_keysymTable = Q_NULLPTR; + m_xkb = Q_NULLPTR; m_specialCharacterKeycode = 0; m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask; @@ -333,12 +335,21 @@ KeySym AutoTypePlatformX11::charToKeySym(const QChar& ch) || (unicode >= 0x00a0 && unicode <= 0x00ff)) { return unicode; } - else if (unicode >= 0x0100) { + + /* mapping table generated from keysymdef.h */ + const uint* match = qBinaryFind(m_unicodeToKeysymKeys, + m_unicodeToKeysymKeys + m_unicodeToKeysymLen, + unicode); + int index = match - m_unicodeToKeysymKeys; + if (index != m_unicodeToKeysymLen) { + return m_unicodeToKeysymValues[index]; + } + + if (unicode >= 0x0100) { return unicode | 0x01000000; } - else { - return NoSymbol; - } + + return NoSymbol; } KeySym AutoTypePlatformX11::keyToKeySym(Qt::Key key) @@ -405,12 +416,17 @@ void AutoTypePlatformX11::updateKeymap() int mod_index, mod_key; XModifierKeymap *modifiers; + /* read keyboard map */ + if (m_xkb != NULL) XkbFreeKeyboard(m_xkb, XkbAllComponentsMask, True); + m_xkb = XkbGetKeyboard (m_dpy, XkbCompatMapMask | XkbGeometryMask, XkbUseCoreKbd); + XDisplayKeycodes(m_dpy, &m_minKeycode, &m_maxKeycode); if (m_keysymTable != NULL) XFree(m_keysymTable); m_keysymTable = XGetKeyboardMapping(m_dpy, m_minKeycode, m_maxKeycode - m_minKeycode + 1, &m_keysymPerKeycode); + /* determine the keycode to use for remapped keys */ if (m_specialCharacterKeycode == 0) { for (keycode = m_minKeycode; keycode <= m_maxKeycode; keycode++) { inx = (keycode - m_minKeycode) * m_keysymPerKeycode; @@ -421,8 +437,9 @@ void AutoTypePlatformX11::updateKeymap() } } + /* determine the keycode to use for modifiers */ modifiers = XGetModifierMapping(m_dpy); - for (mod_index = 0; mod_index < 8; mod_index ++) { + for (mod_index = ShiftMapIndex; mod_index <= Mod5MapIndex; mod_index ++) { m_modifier_keycode[mod_index] = 0; for (mod_key = 0; mod_key < modifiers->max_keypermod; mod_key++) { keycode = modifiers->modifiermap[mod_index * modifiers->max_keypermod + mod_key]; @@ -496,12 +513,63 @@ void AutoTypePlatformX11::SendEvent(XKeyEvent* event, int event_type) int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler); event->type = event_type; - XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress , 0); + XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress, 0); XFlush(event->display); XSetErrorHandler(oldHandler); } +/* + * Send a modifier press/release event for all modifiers + * which are set in the mask variable. + */ +void AutoTypePlatformX11::SendModifier(XKeyEvent *event, unsigned int mask, int event_type) +{ + int mod_index; + for (mod_index = ShiftMapIndex; mod_index <= Mod5MapIndex; mod_index ++) { + if (mask & (1 << mod_index)) { + event->keycode = m_modifier_keycode[mod_index]; + SendEvent(event, event_type); + if (event_type == KeyPress) + event->state |= (1 << mod_index); + else + event->state &= (1 << mod_index); + } + } +} + +/* + * Determines the keycode and modifier mask for the given + * keysym. + */ +int AutoTypePlatformX11::GetKeycode(KeySym keysym, unsigned int *mask) +{ + int shift, mod; + unsigned int mods_rtrn; + KeySym keysym_rtrn; + int keycode; + + keycode = XKeysymToKeycode(m_dpy, keysym); + + /* determine whether there is a combination of the modifiers + (Mod1-Mod5) with or without shift which returns keysym */ + for (shift = 0; shift < 2; shift ++) { + for (mod = ControlMapIndex; mod <= Mod5MapIndex; mod ++) { + *mask = (mod == ControlMapIndex) ? shift : shift | (1 << mod); + XkbTranslateKeyCode(m_xkb, keycode, *mask, &mods_rtrn, &keysym_rtrn); + if (keysym_rtrn == keysym) { + return keycode; + } + } + } + + /* no modifier matches => resort to remapping */ + *mask = 0; + return AddKeysym(keysym); +} + + + /* * Send sequence of KeyPressed/KeyReleased events to the focused * window to simulate keyboard. If modifiers (shift, control, etc) @@ -513,7 +581,6 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym) int revert_to; XKeyEvent event; int keycode; - int mod_index; if (keysym == NoSymbol) { qWarning("No such key: keysym=0x%lX", static_cast(keysym)); @@ -534,46 +601,29 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym) Window root, child; int root_x, root_y, x, y; unsigned int mask; + unsigned int saved_mask; XQueryPointer(m_dpy, event.root, &root, &child, &root_x, &root_y, &x, &y, &mask); + saved_mask = mask; XGetInputFocus(m_dpy, &cur_focus, &revert_to); - - /* Release all set modifiers */ - event.state = 0; - for (mod_index = 0; mod_index < 8; mod_index ++) { - if (mask & m_modifier_mask[mod_index]) { - event.keycode = m_modifier_keycode[mod_index]; - SendEvent(&event, KeyRelease); - } - } - - /* Determine the keycode to press */ - keycode = XKeysymToKeycode(m_dpy, keysym); - /* Case 1: Pressing Shift is required */ - if (XkbKeycodeToKeysym(m_dpy, keycode, 0, 1) == keysym) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Shift_L); - SendEvent(&event, KeyPress); - event.state |= ShiftMask; - } else { - /* Case 2: Obtaining a mapping is required */ - if (XkbKeycodeToKeysym(m_dpy, keycode, 0, 0) != keysym) { - keycode = AddKeysym(keysym); - } - /* Default Case: No shift or Mapping required */ - } + /* release all modifiers */ + SendModifier(&event, mask, KeyRelease); - /* Press and release key */ + /* determine keycode and mask for the given keysym */ + keycode = GetKeycode(keysym, &mask); + SendModifier(&event, mask, KeyPress); + + /* press and release key */ event.keycode = keycode; SendEvent(&event, KeyPress); SendEvent(&event, KeyRelease); - /* Release Shift, if it has been pressed */ - if (event.state & ShiftMask) { - event.keycode = XKeysymToKeycode(m_dpy, XK_Shift_L); - SendEvent(&event, KeyRelease); - event.state &= ShiftMask; - } + /* release the modifiers */ + SendModifier(&event, mask, KeyRelease); + + /* restore the old keyboard mask */ + SendModifier(&event, saved_mask, KeyPress); } int AutoTypePlatformX11::MyErrorHandler(Display* my_dpy, XErrorEvent* event) diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index 909f228d3..66ee7bc18 100644 --- a/src/autotype/x11/AutoTypeX11.h +++ b/src/autotype/x11/AutoTypeX11.h @@ -75,8 +75,10 @@ private: void updateKeymap(); int AddKeysym(KeySym keysym); void AddModifier(KeySym keysym); - void ReadKeymap(); void SendEvent(XKeyEvent* event, int event_type); + void SendModifier(XKeyEvent *event, unsigned int mask, int event_type); + int GetKeycode(KeySym keysym, unsigned int *mask); + static int MyErrorHandler(Display* my_dpy, XErrorEvent* event); Display* m_dpy; @@ -96,14 +98,17 @@ private: static bool m_xErrorOccured; static int (*m_oldXErrorHandler)(Display*, XErrorEvent*); + static const int m_unicodeToKeysymLen; + static const uint m_unicodeToKeysymKeys[]; + static const uint m_unicodeToKeysymValues[]; + + XkbDescPtr m_xkb; KeySym* m_keysymTable; int m_minKeycode; int m_maxKeycode; int m_keysymPerKeycode; - /* dedicated 'special character' keycode */ int m_specialCharacterKeycode; - int m_modifier_mask[N_MOD_INDICES]; KeyCode m_modifier_keycode[N_MOD_INDICES]; }; diff --git a/src/autotype/x11/KeySymMap.h b/src/autotype/x11/KeySymMap.h new file mode 100644 index 000000000..55022feb5 --- /dev/null +++ b/src/autotype/x11/KeySymMap.h @@ -0,0 +1,169 @@ +/* + * Automatically generated by keysymmap.py from parsing keysymdef.h. + */ + +const int AutoTypePlatformX11::m_unicodeToKeysymLen = 632; + +const uint AutoTypePlatformX11::m_unicodeToKeysymKeys[] = { + 0x0100, 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, + 0x0108, 0x0109, 0x010a, 0x010b, 0x010c, 0x010d, 0x010e, 0x010f, + 0x0110, 0x0111, 0x0112, 0x0113, 0x0116, 0x0117, 0x0118, 0x0119, + 0x011a, 0x011b, 0x011c, 0x011d, 0x011e, 0x011f, 0x0120, 0x0121, + 0x0122, 0x0123, 0x0124, 0x0125, 0x0126, 0x0127, 0x0128, 0x0129, + 0x012a, 0x012b, 0x012e, 0x012f, 0x0130, 0x0131, 0x0134, 0x0135, + 0x0136, 0x0137, 0x0138, 0x0139, 0x013a, 0x013b, 0x013c, 0x013d, + 0x013e, 0x0141, 0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147, + 0x0148, 0x014a, 0x014b, 0x014c, 0x014d, 0x0150, 0x0151, 0x0152, + 0x0153, 0x0154, 0x0155, 0x0156, 0x0157, 0x0158, 0x0159, 0x015a, + 0x015b, 0x015c, 0x015d, 0x015e, 0x015f, 0x0160, 0x0161, 0x0162, + 0x0163, 0x0164, 0x0165, 0x0166, 0x0167, 0x0168, 0x0169, 0x016a, + 0x016b, 0x016c, 0x016d, 0x016e, 0x016f, 0x0170, 0x0171, 0x0172, + 0x0173, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d, 0x017e, + 0x0192, 0x02c7, 0x02d8, 0x02d9, 0x02db, 0x02dd, 0x0385, 0x0386, + 0x0388, 0x0389, 0x038a, 0x038c, 0x038e, 0x038f, 0x0390, 0x0391, + 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, + 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 0x03a0, 0x03a1, + 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, 0x03aa, + 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03b0, 0x03b1, 0x03b2, + 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8, 0x03b9, 0x03ba, + 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0, 0x03c1, 0x03c2, + 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, 0x03ca, + 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0x0401, 0x0402, 0x0403, 0x0404, + 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040a, 0x040b, 0x040c, + 0x040e, 0x040f, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, + 0x0416, 0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, + 0x041e, 0x041f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, + 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, + 0x042e, 0x042f, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, + 0x0436, 0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, + 0x043e, 0x043f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, + 0x0446, 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, + 0x044e, 0x044f, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, + 0x0457, 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x045e, 0x045f, + 0x0490, 0x0491, 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, + 0x05d6, 0x05d7, 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, + 0x05de, 0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, + 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea, 0x060c, 0x061b, 0x061f, + 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, + 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, 0x0630, + 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, + 0x0639, 0x063a, 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, + 0x0646, 0x0647, 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, + 0x064e, 0x064f, 0x0650, 0x0651, 0x0652, 0x0e01, 0x0e02, 0x0e03, + 0x0e04, 0x0e05, 0x0e06, 0x0e07, 0x0e08, 0x0e09, 0x0e0a, 0x0e0b, + 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, 0x0e10, 0x0e11, 0x0e12, 0x0e13, + 0x0e14, 0x0e15, 0x0e16, 0x0e17, 0x0e18, 0x0e19, 0x0e1a, 0x0e1b, + 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, 0x0e20, 0x0e21, 0x0e22, 0x0e23, + 0x0e24, 0x0e25, 0x0e26, 0x0e27, 0x0e28, 0x0e29, 0x0e2a, 0x0e2b, + 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, 0x0e30, 0x0e31, 0x0e32, 0x0e33, + 0x0e34, 0x0e35, 0x0e36, 0x0e37, 0x0e38, 0x0e39, 0x0e3a, 0x0e3f, + 0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, + 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0e50, 0x0e51, + 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, 0x0e58, 0x0e59, + 0x2002, 0x2003, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, 0x200a, + 0x2012, 0x2013, 0x2014, 0x2015, 0x2017, 0x2018, 0x2019, 0x201a, + 0x201c, 0x201d, 0x201e, 0x2020, 0x2021, 0x2025, 0x2026, 0x2030, + 0x2032, 0x2033, 0x2038, 0x203e, 0x20ac, 0x2105, 0x2116, 0x2117, + 0x211e, 0x2122, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, + 0x2159, 0x215a, 0x215b, 0x215c, 0x215d, 0x215e, 0x2190, 0x2191, + 0x2192, 0x2193, 0x21d2, 0x21d4, 0x2202, 0x2207, 0x2218, 0x221a, + 0x221d, 0x221e, 0x2227, 0x2228, 0x2229, 0x222a, 0x222b, 0x2234, + 0x223c, 0x2243, 0x2260, 0x2261, 0x2264, 0x2265, 0x2282, 0x2283, + 0x22a2, 0x22a3, 0x22a4, 0x22a5, 0x2308, 0x230a, 0x2315, 0x2320, + 0x2321, 0x2395, 0x239b, 0x239d, 0x239e, 0x23a0, 0x23a1, 0x23a3, + 0x23a4, 0x23a6, 0x23a8, 0x23ac, 0x23b7, 0x23ba, 0x23bb, 0x23bc, + 0x23bd, 0x2409, 0x240a, 0x240b, 0x240c, 0x240d, 0x2424, 0x2500, + 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, 0x252c, + 0x2534, 0x253c, 0x2592, 0x25c6, 0x25cb, 0x260e, 0x2640, 0x2642, + 0x2663, 0x2665, 0x2666, 0x266d, 0x266f, 0x2713, 0x2717, 0x271d, + 0x2720, 0x3001, 0x3002, 0x300c, 0x300d, 0x309b, 0x309c, 0x30a1, + 0x30a2, 0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7, 0x30a8, 0x30a9, + 0x30aa, 0x30ab, 0x30ad, 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, + 0x30b9, 0x30bb, 0x30bd, 0x30bf, 0x30c1, 0x30c3, 0x30c4, 0x30c6, + 0x30c8, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d2, + 0x30d5, 0x30d8, 0x30db, 0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, + 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7, 0x30e8, 0x30e9, 0x30ea, + 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f2, 0x30f3, 0x30fb, 0x30fc +}; + +const uint AutoTypePlatformX11::m_unicodeToKeysymValues[] = { + 0x03c0, 0x03e0, 0x01c3, 0x01e3, 0x01a1, 0x01b1, 0x01c6, 0x01e6, + 0x02c6, 0x02e6, 0x02c5, 0x02e5, 0x01c8, 0x01e8, 0x01cf, 0x01ef, + 0x01d0, 0x01f0, 0x03aa, 0x03ba, 0x03cc, 0x03ec, 0x01ca, 0x01ea, + 0x01cc, 0x01ec, 0x02d8, 0x02f8, 0x02ab, 0x02bb, 0x02d5, 0x02f5, + 0x03ab, 0x03bb, 0x02a6, 0x02b6, 0x02a1, 0x02b1, 0x03a5, 0x03b5, + 0x03cf, 0x03ef, 0x03c7, 0x03e7, 0x02a9, 0x02b9, 0x02ac, 0x02bc, + 0x03d3, 0x03f3, 0x03a2, 0x01c5, 0x01e5, 0x03a6, 0x03b6, 0x01a5, + 0x01b5, 0x01a3, 0x01b3, 0x01d1, 0x01f1, 0x03d1, 0x03f1, 0x01d2, + 0x01f2, 0x03bd, 0x03bf, 0x03d2, 0x03f2, 0x01d5, 0x01f5, 0x13bc, + 0x13bd, 0x01c0, 0x01e0, 0x03a3, 0x03b3, 0x01d8, 0x01f8, 0x01a6, + 0x01b6, 0x02de, 0x02fe, 0x01aa, 0x01ba, 0x01a9, 0x01b9, 0x01de, + 0x01fe, 0x01ab, 0x01bb, 0x03ac, 0x03bc, 0x03dd, 0x03fd, 0x03de, + 0x03fe, 0x02dd, 0x02fd, 0x01d9, 0x01f9, 0x01db, 0x01fb, 0x03d9, + 0x03f9, 0x13be, 0x01ac, 0x01bc, 0x01af, 0x01bf, 0x01ae, 0x01be, + 0x08f6, 0x01b7, 0x01a2, 0x01ff, 0x01b2, 0x01bd, 0x07ae, 0x07a1, + 0x07a2, 0x07a3, 0x07a4, 0x07a7, 0x07a8, 0x07ab, 0x07b6, 0x07c1, + 0x07c2, 0x07c3, 0x07c4, 0x07c5, 0x07c6, 0x07c7, 0x07c8, 0x07c9, + 0x07ca, 0x07cb, 0x07cc, 0x07cd, 0x07ce, 0x07cf, 0x07d0, 0x07d1, + 0x07d2, 0x07d4, 0x07d5, 0x07d6, 0x07d7, 0x07d8, 0x07d9, 0x07a5, + 0x07a9, 0x07b1, 0x07b2, 0x07b3, 0x07b4, 0x07ba, 0x07e1, 0x07e2, + 0x07e3, 0x07e4, 0x07e5, 0x07e6, 0x07e7, 0x07e8, 0x07e9, 0x07ea, + 0x07eb, 0x07ec, 0x07ed, 0x07ee, 0x07ef, 0x07f0, 0x07f1, 0x07f3, + 0x07f2, 0x07f4, 0x07f5, 0x07f6, 0x07f7, 0x07f8, 0x07f9, 0x07b5, + 0x07b9, 0x07b7, 0x07b8, 0x07bb, 0x06b3, 0x06b1, 0x06b2, 0x06b4, + 0x06b5, 0x06b6, 0x06b7, 0x06b8, 0x06b9, 0x06ba, 0x06bb, 0x06bc, + 0x06be, 0x06bf, 0x06e1, 0x06e2, 0x06f7, 0x06e7, 0x06e4, 0x06e5, + 0x06f6, 0x06fa, 0x06e9, 0x06ea, 0x06eb, 0x06ec, 0x06ed, 0x06ee, + 0x06ef, 0x06f0, 0x06f2, 0x06f3, 0x06f4, 0x06f5, 0x06e6, 0x06e8, + 0x06e3, 0x06fe, 0x06fb, 0x06fd, 0x06ff, 0x06f9, 0x06f8, 0x06fc, + 0x06e0, 0x06f1, 0x06c1, 0x06c2, 0x06d7, 0x06c7, 0x06c4, 0x06c5, + 0x06d6, 0x06da, 0x06c9, 0x06ca, 0x06cb, 0x06cc, 0x06cd, 0x06ce, + 0x06cf, 0x06d0, 0x06d2, 0x06d3, 0x06d4, 0x06d5, 0x06c6, 0x06c8, + 0x06c3, 0x06de, 0x06db, 0x06dd, 0x06df, 0x06d9, 0x06d8, 0x06dc, + 0x06c0, 0x06d1, 0x06a3, 0x06a1, 0x06a2, 0x06a4, 0x06a5, 0x06a6, + 0x06a7, 0x06a8, 0x06a9, 0x06aa, 0x06ab, 0x06ac, 0x06ae, 0x06af, + 0x06bd, 0x06ad, 0x0ce0, 0x0ce1, 0x0ce2, 0x0ce3, 0x0ce4, 0x0ce5, + 0x0ce6, 0x0ce7, 0x0ce8, 0x0ce9, 0x0cea, 0x0ceb, 0x0cec, 0x0ced, + 0x0cee, 0x0cef, 0x0cf0, 0x0cf1, 0x0cf2, 0x0cf3, 0x0cf4, 0x0cf5, + 0x0cf6, 0x0cf7, 0x0cf8, 0x0cf9, 0x0cfa, 0x05ac, 0x05bb, 0x05bf, + 0x05c1, 0x05c2, 0x05c3, 0x05c4, 0x05c5, 0x05c6, 0x05c7, 0x05c8, + 0x05c9, 0x05ca, 0x05cb, 0x05cc, 0x05cd, 0x05ce, 0x05cf, 0x05d0, + 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, 0x05d8, + 0x05d9, 0x05da, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, + 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea, 0x05eb, 0x05ec, 0x05ed, + 0x05ee, 0x05ef, 0x05f0, 0x05f1, 0x05f2, 0x0da1, 0x0da2, 0x0da3, + 0x0da4, 0x0da5, 0x0da6, 0x0da7, 0x0da8, 0x0da9, 0x0daa, 0x0dab, + 0x0dac, 0x0dad, 0x0dae, 0x0daf, 0x0db0, 0x0db1, 0x0db2, 0x0db3, + 0x0db4, 0x0db5, 0x0db6, 0x0db7, 0x0db8, 0x0db9, 0x0dba, 0x0dbb, + 0x0dbc, 0x0dbd, 0x0dbe, 0x0dbf, 0x0dc0, 0x0dc1, 0x0dc2, 0x0dc3, + 0x0dc4, 0x0dc5, 0x0dc6, 0x0dc7, 0x0dc8, 0x0dc9, 0x0dca, 0x0dcb, + 0x0dcc, 0x0dcd, 0x0dce, 0x0dcf, 0x0dd0, 0x0dd1, 0x0dd2, 0x0dd3, + 0x0dd4, 0x0dd5, 0x0dd6, 0x0dd7, 0x0dd8, 0x0dd9, 0x0dda, 0x0ddf, + 0x0de0, 0x0de1, 0x0de2, 0x0de3, 0x0de4, 0x0de5, 0x0de6, 0x0de7, + 0x0de8, 0x0de9, 0x0dea, 0x0deb, 0x0dec, 0x0ded, 0x0df0, 0x0df1, + 0x0df2, 0x0df3, 0x0df4, 0x0df5, 0x0df6, 0x0df7, 0x0df8, 0x0df9, + 0x0aa2, 0x0aa1, 0x0aa3, 0x0aa4, 0x0aa5, 0x0aa6, 0x0aa7, 0x0aa8, + 0x0abb, 0x0aaa, 0x0aa9, 0x07af, 0x0cdf, 0x0ad0, 0x0ad1, 0x0afd, + 0x0ad2, 0x0ad3, 0x0afe, 0x0af1, 0x0af2, 0x0aaf, 0x0aae, 0x0ad5, + 0x0ad6, 0x0ad7, 0x0afc, 0x047e, 0x20ac, 0x0ab8, 0x06b0, 0x0afb, + 0x0ad4, 0x0ac9, 0x0ab0, 0x0ab1, 0x0ab2, 0x0ab3, 0x0ab4, 0x0ab5, + 0x0ab6, 0x0ab7, 0x0ac3, 0x0ac4, 0x0ac5, 0x0ac6, 0x08fb, 0x08fc, + 0x08fd, 0x08fe, 0x08ce, 0x08cd, 0x08ef, 0x08c5, 0x0bca, 0x08d6, + 0x08c1, 0x08c2, 0x08de, 0x08df, 0x08dc, 0x08dd, 0x08bf, 0x08c0, + 0x08c8, 0x08c9, 0x08bd, 0x08cf, 0x08bc, 0x08be, 0x08da, 0x08db, + 0x0bfc, 0x0bdc, 0x0bc2, 0x0bce, 0x0bd3, 0x0bc4, 0x0afa, 0x08a4, + 0x08a5, 0x0bcc, 0x08ab, 0x08ac, 0x08ad, 0x08ae, 0x08a7, 0x08a8, + 0x08a9, 0x08aa, 0x08af, 0x08b0, 0x08a1, 0x09ef, 0x09f0, 0x09f2, + 0x09f3, 0x09e2, 0x09e5, 0x09e9, 0x09e3, 0x09e4, 0x09e8, 0x09f1, + 0x09f8, 0x09ec, 0x09eb, 0x09ed, 0x09ea, 0x09f4, 0x09f5, 0x09f7, + 0x09f6, 0x09ee, 0x09e1, 0x09e0, 0x0bcf, 0x0af9, 0x0af8, 0x0af7, + 0x0aec, 0x0aee, 0x0aed, 0x0af6, 0x0af5, 0x0af3, 0x0af4, 0x0ad9, + 0x0af0, 0x04a4, 0x04a1, 0x04a2, 0x04a3, 0x04de, 0x04df, 0x04a7, + 0x04b1, 0x04a8, 0x04b2, 0x04a9, 0x04b3, 0x04aa, 0x04b4, 0x04ab, + 0x04b5, 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0x04ba, 0x04bb, 0x04bc, + 0x04bd, 0x04be, 0x04bf, 0x04c0, 0x04c1, 0x04af, 0x04c2, 0x04c3, + 0x04c4, 0x04c5, 0x04c6, 0x04c7, 0x04c8, 0x04c9, 0x04ca, 0x04cb, + 0x04cc, 0x04cd, 0x04ce, 0x04cf, 0x04d0, 0x04d1, 0x04d2, 0x04d3, + 0x04ac, 0x04d4, 0x04ad, 0x04d5, 0x04ae, 0x04d6, 0x04d7, 0x04d8, + 0x04d9, 0x04da, 0x04db, 0x04dc, 0x04a6, 0x04dd, 0x04a5, 0x04b0 +}; diff --git a/src/autotype/x11/keysymmap.py b/src/autotype/x11/keysymmap.py new file mode 100755 index 000000000..a35971015 --- /dev/null +++ b/src/autotype/x11/keysymmap.py @@ -0,0 +1,107 @@ +#!/usr/bin/python3 + +# +# Copyright (C) 2013 Felix Geyer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 or (at your option) +# version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# +# Parses keysymdef.h to construct a unicode symbol -> keysym mapping table. +# +# The lines that are parsed look like this: +# #define XK_Aogonek 0x01a1 /* U+0104 LATIN CAPITAL LETTER A WITH OGONEK */ +# +# This would create a 0x0104 -> 0x01a1 mapping. +# + +import sys +import re +import collections + +cols = 8 + +if len(sys.argv) >= 2: + keysymdef = sys.argv[1] +else: + keysymdef = "/usr/include/X11/keysymdef.h" + +keysymMap = {} + +f = open(keysymdef, "r") +for line in f: + match = re.search(r'0x([0-9a-fA-F]+)\s+/\* U\+([0-9a-fA-F]+)', line) + if match: + keysym = int(match.group(1), 16) + unicodeVal = int(match.group(2), 16) + + # ignore 1:1 mappings + if keysym >= 0x0020 and keysym <= 0x007e: + continue + if keysym >= 0x00a0 and keysym <= 0x00ff: + continue + # ignore unicode | 0x01000000 mappings + if keysym >= 0x1000000: + continue + + keysymMap[unicodeVal] = keysym + +keysymMap = collections.OrderedDict(sorted(keysymMap.items(), key=lambda t: t[0])) + +print("""/* + * Automatically generated by keysymmap.py from parsing keysymdef.h. + */ +""") + +print("const int AutoTypePlatformX11::m_unicodeToKeysymLen = " + str(len(keysymMap)) + ";") + +print() + +print("const uint AutoTypePlatformX11::m_unicodeToKeysymKeys[] = {") +keys = keysymMap.keys() +keyLen = len(keys) +i = 1 +for val in keys: + hexVal = "{0:#0{1}x}".format(val, 6) + + if i == keyLen: + print(hexVal) + elif (i % cols) == 0: + print(hexVal + ",") + elif ((i - 1) % cols) == 0: + print(" " + hexVal + ", ", end="") + else: + print(hexVal + ", ", end="") + i += 1 +print("};") + +print() + +print("const uint AutoTypePlatformX11::m_unicodeToKeysymValues[] = {") +values = keysymMap.values() +valuesLen = len(values) +i = 1 +for val in values: + hexVal = "{0:#0{1}x}".format(val, 6) + + if i == valuesLen: + print(hexVal) + elif (i % cols) == 0: + print(hexVal + ",") + elif ((i - 1) % cols) == 0: + print(" " + hexVal + ", ", end="") + else: + print(hexVal + ", ", end="") + i += 1 +print("};")