#ifndef __binding_hh
#define __binding_hh
-/*! @file binding.hh
+/*! @file bindings.hh
@brief I dunno.. some binding stuff?
*/
namespace ob {
-class OBClient;
+class Client;
+
+typedef std::list<PyObject *> CallbackList;
typedef struct Binding {
unsigned int modifiers;
typedef struct KeyBindingTree {
Binding binding;
- PyObject *callback; // the callback given for the binding in add()
+ 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 KeyBindingTree *next_sibling; // the next binding in the tree at the same
// level
struct KeyBindingTree *first_child; // the first child of this binding (next
// binding in a chained sequence).
- KeyBindingTree(PyObject *callback) : binding(0, 0) {
- this->callback = callback; chain = true; next_sibling = first_child = 0;
- }
KeyBindingTree() : binding(0, 0) {
- this->callback = 0; chain = true; next_sibling = first_child = 0;
+ chain = true; next_sibling = first_child = 0;
}
} KeyBindingTree;
typedef struct ButtonBinding {
Binding binding;
- typedef std::list<PyObject*> CallbackList;
- CallbackList callback[NUM_MOUSE_ACTION];
- ButtonBinding() : binding(0, 0) {
- }
+ CallbackList callbacks[NUM_MOUSE_ACTION];
+ ButtonBinding() : binding(0, 0) {}
};
-class OBBindings {
+class Bindings {
public:
//! A list of strings
typedef std::vector<std::string> StringVect;
Binding _resetkey; // the key which resets the key chain status
- otk::OBTimer _timer;
+ otk::Timer *_timer;
- PyObject *find(KeyBindingTree *search, bool *conflict) const;
+ KeyBindingTree *find(KeyBindingTree *search, bool *conflict) const;
KeyBindingTree *buildtree(const StringVect &keylist,
PyObject *callback) const;
void assimilate(KeyBindingTree *node);
- static void reset(OBBindings *self); // the timer's timeout function
+ static void resetChains(Bindings *self); // the timer's timeout function
typedef std::list <ButtonBinding*> ButtonBindingList;
ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];
+ void grabButton(bool grab, const Binding &b, MouseContext context,
+ Client *client);
+
+ CallbackList _eventlist[NUM_EVENTS];
+
public:
- //! Initializes an OBBindings object
- OBBindings();
- //! Destroys the OBBindings object
- virtual ~OBBindings();
+ //! 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;
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(const StringVect &keylist, PyObject *callback);
+ bool addKey(const StringVect &keylist, PyObject *callback);
//! Removes a key binding
/*!
@return The callbackid of the binding, or '< 0' if there was no binding to
be removed.
*/
- bool remove(const StringVect &keylist);
+ bool removeKey(const StringVect &keylist, PyObject *callback);
//! Removes all key bindings
- void removeAll();
+ void removeAllKeys();
- void fire(unsigned int modifiers,unsigned int key, Time time);
+ void fireKey(int screen, unsigned int modifiers,unsigned int key, Time time);
void setResetKey(const std::string &key);
bool addButton(const std::string &but, MouseContext context,
MouseAction action, PyObject *callback);
- void grabButtons(bool grab, OBClient *client);
+ 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 action, PyObject *callback);
+
+ //! Unbind the callback function from an event
+ bool removeEvent(EventAction action, PyObject *callback);
+
+ //! Remove all callback functions
+ void removeAllEvents();
- void fire(ButtonData *data);
+ void fireEvent(EventData *data);
};
}