namespace ob {
const unsigned int OBActions::DOUBLECLICKDELAY = 300;
+const int OBActions::BUTTONS;
OBActions::OBActions()
: _button(0)
{
- // XXX: load a configuration out of somewhere
-
+ for (int i=0; i<BUTTONS; ++i)
+ _posqueue[i] = new ButtonPressAction();
}
OBActions::~OBActions()
{
+ for (int i=0; i<BUTTONS; ++i)
+ delete _posqueue[i];
+}
+
+
+void OBActions::insertPress(const XButtonEvent &e)
+{
+ ButtonPressAction *a = _posqueue[BUTTONS - 1];
+ for (int i=BUTTONS-1; i>0;)
+ _posqueue[i] = _posqueue[--i];
+ _posqueue[0] = a;
+ a->button = e.button;
+ a->pos.setPoint(e.x_root, e.y_root);
+
+ OBClient *c = Openbox::instance->findClient(e.window);
+ if (c) a->clientarea = c->area();
}
+void OBActions::removePress(const XButtonEvent &e)
+{
+ ButtonPressAction *a = 0;
+ for (int i=0; i<BUTTONS; ++i) {
+ if (_posqueue[i]->button == e.button)
+ a = _posqueue[i];
+ if (a) // found one and removed it
+ _posqueue[i] = _posqueue[i+1];
+ }
+ if (a) { // found one
+ _posqueue[BUTTONS-1] = a;
+ a->button = 0;
+ }
+}
void OBActions::buttonPressHandler(const XButtonEvent &e)
{
OtkEventHandler::buttonPressHandler(e);
+ insertPress(e);
// run the PRESS python hook
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
-
- doCallback(Action_ButtonPress, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.x_root, e.y_root, e.time);
+ assert(w); // everything should be a widget
+
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ ButtonData *data = new_button_data(e.window, e.time, state, e.button,
+ w->mcontext(), MousePress);
+ Openbox::instance->bindings()->fireButton(data);
+ Py_DECREF((PyObject*)data);
if (_button) return; // won't count toward CLICK events
void OBActions::buttonReleaseHandler(const XButtonEvent &e)
{
OtkEventHandler::buttonReleaseHandler(e);
+ removePress(e);
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
+ assert(w); // everything should be a widget
// not for the button we're watching?
if (_button != e.button) return;
return;
// run the CLICK python hook
- doCallback(Action_Click, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.x_root, e.y_root, e.time);
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ ButtonData *data = new_button_data(e.window, e.time, state, e.button,
+ w->mcontext(), MouseClick);
+ Openbox::instance->bindings()->fireButton(data);
+
if (e.time - _release.time < DOUBLECLICKDELAY &&
_release.win == e.window && _release.button == e.button) {
// run the DOUBLECLICK python hook
- doCallback(Action_DoubleClick, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.x_root, e.y_root, e.time);
+ data->action = MouseDoubleClick;
+ Openbox::instance->bindings()->fireButton(data);
// reset so you cant triple click for 2 doubleclicks
_release.win = 0;
_release.button = e.button;
_release.time = e.time;
}
+
+ Py_DECREF((PyObject*)data);
}
// OBWidget *w = dynamic_cast<OBWidget*>
// (Openbox::instance->findHandler(e.window));
- Openbox::instance->bindings()->fire(e.state, e.keycode, e.time);
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ Openbox::instance->bindings()->fireKey(state, e.keycode, e.time);
}
}
}
-
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
-
- // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
- // maybe that should all be done via python tho.. (or radial menus!)
- // run the simple MOTION python hook for now...
- doCallback(Action_MouseMotion, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, (unsigned)-1, x_root, y_root, e.time);
+ assert(w); // everything should be a widget
+
+ // run the MOTION python hook
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ unsigned int button = _posqueue[0]->button;
+ MotionData *data = new_motion_data(e.window, e.time, state, button,
+ w->mcontext(), MouseMotion,
+ x_root, y_root, _posqueue[0]->pos,
+ _posqueue[0]->clientarea);
+ Openbox::instance->bindings()->fireButton((ButtonData*)data);
+ Py_DECREF((PyObject*)data);
}
void OBActions::mapRequestHandler(const XMapRequestEvent &e)
_callbacks.equal_range(action);
CallbackMap::iterator it;
- for (it = it_pair.first; it != it_pair.second; ++it)
- python_callback(it->second, action, window, type, state,
- button, xroot, yroot, time);
+// for (it = it_pair.first; it != it_pair.second; ++it)
+// python_callback(it->second, action, window, type, state,
+// button, xroot, yroot, time);
+ // XXX do a callback
}
bool OBActions::registerCallback(ActionType action, PyObject *func,
bool atfront)
{
- if (action < 0 || action >= OBActions::NUM_ACTIONS ||
- action == OBActions::Action_KeyPress) {
+ if (action < 0 || action >= OBActions::NUM_ACTIONS) {
return false;
}
if (!func)
CallbackMap::iterator it;
for (it = it_pair.first; it != it_pair.second; ++it)
if (it->second == func)
- break;
- if (it == it_pair.second) // not already in there
- if (atfront)
- _callbacks.insert(_callbacks.begin(), CallbackMapPair(action, func));
- else
- _callbacks.insert(CallbackMapPair(action, func));
+ return true; // already in there
+ if (atfront)
+ _callbacks.insert(_callbacks.begin(), CallbackMapPair(action, func));
+ else
+ _callbacks.insert(CallbackMapPair(action, func));
Py_INCREF(func);
return true;
}
bool OBActions::unregisterCallback(ActionType action, PyObject *func)
{
- if (action < 0 || action >= OBActions::NUM_ACTIONS ||
- action == OBActions::Action_KeyPress) {
+ if (action < 0 || action >= OBActions::NUM_ACTIONS) {
return false;
}
if (!func)
bool OBActions::unregisterAllCallbacks(ActionType action)
{
- if (action < 0 || action >= OBActions::NUM_ACTIONS ||
- action == OBActions::Action_KeyPress) {
+ if (action < 0 || action >= OBActions::NUM_ACTIONS) {
return false;
}
projects / chaz / openbox / blobdiff