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

s/reset/resetChains/

Browse source
This commit is contained in:
Dana Jansens 2003-01-03 18:51:00 +00:00
parent 376ce0032e
commit 660ad41ca0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bindings.cc
View file

@ -339,7 +339,7 @@ void OBBindings::grabKeys(bool grab)
void OBBindings::fireKey(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) { if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
reset(this); resetChains(this);
} else { } else {
KeyBindingTree *p = _curpos->first_child; KeyBindingTree *p = _curpos->first_child;
while (p) { while (p) {
@ -356,7 +356,7 @@ void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
KeyData *data = new_key_data(win, time, modifiers, key); KeyData *data = new_key_data(win, time, modifiers, key);
python_callback(p->callback, (PyObject*)data); python_callback(p->callback, (PyObject*)data);
Py_DECREF((PyObject*)data); Py_DECREF((PyObject*)data);
reset(this); resetChains(this);
} }
break; break;
} }
@ -365,7 +365,7 @@ void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
} }
} }
void OBBindings::reset(OBBindings *self) void OBBindings::resetChains(OBBindings *self)
{ {
self->_timer.stop(); self->_timer.stop();
self->grabKeys(false); self->grabKeys(false);
@ -435,7 +435,7 @@ void OBBindings::grabButtons(bool grab, OBClient *client)
break; break;
case MC_Window: case MC_Window:
win = client->frame->plate(); win = client->frame->plate();
mode = GrabModeSync; // this is handled in the plate's buttonPressHandler mode = GrabModeSync; // this is handled in fireButton
break; break;
default: default:
// any other elements already get button events, don't grab on them // any other elements already get button events, don't grab on them

2
src/bindings.hh
View file

@ -77,7 +77,7 @@ private:
PyObject *callback) const; PyObject *callback) const;
void assimilate(KeyBindingTree *node); void assimilate(KeyBindingTree *node);
static void reset(OBBindings *self); // the timer's timeout function static void resetChains(OBBindings *self); // the timer's timeout function
typedef std::list <ButtonBinding*> ButtonBindingList; typedef std::list <ButtonBinding*> ButtonBindingList;
ButtonBindingList _buttons[NUM_MOUSE_CONTEXT]; ButtonBindingList _buttons[NUM_MOUSE_CONTEXT];