// kill off the Button1Mask etc, only want the modifiers
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);
+ ButtonData *data =
+ new_button_data(otk::OBDisplay::findScreen(e.root)->screen(),
+ e.window, e.time, state, e.button, w->mcontext(),
+ MousePress);
Openbox::instance->bindings()->fireButton(data);
Py_DECREF((PyObject*)data);
// kill off the Button1Mask etc, only want the modifiers
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);
+ ButtonData *data =
+ new_button_data(otk::OBDisplay::findScreen(e.root)->screen(),
+ e.window, e.time, state, e.button, w->mcontext(),
+ MouseClick);
Openbox::instance->bindings()->fireButton(data);
OtkEventHandler::enterHandler(e);
// run the ENTER python hook
- EventData *data = new_event_data(e.window, EventEnterWindow, e.state);
+ EventData *data =
+ new_event_data(otk::OBDisplay::findScreen(e.root)->screen(),
+ e.window, EventEnterWindow, e.state);
Openbox::instance->bindings()->fireEvent(data);
Py_DECREF((PyObject*)data);
}
OtkEventHandler::leaveHandler(e);
// run the LEAVE python hook
- EventData *data = new_event_data(e.window, EventLeaveWindow, e.state);
+ EventData *data =
+ new_event_data(otk::OBDisplay::findScreen(e.root)->screen(),
+ e.window, EventLeaveWindow, e.state);
Openbox::instance->bindings()->fireEvent(data);
Py_DECREF((PyObject*)data);
}
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
- Openbox::instance->bindings()->fireKey(state, e.keycode, e.time);
+ Openbox::instance->bindings()->
+ fireKey(otk::OBDisplay::findScreen(e.root)->screen(),
+ state, e.keycode, e.time);
}
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);
+ MotionData *data =
+ new_motion_data(otk::OBDisplay::findScreen(e.root)->screen(),
+ 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);
}