// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
#include "actions.hh"
-#include "widgetbase.hh"
#include "openbox.hh"
#include "client.hh"
+#include "frame.hh"
#include "screen.hh"
#include "python.hh"
#include "bindings.hh"
#include "otk/display.hh"
-#include <stdio.h>
+#include <cstdio>
#include <algorithm>
namespace ob {
_posqueue[i] = _posqueue[i-1];
}
_posqueue[0] = a;
+ a->win = e.window;
a->button = e.button;
- a->pos.setPoint(e.x_root, e.y_root);
+ a->pos = otk::Point(e.x_root, e.y_root);
Client *c = openbox->findClient(e.window);
if (c) a->clientarea = c->area();
{
otk::EventHandler::buttonPressHandler(e);
insertPress(e);
-
- // run the PRESS python hook
- WidgetBase *w = dynamic_cast<WidgetBase*>
- (openbox->findHandler(e.window));
- if (!w) return;
+ MouseContext::MC context;
+ EventHandler *h = openbox->findHandler(e.window);
+ Frame *f = dynamic_cast<Frame*>(h);
+ if (f)
+ context= f->mouseContext(e.window);
+ else if (dynamic_cast<Client*>(h))
+ context = MouseContext::Window;
+ else if (dynamic_cast<Screen*>(h))
+ context = MouseContext::Root;
+ else
+ return; // not a valid mouse context
+
+ // run the PRESS python hook
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
screen = c->screen();
else
screen = otk::display->findScreen(e.root)->screen();
- MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+ MouseData data(screen, c, e.time, state, e.button, context,
MouseAction::Press);
openbox->bindings()->fireButton(&data);
_button = e.button;
- if (w->mcontext() == MouseContext::Window) {
+ if (context == MouseContext::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
otk::EventHandler::buttonReleaseHandler(e);
removePress(e);
- WidgetBase *w = dynamic_cast<WidgetBase*>
- (openbox->findHandler(e.window));
- if (!w) return;
+ MouseContext::MC context;
+ EventHandler *h = openbox->findHandler(e.window);
+ Frame *f = dynamic_cast<Frame*>(h);
+ if (f)
+ context= f->mouseContext(e.window);
+ else if (dynamic_cast<Client*>(h))
+ context = MouseContext::Window;
+ else if (dynamic_cast<Screen*>(h))
+ context = MouseContext::Root;
+ else
+ return; // not a valid mouse context
+
+ // run the RELEASE python hook
+ // kill off the Button1Mask etc, only want the modifiers
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ int screen;
+ Client *c = openbox->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::display->findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, e.button, context,
+ MouseAction::Release);
+ openbox->bindings()->fireButton(&data);
// not for the button we're watching?
if (_button != e.button) return;
return;
// run the CLICK python hook
- // kill off the Button1Mask etc, only want the modifiers
- unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
- Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
- int screen;
- Client *c = openbox->findClient(e.window);
- if (c)
- screen = c->screen();
- else
- screen = otk::display->findScreen(e.root)->screen();
- MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
- MouseAction::Click);
+ data.action = MouseAction::Click;
openbox->bindings()->fireButton(&data);
// XXX: dont load this every time!!@*
long dblclick;
- if (!python_get_long("double_click_delay", &dblclick))
+ if (!python_get_long("DOUBLE_CLICK_DELAY", &dblclick))
dblclick = 300;
if (e.time - _release.time < (unsigned)dblclick &&
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+
+ // add to the state the mask of the modifier being pressed, if it is
+ // a modifier key being pressed (this is a little ugly..)
+ const XModifierKeymap *map = otk::display->modifierMap();
+ const int mask_table[] = {
+ ShiftMask, LockMask, ControlMask, Mod1Mask,
+ Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
+ };
+ KeyCode *kp = map->modifiermap;
+ for (int i = 0, n = sizeof(mask_table)/sizeof(mask_table[0]); i < n; ++i) {
+ for (int k = 0; k < map->max_keypermod; ++k) {
+ if (*kp == e.keycode) { // found the keycode
+ state |= mask_table[i]; // add the mask for it
+ i = n; // cause the first loop to break;
+ break; // get outta here!
+ }
+ ++kp;
+ }
+ }
+
openbox->bindings()->
fireKey(otk::display->findScreen(e.root)->screen(),
state, e.keycode, e.time, KeyAction::Press);
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
// remove from the state the mask of the modifier being released, if it is
- // a modifier key being released (XXX this is a little ugly..)
+ // a modifier key being released (this is a little ugly..)
const XModifierKeymap *map = otk::display->modifierMap();
const int mask_table[] = {
ShiftMask, LockMask, ControlMask, Mod1Mask,
if (!e.same_screen) return; // this just gets stupid
- int x_root = e.x_root, y_root = e.y_root;
+ if (e.window != _posqueue[0]->win) return;
+ MouseContext::MC context;
+ EventHandler *h = openbox->findHandler(e.window);
+ Frame *f = dynamic_cast<Frame*>(h);
+ if (f)
+ context= f->mouseContext(e.window);
+ else if (dynamic_cast<Client*>(h))
+ context = MouseContext::Window;
+ else if (dynamic_cast<Screen*>(h))
+ context = MouseContext::Root;
+ else
+ return; // not a valid mouse context
+
+ int x_root = e.x_root, y_root = e.y_root;
+
// compress changes to a window into a single change
XEvent ce;
- while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
- if (ce.xmotion.window != e.window) {
- XPutBackEvent(**otk::display, &ce);
- break;
- } else {
- x_root = e.x_root;
- y_root = e.y_root;
- }
+ while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
+ x_root = e.x_root;
+ y_root = e.y_root;
}
- 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))
+ if (!python_get_long("DRAG_THRESHOLD", &threshold))
threshold = 0;
if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
return; // not at the threshold yet
screen = c->screen();
else
screen = otk::display->findScreen(e.root)->screen();
- MouseData data(screen, c, e.time, state, button, w->mcontext(),
+ MouseData data(screen, c, e.time, state, button, context,
MouseAction::Motion, x_root, y_root,
_posqueue[0]->pos, _posqueue[0]->clientarea);
openbox->bindings()->fireButton(&data);
projects / chaz / openbox / blobdiff