X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=53565c387af056460722c112533393270c216e10;hb=b18959e1bda52f807f62c95772c69ce3005215a7;hp=e04a7b1874a606640cc0fd76835e5ce9d9f7bfb4;hpb=a6661d587cd043e1894418c091b8dbd4e18a7d55;p=chaz%2Fopenbox diff --git a/src/bindings.hh b/src/bindings.hh index e04a7b18..53565c38 100644 --- a/src/bindings.hh +++ b/src/bindings.hh @@ -2,18 +2,58 @@ #ifndef __binding_hh #define __binding_hh -/*! @file binding.hh +/*! @file bindings.hh @brief I dunno.. some binding stuff? */ #include "actions.hh" +#include "python.hh" +#include "otk/timer.hh" #include +#include #include namespace ob { -class OBClient; +class Client; + +struct MouseCallbackData { + MouseCallback callback; + void *data; + MouseCallbackData(MouseCallback c, void *d) : callback(c), data(d) {} + void fire(MouseData *d) { callback(d, data); } + bool operator==(const MouseCallbackData &other) { return (callback == + other.callback && + data == + other.data); } +}; + +struct KeyCallbackData { + KeyCallback callback; + void *data; + KeyCallbackData(KeyCallback c, void *d) : callback(c), data(d) {} + void fire(KeyData *d) { callback(d, data); } + bool operator==(const KeyCallbackData &other) { return (callback == + other.callback && + data == + other.data); } +}; + +struct EventCallbackData { + EventCallback callback; + void *data; + EventCallbackData(EventCallback c, void *d) : callback(c), data(d) {} + void fire(EventData *d) { callback(d, data); } + bool operator==(const EventCallbackData &other) { return (callback == + other.callback && + data == + other.data); } +}; + +typedef std::list MouseCallbackList; +typedef std::list KeyCallbackList; +typedef std::list EventCallbackList; typedef struct Binding { unsigned int modifiers; @@ -26,96 +66,117 @@ typedef struct Binding { Binding(unsigned int mod, unsigned int k) { modifiers = mod; key = k; } } Binding; -typedef struct BindingTree { +typedef struct KeyBindingTree { Binding binding; - int id; // the id given for the binding in add() - bool chain; // true if this is a chain to another key (not an action) + KeyCallbackList callbacks; // the callbacks given for the binding in add() + bool chain; // true if this is a chain to another key (not an action) - struct BindingTree *next_sibling; // the next binding in the tree at the same + struct KeyBindingTree *next_sibling; // the next binding in the tree at the same // level - struct BindingTree *first_child; // the first child of this binding (next + struct KeyBindingTree *first_child; // the first child of this binding (next // binding in a chained sequence). - BindingTree(int id) : binding(0, 0) { - this->id = id; chain = true; next_sibling = first_child = 0; - } - BindingTree() : binding(0, 0) { - this->id = -1; chain = true; next_sibling = first_child = 0; + KeyBindingTree() : binding(0, 0) { + chain = true; next_sibling = first_child = 0; } -} BindingTree; +} KeyBindingTree; + +typedef struct ButtonBinding { + Binding binding; + MouseCallbackList callbacks[MouseAction::NUM_MOUSE_ACTION]; + ButtonBinding() : binding(0, 0) {} +}; -class OBBindings { +class Bindings { public: //! A list of strings typedef std::vector StringVect; private: - BindingTree _keytree; // root node of the tree (this doesn't have siblings!) - BindingTree *_curpos; // position in the keytree - - BindingTree *_mousetree; // this tree is a list. it has only siblings + // root node of the tree (this doesn't have siblings!) + KeyBindingTree _keytree; + KeyBindingTree *_curpos; // position in the keytree Binding _resetkey; // the key which resets the key chain status - - int find_key(BindingTree *search) const; - bool translate(const std::string &str, Binding &b, bool askey) const; - BindingTree *buildtree(const StringVect &keylist, int id) const; - void assimilate(BindingTree *node); - void grabMouseOnAll(bool grab); + otk::Timer *_timer; -public: - //! Initializes an OBBinding object - OBBindings(); - //! Destroys the OBBinding object - virtual ~OBBindings(); + KeyBindingTree *find(KeyBindingTree *search, bool *conflict) const; + KeyBindingTree *buildtree(const StringVect &keylist, + KeyCallback callback, void *data) const; + void assimilate(KeyBindingTree *node); - //! Adds a new mouse binding - /*! - A binding will fail to be added if the binding already exists, or if the - string is invalid. - @return true if the binding could be added; false if it could not. - */ - bool add_mouse(const std::string &button, int id); + static void resetChains(Bindings *self); // the timer's timeout function - //! Removes a mouse binding - /*! - @return The id of the binding that was removed, or '< 0' if none were - removed. - */ - int remove_mouse(const std::string &button); + typedef std::list ButtonBindingList; + ButtonBindingList _buttons[MouseContext::NUM_MOUSE_CONTEXT]; + + void grabButton(bool grab, const Binding &b, MouseContext::MC context, + Client *client); + + EventCallbackList _eventlist[EventAction::NUM_EVENT_ACTION]; + KeyCallbackData _keybgrab_callback; + +public: + //! Initializes an Bindings object + Bindings(); + //! Destroys the Bindings object + virtual ~Bindings(); + + //! Translates a binding string into the actual Binding + bool translate(const std::string &str, Binding &b, bool askey = true) const; + //! Adds a new key binding /*! A binding will fail to be added if the binding already exists (as part of a chain or not), or if any of the strings in the keylist are invalid. @return true if the binding could be added; false if it could not. */ - bool add_key(const StringVect &keylist, int id); + bool addKey(const StringVect &keylist, KeyCallback callback, void *data); - //! Removes a key binding - /*! - @return The id of the binding that was removed, or '< 0' if none were - removed. - */ - int remove_key(const StringVect &keylist); + ////! Removes a key binding + ///*! + // @return The callbackid of the binding, or '< 0' if there was no binding to + // be removed. + //*/ + //bool removeKey(const StringVect &keylist, KeyCallback callback, void *data); //! Removes all key bindings - void remove_all(); + void removeAllKeys(); - //! Finds a keybinding and returns its id or '< 0' if it isn't found. - /*! - @return -1 if the keybinding was not found but does not conflict with - any others; -2 if the keybinding conflicts with another. - */ - int find_key(const StringVect &keylist); - - void fire(OBActions::ActionType type, Window window, unsigned int modifiers, - unsigned int key, Time time); + void fireKey(int screen, unsigned int modifiers,unsigned int key, Time time, + KeyAction::KA action); void setResetKey(const std::string &key); - void grabMouse(bool grab, const OBClient *client); void grabKeys(bool grab); + + bool grabKeyboard(int screen, KeyCallback callback, void *data); + void ungrabKeyboard(); + + bool grabPointer(int screen); + void ungrabPointer(); + + bool addButton(const std::string &but, MouseContext::MC context, + MouseAction::MA action, MouseCallback callback, void *data); + + void grabButtons(bool grab, Client *client); + + //! Removes all button bindings + void removeAllButtons(); + + void fireButton(MouseData *data); + + //! Bind a callback for an event + bool addEvent(EventAction::EA action, EventCallback callback, void *data); + + //! Unbind the callback function from an event + bool removeEvent(EventAction::EA action, EventCallback callback, void *data); + + //! Remove all callback functions + void removeAllEvents(); + + void fireEvent(EventData *data); }; }