summaryrefslogtreecommitdiff
path: root/src/Keys.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Keys.hh')
-rw-r--r--src/Keys.hh22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/Keys.hh b/src/Keys.hh
index a296200..efd6331 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -1,5 +1,5 @@
1// Keys.hh for Fluxbox - an X11 Window manager 1// Keys.hh for Fluxbox - an X11 Window manager
2// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at linuxmail.org) 2// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Keys.hh,v 1.26 2003/06/30 14:57:14 fluxgen Exp $ 22// $Id: Keys.hh,v 1.27 2003/08/19 16:18:54 fluxgen Exp $
23 23
24#ifndef KEYS_HH 24#ifndef KEYS_HH
25#define KEYS_HH 25#define KEYS_HH
@@ -52,7 +52,7 @@ public:
52 */ 52 */
53 static unsigned int cleanMods(unsigned int mods) 53 static unsigned int cleanMods(unsigned int mods)
54 //remove numlock, capslock and scrolllock 54 //remove numlock, capslock and scrolllock
55 { return mods & (~Mod2Mask & ~Mod5Mask & ~LockMask);} 55 { return mods & (~s_capslock_mod & ~s_numlock_mod & ~s_scrolllock_mod); }
56 56
57 unsigned int keycodeToModmask(unsigned int keycode); 57 unsigned int keycodeToModmask(unsigned int keycode);
58 void loadModmap(); 58 void loadModmap();
@@ -132,21 +132,13 @@ private:
132 */ 132 */
133 bool mergeTree(t_key *newtree, t_key *basetree=0); 133 bool mergeTree(t_key *newtree, t_key *basetree=0);
134 134
135#ifdef DEBUG 135 static int s_capslock_mod, s_numlock_mod, s_scrolllock_mod; ///< modifiers
136 /// debug function
137 void showTree();
138 /// debug function
139 void showKeyTree(t_key *key, unsigned int w=0);
140#endif //DEBUG
141
142 int m_capslock_mod, m_numlock_mod, m_scrolllock_mod; ///< modifiers
143 136
144 std::vector<t_key *> m_keylist; 137 std::vector<t_key *> m_keylist;
145 t_key *m_abortkey; ///< abortkey for keygrabbing chain
146 std::string m_execcmdstring; ///< copy of the execcommandstring 138 std::string m_execcmdstring; ///< copy of the execcommandstring
147 int m_param; ///< copy of the param argument 139 int m_param; ///< copy of the param argument
148 Display *m_display; ///< display connection 140 Display *m_display; ///< display connection
149 XModifierKeymap *m_modmap; // Modifier->keycode mapping 141 XModifierKeymap *m_modmap; ///< Modifier->keycode mapping
150}; 142};
151 143
152#endif // _KEYS_HH_ 144#endif // KEYS_HH