diff options
Diffstat (limited to 'src/Keys.hh')
-rw-r--r-- | src/Keys.hh | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/Keys.hh b/src/Keys.hh index 843f3a9..3351668 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.14 2002/07/27 18:03:39 fluxgen Exp $ | 22 | // $Id: Keys.hh,v 1.15 2002/08/04 15:55:13 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef KEYS_HH | 24 | #ifndef KEYS_HH |
25 | #define KEYS_HH | 25 | #define KEYS_HH |
@@ -31,7 +31,9 @@ | |||
31 | class Keys | 31 | class Keys |
32 | { | 32 | { |
33 | public: | 33 | public: |
34 | 34 | /** | |
35 | Key actions | ||
36 | */ | ||
35 | enum KeyAction{ | 37 | enum KeyAction{ |
36 | ICONIFY=0, | 38 | ICONIFY=0, |
37 | RAISE, LOWER, | 39 | RAISE, LOWER, |
@@ -59,7 +61,11 @@ public: | |||
59 | ROOTMENU, // pop up rootmenu | 61 | ROOTMENU, // pop up rootmenu |
60 | LASTKEYGRAB //mark end of keygrabbs | 62 | LASTKEYGRAB //mark end of keygrabbs |
61 | }; | 63 | }; |
62 | 64 | /** | |
65 | Constructor | ||
66 | @param display display connection | ||
67 | @param filename file to load, default none | ||
68 | */ | ||
63 | Keys(Display *display, const char *filename=0); | 69 | Keys(Display *display, const char *filename=0); |
64 | /// destructor | 70 | /// destructor |
65 | ~Keys(); | 71 | ~Keys(); |
@@ -97,8 +103,21 @@ private: | |||
97 | void deleteTree(); | 103 | void deleteTree(); |
98 | void ungrabKeys(); | 104 | void ungrabKeys(); |
99 | void bindKey(unsigned int key, unsigned int mod); | 105 | void bindKey(unsigned int key, unsigned int mod); |
106 | /** | ||
107 | @param modstr modifier string (i.e Mod4, Mod5) | ||
108 | @return modifier number that match modstr | ||
109 | */ | ||
100 | unsigned int getModifier(const char *modstr); | 110 | unsigned int getModifier(const char *modstr); |
111 | /** | ||
112 | @param keystr a key string (i.e F1, Enter) | ||
113 | @return key number that match keystr | ||
114 | */ | ||
101 | unsigned int getKey(const char *keystr); | 115 | unsigned int getKey(const char *keystr); |
116 | /** | ||
117 | grab a key | ||
118 | @param key the key | ||
119 | @param mod the modifier | ||
120 | */ | ||
102 | void grabKey(unsigned int key, unsigned int mod); | 121 | void grabKey(unsigned int key, unsigned int mod); |
103 | std::string filename; | 122 | std::string filename; |
104 | 123 | ||
@@ -139,6 +158,7 @@ private: | |||
139 | @return true on success, else false | 158 | @return true on success, else false |
140 | */ | 159 | */ |
141 | bool mergeTree(t_key *newtree, t_key *basetree=0); | 160 | bool mergeTree(t_key *newtree, t_key *basetree=0); |
161 | |||
142 | #ifdef DEBUG | 162 | #ifdef DEBUG |
143 | /// debug function | 163 | /// debug function |
144 | void showTree(); | 164 | void showTree(); |
@@ -154,10 +174,10 @@ private: | |||
154 | static t_actionstr m_actionlist[]; | 174 | static t_actionstr m_actionlist[]; |
155 | 175 | ||
156 | std::vector<t_key *> m_keylist; | 176 | std::vector<t_key *> m_keylist; |
157 | t_key *m_abortkey; //abortkey for keygrabbing chain | 177 | t_key *m_abortkey; ///< abortkey for keygrabbing chain |
158 | std::string m_execcmdstring; //copy of the execcommandstring | 178 | std::string m_execcmdstring; ///< copy of the execcommandstring |
159 | int m_param; // copy of the param argument | 179 | int m_param; ///< copy of the param argument |
160 | Display *m_display; | 180 | Display *m_display; ///< display connection |
161 | }; | 181 | }; |
162 | 182 | ||
163 | #endif // _KEYS_HH_ | 183 | #endif // _KEYS_HH_ |