From 660ad41ca0b1c48525bba071a27def141ad1cbfe Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 3 Jan 2003 18:51:00 +0000 Subject: [PATCH 1/1] s/reset/resetChains/ --- src/bindings.cc | 8 ++++---- src/bindings.hh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bindings.cc b/src/bindings.cc index 9abc33fe..007b0334 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -339,7 +339,7 @@ void OBBindings::grabKeys(bool grab) void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time) { if (key == _resetkey.key && modifiers == _resetkey.modifiers) { - reset(this); + resetChains(this); } else { KeyBindingTree *p = _curpos->first_child; 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); python_callback(p->callback, (PyObject*)data); Py_DECREF((PyObject*)data); - reset(this); + resetChains(this); } 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->grabKeys(false); @@ -435,7 +435,7 @@ void OBBindings::grabButtons(bool grab, OBClient *client) break; case MC_Window: win = client->frame->plate(); - mode = GrabModeSync; // this is handled in the plate's buttonPressHandler + mode = GrabModeSync; // this is handled in fireButton break; default: // any other elements already get button events, don't grab on them diff --git a/src/bindings.hh b/src/bindings.hh index 280c77cd..b3078d85 100644 --- a/src/bindings.hh +++ b/src/bindings.hh @@ -77,7 +77,7 @@ private: PyObject *callback) const; 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 ButtonBindingList; ButtonBindingList _buttons[NUM_MOUSE_CONTEXT]; -- 2.45.2