summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-07 23:46:58 (GMT)
committerfluxgen <fluxgen>2002-01-07 23:46:58 (GMT)
commitb197eab01d1bf3c88c32fb158f0eeed9ca650443 (patch)
tree10997eaafe97ca25b7f5d05cbfbba3c74cfe08c3
parent2765d34a196cf204db2c5d57d63e254cc2b90d8e (diff)
downloadfluxbox_lack-b197eab01d1bf3c88c32fb158f0eeed9ca650443.zip
fluxbox_lack-b197eab01d1bf3c88c32fb158f0eeed9ca650443.tar.bz2
Added Display * to Keys constructor and added ungrabKeys function
-rw-r--r--src/Keys.hh13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Keys.hh b/src/Keys.hh
index 8f32465..910c866 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -18,6 +18,9 @@
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
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
22// $Id: Keys.hh,v 1.3 2002/01/07 23:46:58 fluxgen Exp $
23
21#ifndef _KEYS_HH_ 24#ifndef _KEYS_HH_
22#define _KEYS_HH_ 25#define _KEYS_HH_
23 26
@@ -49,19 +52,20 @@ enum KeyAction{
49 LASTKEYGRAB 52 LASTKEYGRAB
50 }; 53 };
51 54
52 Keys(char *filename); 55 Keys(Display *display, char *filename=0);
53 ~Keys(); 56 ~Keys();
54 bool load(char *filename=0); 57 bool load(char *filename=0);
55 KeyAction getAction(XKeyEvent *ke); 58 KeyAction getAction(XKeyEvent *ke);
56 bool reconfigure(char *filename); 59 bool reconfigure(char *filename);
57 const char *getActionStr(KeyAction action); 60 const char *getActionStr(KeyAction action);
58 std::string getExecCommand() { return m_execcmdstring; } 61 std::string getExecCommand() { return m_execcmdstring; }
62
59private: 63private:
60 void deleteTree(); 64 void deleteTree();
61 65 void ungrabKeys();
62 void bindKey(unsigned int key, unsigned int mod); 66 void bindKey(unsigned int key, unsigned int mod);
63 unsigned int getModifier(char *modstr); 67 unsigned int getModifier(const char *modstr);
64 unsigned int getKey(char *keystr); 68 unsigned int getKey(const char *keystr);
65 void grabKey(unsigned int key, unsigned int mod); 69 void grabKey(unsigned int key, unsigned int mod);
66 std::string filename; 70 std::string filename;
67 71
@@ -112,6 +116,7 @@ private:
112 std::vector<t_key *> m_keylist; 116 std::vector<t_key *> m_keylist;
113 t_key *m_abortkey; //abortkey for keygrabbing chain 117 t_key *m_abortkey; //abortkey for keygrabbing chain
114 std::string m_execcmdstring; //copy of the execcommandstring 118 std::string m_execcmdstring; //copy of the execcommandstring
119 Display *m_display;
115}; 120};
116 121
117#endif // _KEYS_HH_ 122#endif // _KEYS_HH_