#endif
#include "actions.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
#include "openbox.hh"
#include "client.hh"
#include "screen.hh"
#include "otk/display.hh"
#include <stdio.h>
+#include <algorithm>
namespace ob {
-const int OBActions::BUTTONS;
+const int Actions::BUTTONS;
-OBActions::OBActions()
- : _button(0)
+Actions::Actions()
+ : _button(0),
+ _dragging(false)
{
for (int i=0; i<BUTTONS; ++i)
_posqueue[i] = new ButtonPressAction();
}
-OBActions::~OBActions()
+Actions::~Actions()
{
for (int i=0; i<BUTTONS; ++i)
delete _posqueue[i];
}
-void OBActions::insertPress(const XButtonEvent &e)
+void Actions::insertPress(const XButtonEvent &e)
{
ButtonPressAction *a = _posqueue[BUTTONS - 1];
- for (int i=BUTTONS-1; i>0;)
- _posqueue[i] = _posqueue[--i];
+ // rm'd the last one, shift them all down one
+ for (int i = BUTTONS-1; i > 0; --i) {
+ _posqueue[i] = _posqueue[i-1];
+ }
_posqueue[0] = a;
a->button = e.button;
a->pos.setPoint(e.x_root, e.y_root);
- OBClient *c = Openbox::instance->findClient(e.window);
+ Client *c = openbox->findClient(e.window);
if (c) a->clientarea = c->area();
}
-void OBActions::removePress(const XButtonEvent &e)
+void Actions::removePress(const XButtonEvent &e)
{
+ int i;
ButtonPressAction *a = 0;
- for (int i=0; i<BUTTONS; ++i) {
- if (_posqueue[i]->button == e.button)
+ for (i=0; i<BUTTONS-1; ++i)
+ if (_posqueue[i]->button == e.button) {
a = _posqueue[i];
- if (a) // found one and removed it
+ break;
+ }
+ if (a) { // found one, remove it and shift the rest up one
+ for (; i < BUTTONS-1; ++i)
_posqueue[i] = _posqueue[i+1];
- }
- if (a) { // found one
_posqueue[BUTTONS-1] = a;
- a->button = 0;
}
+ _posqueue[BUTTONS-1]->button = 0;
}
-void OBActions::buttonPressHandler(const XButtonEvent &e)
+void Actions::buttonPressHandler(const XButtonEvent &e)
{
- OtkEventHandler::buttonPressHandler(e);
+ otk::EventHandler::buttonPressHandler(e);
insertPress(e);
// run the PRESS python hook
- OBWidget *w = dynamic_cast<OBWidget*>
- (Openbox::instance->findHandler(e.window));
- assert(w); // everything should be a widget
+ WidgetBase *w = dynamic_cast<WidgetBase*>
+ (openbox->findHandler(e.window));
+ if (!w) return;
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
int screen;
- OBClient *c = Openbox::instance->findClient(e.window);
+ Client *c = openbox->findClient(e.window);
if (c)
screen = c->screen();
else
- screen = otk::OBDisplay::findScreen(e.root)->screen();
- ButtonData data(screen, c, e.time, state, e.button, w->mcontext(),
- MousePress);
- Openbox::instance->bindings()->fireButton(&data);
+ screen = otk::display->findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+ MousePress);
+ openbox->bindings()->fireButton(&data);
if (_button) return; // won't count toward CLICK events
_button = e.button;
+
+ if (w->mcontext() == MC_Window) {
+ /*
+ Because of how events are grabbed on the client window, we can't get
+ ButtonRelease events, so instead we simply manufacture them here, so that
+ clicks/doubleclicks etc still work.
+ */
+ //XButtonEvent ev = e;
+ //ev.type = ButtonRelease;
+ buttonReleaseHandler(e);
+ }
}
-void OBActions::buttonReleaseHandler(const XButtonEvent &e)
+void Actions::buttonReleaseHandler(const XButtonEvent &e)
{
- OtkEventHandler::buttonReleaseHandler(e);
+ otk::EventHandler::buttonReleaseHandler(e);
removePress(e);
- OBWidget *w = dynamic_cast<OBWidget*>
- (Openbox::instance->findHandler(e.window));
- assert(w); // everything should be a widget
+ WidgetBase *w = dynamic_cast<WidgetBase*>
+ (openbox->findHandler(e.window));
+ if (!w) return;
// not for the button we're watching?
if (_button != e.button) return;
_button = 0;
+ _dragging = false;
// find the area of the window
XWindowAttributes attr;
- if (!XGetWindowAttributes(otk::OBDisplay::display, e.window, &attr)) return;
+ if (!XGetWindowAttributes(**otk::display, e.window, &attr)) return;
// if not on the window any more, it isnt a CLICK
if (!(e.same_screen && e.x >= 0 && e.y >= 0 &&
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
int screen;
- OBClient *c = Openbox::instance->findClient(e.window);
+ Client *c = openbox->findClient(e.window);
if (c)
screen = c->screen();
else
- screen = otk::OBDisplay::findScreen(e.root)->screen();
- ButtonData data(screen, c, e.time, state, e.button, w->mcontext(),
- MouseClick);
- Openbox::instance->bindings()->fireButton(&data);
+ screen = otk::display->findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+ MouseClick);
+ openbox->bindings()->fireButton(&data);
// XXX: dont load this every time!!@*
// run the DOUBLECLICK python hook
data.action = MouseDoubleClick;
- Openbox::instance->bindings()->fireButton(&data);
+ openbox->bindings()->fireButton(&data);
// reset so you cant triple click for 2 doubleclicks
_release.win = 0;
}
-void OBActions::enterHandler(const XCrossingEvent &e)
+void Actions::enterHandler(const XCrossingEvent &e)
{
- OtkEventHandler::enterHandler(e);
+ otk::EventHandler::enterHandler(e);
// run the ENTER python hook
int screen;
- OBClient *c = Openbox::instance->findClient(e.window);
+ Client *c = openbox->findClient(e.window);
if (c)
screen = c->screen();
else
- screen = otk::OBDisplay::findScreen(e.root)->screen();
+ screen = otk::display->findScreen(e.root)->screen();
EventData data(screen, c, EventEnterWindow, e.state);
- Openbox::instance->bindings()->fireEvent(&data);
+ openbox->bindings()->fireEvent(&data);
}
-void OBActions::leaveHandler(const XCrossingEvent &e)
+void Actions::leaveHandler(const XCrossingEvent &e)
{
- OtkEventHandler::leaveHandler(e);
+ otk::EventHandler::leaveHandler(e);
// run the LEAVE python hook
int screen;
- OBClient *c = Openbox::instance->findClient(e.window);
+ Client *c = openbox->findClient(e.window);
if (c)
screen = c->screen();
else
- screen = otk::OBDisplay::findScreen(e.root)->screen();
+ screen = otk::display->findScreen(e.root)->screen();
EventData data(screen, c, EventLeaveWindow, e.state);
- Openbox::instance->bindings()->fireEvent(&data);
+ openbox->bindings()->fireEvent(&data);
}
-void OBActions::keyPressHandler(const XKeyEvent &e)
+void Actions::keyPressHandler(const XKeyEvent &e)
{
- OtkEventHandler::keyPressHandler(e);
+ otk::EventHandler::keyPressHandler(e);
// 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(otk::OBDisplay::findScreen(e.root)->screen(),
+ openbox->bindings()->
+ fireKey(otk::display->findScreen(e.root)->screen(),
state, e.keycode, e.time);
}
-void OBActions::motionHandler(const XMotionEvent &e)
+void Actions::motionHandler(const XMotionEvent &e)
{
- OtkEventHandler::motionHandler(e);
+ otk::EventHandler::motionHandler(e);
if (!e.same_screen) return; // this just gets stupid
// compress changes to a window into a single change
XEvent ce;
- while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+ while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
if (ce.xmotion.window != e.window) {
- XPutBackEvent(otk::OBDisplay::display, &ce);
+ XPutBackEvent(**otk::display, &ce);
break;
} else {
x_root = e.x_root;
}
}
- OBWidget *w = dynamic_cast<OBWidget*>
- (Openbox::instance->findHandler(e.window));
- assert(w); // everything should be a widget
+ WidgetBase *w = dynamic_cast<WidgetBase*>
+ (openbox->findHandler(e.window));
+ if (!w) return;
+
+ if (!_dragging) {
+ long threshold;
+ int dx = x_root - _posqueue[0]->pos.x();
+ int dy = y_root - _posqueue[0]->pos.y();
+ // XXX: dont get this from python every time!
+ if (!python_get_long("drag_threshold", &threshold))
+ threshold = 0;
+ if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
+ return; // not at the threshold yet
+ }
+ _dragging = true; // in a drag now
+
+ // check if the movement is more than the threshold
// run the MOTION python hook
// kill off the Button1Mask etc, only want the modifiers
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
unsigned int button = _posqueue[0]->button;
int screen;
- OBClient *c = Openbox::instance->findClient(e.window);
+ Client *c = openbox->findClient(e.window);
if (c)
screen = c->screen();
else
- screen = otk::OBDisplay::findScreen(e.root)->screen();
- MotionData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
- x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
- Openbox::instance->bindings()->fireButton((ButtonData*)&data);
+ screen = otk::display->findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
+ x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
+ openbox->bindings()->fireButton(&data);
}
-void OBActions::mapRequestHandler(const XMapRequestEvent &e)
+void Actions::mapRequestHandler(const XMapRequestEvent &e)
{
- OtkEventHandler::mapRequestHandler(e);
- // do this in OBScreen::manageWindow
+ otk::EventHandler::mapRequestHandler(e);
+ // do this in Screen::manageWindow
}
-void OBActions::unmapHandler(const XUnmapEvent &e)
+void Actions::unmapHandler(const XUnmapEvent &e)
{
- OtkEventHandler::unmapHandler(e);
- // do this in OBScreen::unmanageWindow
+ otk::EventHandler::unmapHandler(e);
+ // do this in Screen::unmanageWindow
}
-void OBActions::destroyHandler(const XDestroyWindowEvent &e)
+void Actions::destroyHandler(const XDestroyWindowEvent &e)
{
- OtkEventHandler::destroyHandler(e);
- // do this in OBScreen::unmanageWindow
+ otk::EventHandler::destroyHandler(e);
+ // do this in Screen::unmanageWindow
}
#ifdef XKB
-void OBActions::xkbHandler(const XkbEvent &e)
+void Actions::xkbHandler(const XkbEvent &e)
{
Window w;
int screen;
- OtkEventHandler::xkbHandler(e);
+ otk::EventHandler::xkbHandler(e);
switch (((XkbAnyEvent*)&e)->xkb_type) {
case XkbBellNotify:
w = ((XkbBellNotifyEvent*)&e)->window;
- OBClient *c = Openbox::instance->findClient(w);
+ Client *c = openbox->findClient(w);
if (c)
screen = c->screen();
else
- screen = Openbox::instance->focusedScreen()->number();
+ screen = openbox->focusedScreen()->number();
EventData data(screen, c, EventBell, 0);
- Openbox::instance->bindings()->fireEvent(&data);
+ openbox->bindings()->fireEvent(&data);
break;
}
}
projects / chaz / openbox / blobdiff