diff options
author | rathnor <rathnor> | 2003-10-05 07:20:47 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-10-05 07:20:47 (GMT) |
commit | 6984eb8970b61c0a6bcacba301707807d47d9b42 (patch) | |
tree | 2ca7c64b11b3be6b61cb186463b3aef84c8e448e /src/Keys.hh | |
parent | c516aa13a134ff311a1ce56976c030ba016bcfda (diff) | |
download | fluxbox-6984eb8970b61c0a6bcacba301707807d47d9b42.zip fluxbox-6984eb8970b61c0a6bcacba301707807d47d9b42.tar.bz2 |
shuffle bunch of stuff from Keys into FbTk/KeyUtil
Diffstat (limited to 'src/Keys.hh')
-rw-r--r-- | src/Keys.hh | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/Keys.hh b/src/Keys.hh index f3a89bd..cc51218 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.28 2003/09/06 13:58:06 fluxgen Exp $ | 22 | // $Id: Keys.hh,v 1.29 2003/10/05 07:19:36 rathnor Exp $ |
23 | 23 | ||
24 | #ifndef KEYS_HH | 24 | #ifndef KEYS_HH |
25 | #define KEYS_HH | 25 | #define KEYS_HH |
@@ -46,9 +46,6 @@ public: | |||
46 | /// destructor | 46 | /// destructor |
47 | ~Keys(); | 47 | ~Keys(); |
48 | 48 | ||
49 | unsigned int keycodeToModmask(unsigned int keycode); | ||
50 | |||
51 | void loadModmap(); | ||
52 | /** | 49 | /** |
53 | Load configuration from file | 50 | Load configuration from file |
54 | @return true on success, else false | 51 | @return true on success, else false |
@@ -66,24 +63,13 @@ public: | |||
66 | 63 | ||
67 | private: | 64 | private: |
68 | void deleteTree(); | 65 | void deleteTree(); |
69 | void ungrabKeys(); | 66 | |
70 | void bindKey(unsigned int key, unsigned int mod); | 67 | void bindKey(unsigned int key, unsigned int mod); |
71 | /** | 68 | /** |
72 | @param modstr modifier string (i.e Mod4, Mod5) | 69 | @param modstr modifier string (i.e Mod4, Mod5) |
73 | @return modifier number that match modstr | 70 | @return modifier number that match modstr |
74 | */ | 71 | */ |
75 | unsigned int getModifier(const char *modstr); | 72 | |
76 | /** | ||
77 | @param keystr a key string (i.e F1, Enter) | ||
78 | @return key number that match keystr | ||
79 | */ | ||
80 | unsigned int getKey(const char *keystr); | ||
81 | /** | ||
82 | grab a key | ||
83 | @param key the key | ||
84 | @param mod the modifier | ||
85 | */ | ||
86 | void grabKey(unsigned int key, unsigned int mod); | ||
87 | std::string filename; | 73 | std::string filename; |
88 | 74 | ||
89 | class t_key { | 75 | class t_key { |
@@ -127,7 +113,6 @@ private: | |||
127 | std::vector<t_key *> m_keylist; | 113 | std::vector<t_key *> m_keylist; |
128 | 114 | ||
129 | Display *m_display; ///< display connection | 115 | Display *m_display; ///< display connection |
130 | XModifierKeymap *m_modmap; | ||
131 | 116 | ||
132 | }; | 117 | }; |
133 | 118 | ||