nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Display * to Keys constructor and added ungrabKeys function

Browse source
This commit is contained in:
fluxgen 2002-01-07 23:46:58 +00:00
parent 2765d34a19
commit b197eab01d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Keys.hh
View file

@ -18,6 +18,9 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Keys.hh,v 1.3 2002/01/07 23:46:58 fluxgen Exp $
#ifndef _KEYS_HH_ #ifndef _KEYS_HH_
#define _KEYS_HH_ #define _KEYS_HH_
@ -49,19 +52,20 @@ enum KeyAction{
LASTKEYGRAB LASTKEYGRAB
}; };
Keys(char *filename); Keys(Display *display, char *filename=0);
~Keys(); ~Keys();
bool load(char *filename=0); bool load(char *filename=0);
KeyAction getAction(XKeyEvent *ke); KeyAction getAction(XKeyEvent *ke);
bool reconfigure(char *filename); bool reconfigure(char *filename);
const char *getActionStr(KeyAction action); const char *getActionStr(KeyAction action);
std::string getExecCommand() { return m_execcmdstring; } std::string getExecCommand() { return m_execcmdstring; }
private: private:
void deleteTree(); void deleteTree();
void ungrabKeys();
void bindKey(unsigned int key, unsigned int mod); void bindKey(unsigned int key, unsigned int mod);
unsigned int getModifier(char *modstr); unsigned int getModifier(const char *modstr);
unsigned int getKey(char *keystr); unsigned int getKey(const char *keystr);
void grabKey(unsigned int key, unsigned int mod); void grabKey(unsigned int key, unsigned int mod);
std::string filename; std::string filename;
@ -112,6 +116,7 @@ private:
std::vector<t_key *> m_keylist; std::vector<t_key *> m_keylist;
t_key *m_abortkey; //abortkey for keygrabbing chain t_key *m_abortkey; //abortkey for keygrabbing chain
std::string m_execcmdstring; //copy of the execcommandstring std::string m_execcmdstring; //copy of the execcommandstring
Display *m_display;
}; };
#endif // _KEYS_HH_ #endif // _KEYS_HH_