diff options
author | markt <markt> | 2006-07-21 08:36:12 (GMT) |
---|---|---|
committer | markt <markt> | 2006-07-21 08:36:12 (GMT) |
commit | a72fc5e00213eccb1fcf019566eea7c98fdb0611 (patch) | |
tree | 633511b8af91a45ff08176f2981fd99f8a7c8e7e /src/FbTk | |
parent | 9be679dad71f81e85d6e55dd11c662b17e73d937 (diff) | |
download | fluxbox_paul-a72fc5e00213eccb1fcf019566eea7c98fdb0611.zip fluxbox_paul-a72fc5e00213eccb1fcf019566eea7c98fdb0611.tar.bz2 |
unfix *lock modifiers, ignore scroll lock on events
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/KeyUtil.cc | 2 | ||||
-rw-r--r-- | src/FbTk/KeyUtil.hh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc index 4300cd7..24e43c8 100644 --- a/src/FbTk/KeyUtil.cc +++ b/src/FbTk/KeyUtil.cc | |||
@@ -62,7 +62,7 @@ KeyUtil &KeyUtil::instance() { | |||
62 | 62 | ||
63 | 63 | ||
64 | KeyUtil::KeyUtil() | 64 | KeyUtil::KeyUtil() |
65 | : m_modmap(0) | 65 | : m_modmap(0), m_capslock(0), m_numlock(0), m_scrolllock(0) |
66 | { | 66 | { |
67 | init(); | 67 | init(); |
68 | } | 68 | } |
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh index e32384f..e1f1276 100644 --- a/src/FbTk/KeyUtil.hh +++ b/src/FbTk/KeyUtil.hh | |||
@@ -67,7 +67,7 @@ public: | |||
67 | */ | 67 | */ |
68 | unsigned int cleanMods(unsigned int mods) { | 68 | unsigned int cleanMods(unsigned int mods) { |
69 | //remove numlock, capslock and scrolllock | 69 | //remove numlock, capslock and scrolllock |
70 | return mods & ~(capslock() | numlock() ); | 70 | return mods & ~(capslock() | numlock() | scrolllock()); |
71 | } | 71 | } |
72 | 72 | ||
73 | /** | 73 | /** |
@@ -83,9 +83,9 @@ public: | |||
83 | @return corresponding modifier mask | 83 | @return corresponding modifier mask |
84 | */ | 84 | */ |
85 | static unsigned int keycodeToModmask(unsigned int keycode); | 85 | static unsigned int keycodeToModmask(unsigned int keycode); |
86 | int numlock() const { return Mod2Mask; } //m_numlock; } | 86 | int numlock() const { return m_numlock; } |
87 | int capslock() const { return LockMask; } //m_capslock; } | 87 | int capslock() const { return m_capslock; } |
88 | int scrolllock() const { return Mod5Mask; } //m_scrolllock; } | 88 | int scrolllock() const { return m_scrolllock; } |
89 | 89 | ||
90 | private: | 90 | private: |
91 | void loadModmap(); | 91 | void loadModmap(); |