X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.hh;h=772b2a40840f57e009609f02b236019a8235c05c;hb=1da8531a7b4eea22592b6d0760352d2a34e9b6b0;hp=3fbf3b8d773718b6598f95d334738998e8ac8d64;hpb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;p=chaz%2Fopenbox diff --git a/src/bindings.hh b/src/bindings.hh index 3fbf3b8d..772b2a40 100644 --- a/src/bindings.hh +++ b/src/bindings.hh @@ -2,18 +2,27 @@ #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" + +extern "C" { +#include +} #include +#include #include namespace ob { -class OBClient; +class Client; + +typedef std::list CallbackList; typedef struct Binding { unsigned int modifiers; @@ -26,101 +35,117 @@ typedef struct Binding { Binding(unsigned int mod, unsigned int k) { modifiers = mod; key = k; } } Binding; -typedef struct BindingTree { +typedef struct KeyBindingTree { Binding binding; - std::string text; - int id; // the id given for the binding in add() - bool chain; // true if this is a chain to another key (not an action) + CallbackList 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; + KeyBindingTree() : binding(0, 0) { + chain = true; next_sibling = first_child = 0; } - BindingTree() : binding(0, 0) { - this->id = -1; chain = true; next_sibling = first_child = 0; - } -} BindingTree; +} KeyBindingTree; -class OBBindings { +typedef struct ButtonBinding { + Binding binding; + CallbackList callbacks[MouseAction::NUM_MOUSE_ACTION]; + ButtonBinding() : binding(0, 0) {} +}; + +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 + // root node of the tree (this doesn't have siblings!) + KeyBindingTree _keytree; + KeyBindingTree *_curpos; // position in the keytree - BindingTree *_mousetree; // this tree is a list. it has only siblings - - 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); + Binding _resetkey; // the key which resets the key chain status - void grabMouseOnAll(bool grab); - void grabKeys(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, + PyObject *callback) 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); + + CallbackList _eventlist[EventAction::NUM_EVENTS]; + PyObject *_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, PyObject *callback); - //! 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, PyObject *callback); //! 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 fireKey(int screen, unsigned int modifiers,unsigned int key, Time time, + KeyAction::KA action); + + void setResetKey(const std::string &key); + + void grabKeys(bool grab); + + bool grabKeyboard(int screen, PyObject *callback); + void ungrabKeyboard(); + + bool grabPointer(int screen); + void ungrabPointer(); + + bool addButton(const std::string &but, MouseContext::MC context, + MouseAction::MA action, PyObject *callback); + + void grabButtons(bool grab, Client *client); + + //! Removes all button bindings + void removeAllButtons(); - void process(unsigned int modifiers, unsigned int key); + void fireButton(MouseData *data); - // XXX: need an exec() function or something that will be used by openbox - // and hold state for which chain we're in etc. (it could have a timer - // for reseting too...) + //! Bind a callback for an event + bool addEvent(EventAction::EA action, PyObject *callback); - void display(); + //! Unbind the callback function from an event + bool removeEvent(EventAction::EA action, PyObject *callback); - void fire(OBActions::ActionType type, Window window, unsigned int modifiers, - unsigned int key, Time time); + //! Remove all callback functions + void removeAllEvents(); - void grabMouse(bool grab, const OBClient *client); + void fireEvent(EventData *data); }; }