OBBindings::~OBBindings()
{
grabKeys(false);
- removeAll();
+ removeAllKeys();
+ removeAllButtons();
}
}
-bool OBBindings::add(const StringVect &keylist, PyObject *callback)
+bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
{
KeyBindingTree *tree;
bool conflict;
}
-bool OBBindings::remove(const StringVect &keylist)
+bool OBBindings::removeKey(const StringVect &keylist)
{
assert(false); // XXX: function not implemented yet
}
-void OBBindings::removeAll()
+void OBBindings::removeAllKeys()
{
+ grabKeys(false);
if (_keytree.first_child) {
remove_branch(_keytree.first_child);
_keytree.first_child = 0;
}
+ grabKeys(true);
}
}
-void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
{
if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
reset(this);
return true;
}
+void OBBindings::removeAllButtons()
+{
+ // XXX: UNGRAB shits
+ for (int i = i; i < NUM_MOUSE_CONTEXT; ++i) {
+ ButtonBindingList::iterator it, end = _buttons[i].end();
+ for (it = _buttons[i].begin(); it != end; ++it)
+ for (int a = 0; a < NUM_MOUSE_ACTION; ++a) {
+ Py_XDECREF((*it)->callback[a]);
+ (*it)->callback[a] = 0;
+ }
+ }
+}
+
void OBBindings::grabButtons(bool grab, OBClient *client)
{
for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
}
}
-void OBBindings::fire(ButtonData *data)
+void OBBindings::fireButton(ButtonData *data)
{
printf("but.mods %d.%d\n", data->button, data->state);