aboutsummaryrefslogtreecommitdiff
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, 6 insertions, 16 deletions
diff --git a/src/Keys.hh b/src/Keys.hh
index efd6331..f3a89bd 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -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.27 2003/08/19 16:18:54 fluxgen Exp $ 22// $Id: Keys.hh,v 1.28 2003/09/06 13:58:06 fluxgen Exp $
23 23
24#ifndef KEYS_HH 24#ifndef KEYS_HH
25#define KEYS_HH 25#define KEYS_HH
@@ -46,17 +46,9 @@ public:
46 /// destructor 46 /// destructor
47 ~Keys(); 47 ~Keys();
48 48
49 /**
50 Strip out modifiers we want to ignore
51 @return the cleaned state number
52 */
53 static unsigned int cleanMods(unsigned int mods)
54 //remove numlock, capslock and scrolllock
55 { return mods & (~s_capslock_mod & ~s_numlock_mod & ~s_scrolllock_mod); }
56
57 unsigned int keycodeToModmask(unsigned int keycode); 49 unsigned int keycodeToModmask(unsigned int keycode);
58 void loadModmap();
59 50
51 void loadModmap();
60 /** 52 /**
61 Load configuration from file 53 Load configuration from file
62 @return true on success, else false 54 @return true on success, else false
@@ -132,13 +124,11 @@ private:
132 */ 124 */
133 bool mergeTree(t_key *newtree, t_key *basetree=0); 125 bool mergeTree(t_key *newtree, t_key *basetree=0);
134 126
135 static int s_capslock_mod, s_numlock_mod, s_scrolllock_mod; ///< modifiers
136
137 std::vector<t_key *> m_keylist; 127 std::vector<t_key *> m_keylist;
138 std::string m_execcmdstring; ///< copy of the execcommandstring 128
139 int m_param; ///< copy of the param argument 129 Display *m_display; ///< display connection
140 Display *m_display; ///< display connection 130 XModifierKeymap *m_modmap;
141 XModifierKeymap *m_modmap; ///< Modifier->keycode mapping 131
142}; 132};
143 133
144#endif // KEYS_HH 134#endif // KEYS_HH