mode = GrabModeAsync;
mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
} else if (CLIENT_CONTEXT(i, client)) {
- win = client->window;
+ win = client->frame->plate;
mode = GrabModeSync; /* this is handled in event */
mask = ButtonPressMask; /* can't catch more than this with Sync
mode the release event is
static Time ltime;
static guint button = 0, state = 0, lbutton = 0;
static Window lwindow = None;
- static gint px, py;
+ static gint px, py, pwx = -1, pwy = -1;
ObFrameContext context;
gboolean click = FALSE;
switch (e->type) {
case ButtonPress:
- context = frame_context(client, e->xany.window);
+ context = frame_context(client, e->xbutton.window,
+ e->xbutton.x, e->xbutton.y);
context = mouse_button_frame_context(context, e->xbutton.button);
px = e->xbutton.x_root;
py = e->xbutton.y_root;
+ if (!button) pwx = e->xbutton.x;
+ if (!button) pwy = e->xbutton.y;
button = e->xbutton.button;
state = e->xbutton.state;
break;
case ButtonRelease:
- context = frame_context(client, e->xany.window);
+ /* use where the press occured in the window */
+ context = frame_context(client, e->xbutton.window, pwx, pwy);
context = mouse_button_frame_context(context, e->xbutton.button);
+ if (e->xbutton.button == button)
+ pwx = pwy = -1;
+
if (e->xbutton.button == button) {
/* clicks are only valid if its released over the window */
gint junk1, junk2;
fire_binding(OB_MOUSE_ACTION_RELEASE, context,
client, e->xbutton.state,
e->xbutton.button,
- e->xbutton.x_root, e->xbutton.y_root,
+ e->xbutton.x_root,
+ e->xbutton.y_root,
e->xbutton.time);
if (click)
fire_binding(OB_MOUSE_ACTION_CLICK, context,
case MotionNotify:
if (button) {
- context = frame_context(client, e->xany.window);
+ context = frame_context(client, e->xmotion.window, pwx, pwy);
context = mouse_button_frame_context(context, button);
- if (ABS(e->xmotion.x_root - px) >=
- config_mouse_threshold ||
- ABS(e->xmotion.y_root - py) >=
- config_mouse_threshold) {
+ if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold ||
+ ABS(e->xmotion.y_root - py) >= config_mouse_threshold) {
/* You can't drag on buttons */
if (context == OB_FRAME_CONTEXT_MAXIMIZE ||
GSList *it;
if (!translate_button(buttonstr, &state, &button)) {
- g_message(_("Invalid button '%s' in pointer binding"), buttonstr);
+ g_message(_("Invalid button '%s' in mouse binding"), buttonstr);
return FALSE;
}
context = frame_context_from_string(contextstr);
if (!context) {
- g_message(_("Invalid context '%s' in pointer binding"), contextstr);
+ g_message(_("Invalid context '%s' in mouse binding"), contextstr);
return FALSE;
}