From 0f91e0d141a5cf40c46bc1f57b935133ea4a2951 Mon Sep 17 00:00:00 2001
From: Albert Weichselbraun <albert@weichselbraun.net>
Date: Mon, 16 Dec 2013 09:41:43 +0100
Subject: [PATCH] Better naming & actually save m_currentRemapKeysym.

---
 src/autotype/x11/AutoTypeX11.cpp | 5 +++--
 src/autotype/x11/AutoTypeX11.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp
index c6260fcbf..2e55db364 100644
--- a/src/autotype/x11/AutoTypeX11.cpp
+++ b/src/autotype/x11/AutoTypeX11.cpp
@@ -47,7 +47,7 @@ AutoTypePlatformX11::AutoTypePlatformX11()
     m_keysymTable = Q_NULLPTR;
     m_xkb = Q_NULLPTR;
     m_remapKeycode = 0;
-    m_currentRemapKeycode = NoSymbol;
+    m_currentRemapKeysym = NoSymbol;
     m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask;
 
     m_loaded = true;
@@ -442,7 +442,7 @@ void AutoTypePlatformX11::updateKeymap()
 
     /* determine the keycode to use for remapped keys */
     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++) {
             inx = (keycode - m_minKeycode) * m_keysymPerKeycode;
             if (m_keysymTable[inx] == NoSymbol) {
@@ -513,6 +513,7 @@ int AutoTypePlatformX11::AddKeysym(KeySym keysym)
 
     int inx = (m_remapKeycode- m_minKeycode) * m_keysymPerKeycode;
     m_keysymTable[inx] = keysym;
+    m_currentRemapKeysym = keysym;
     XChangeKeyboardMapping(m_dpy, m_remapKeycode, m_keysymPerKeycode, &m_keysymTable[inx], 1);
     XFlush(m_dpy);
 
diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h
index 202257e3f..5d6708170 100644
--- a/src/autotype/x11/AutoTypeX11.h
+++ b/src/autotype/x11/AutoTypeX11.h
@@ -108,7 +108,7 @@ private:
     int m_keysymPerKeycode;
     /* dedicated keycode for remapped keys */
     unsigned int m_remapKeycode;
-    KeySym m_currentRemapKeycode;
+    KeySym m_currentRemapKeysym;
     KeyCode m_modifier_keycode[N_MOD_INDICES];
     bool m_loaded;
 };