Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-22 13:54:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Better naming & actually save m_currentRemapKeysym.

Browse source
This commit is contained in:
Albert Weichselbraun 2013-12-16 09:41:43 +01:00
parent 6a50a76466
commit 0f91e0d141
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/autotype/x11/AutoTypeX11.cpp
View file

@ -47,7 +47,7 @@ AutoTypePlatformX11::AutoTypePlatformX11()
m_keysymTable = Q_NULLPTR; m_keysymTable = Q_NULLPTR;
m_xkb = Q_NULLPTR; m_xkb = Q_NULLPTR;
m_remapKeycode = 0; m_remapKeycode = 0;
m_currentRemapKeycode = NoSymbol; m_currentRemapKeysym = NoSymbol;
m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask; m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask;
m_loaded = true; m_loaded = true;
@ -442,7 +442,7 @@ void AutoTypePlatformX11::updateKeymap()
/* determine the keycode to use for remapped keys */ /* determine the keycode to use for remapped keys */
inx = (m_remapKeycode - m_minKeycode) * m_keysymPerKeycode; inx = (m_remapKeycode - m_minKeycode) * m_keysymPerKeycode;
if (m_remapKeycode == 0 || m_keysymTable[inx] != m_currentRemapKeycode) { if (m_remapKeycode == 0 || m_keysymTable[inx] != m_currentRemapKeysym) {
for (keycode = m_minKeycode; keycode <= m_maxKeycode; keycode++) { for (keycode = m_minKeycode; keycode <= m_maxKeycode; keycode++) {
inx = (keycode - m_minKeycode) * m_keysymPerKeycode; inx = (keycode - m_minKeycode) * m_keysymPerKeycode;
if (m_keysymTable[inx] == NoSymbol) { if (m_keysymTable[inx] == NoSymbol) {
@ -513,6 +513,7 @@ int AutoTypePlatformX11::AddKeysym(KeySym keysym)
int inx = (m_remapKeycode- m_minKeycode) * m_keysymPerKeycode; int inx = (m_remapKeycode- m_minKeycode) * m_keysymPerKeycode;
m_keysymTable[inx] = keysym; m_keysymTable[inx] = keysym;
m_currentRemapKeysym = keysym;
XChangeKeyboardMapping(m_dpy, m_remapKeycode, m_keysymPerKeycode, &m_keysymTable[inx], 1); XChangeKeyboardMapping(m_dpy, m_remapKeycode, m_keysymPerKeycode, &m_keysymTable[inx], 1);
XFlush(m_dpy); XFlush(m_dpy);

2
src/autotype/x11/AutoTypeX11.h
View file

@ -108,7 +108,7 @@ private:
int m_keysymPerKeycode; int m_keysymPerKeycode;
/* dedicated keycode for remapped keys */ /* dedicated keycode for remapped keys */
unsigned int m_remapKeycode; unsigned int m_remapKeycode;
KeySym m_currentRemapKeycode; KeySym m_currentRemapKeysym;
KeyCode m_modifier_keycode[N_MOD_INDICES]; KeyCode m_modifier_keycode[N_MOD_INDICES];
bool m_loaded; bool m_loaded;
}; };