#include "openbox.h"
#include "config.h"
#include "xerror.h"
-#include "action.h"
+#include "actions.h"
#include "event.h"
#include "client.h"
#include "prop.h"
static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
ObFrameContext mouse_button_frame_context(ObFrameContext context,
- guint button)
+ guint button,
+ guint state)
{
GSList *it;
ObFrameContext x = context;
for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
ObMouseBinding *b = it->data;
- if (b->button == button)
+ if (b->button == button && b->state == state)
return context;
}
case OB_FRAME_CONTEXT_DESKTOP:
case OB_FRAME_CONTEXT_CLIENT:
case OB_FRAME_CONTEXT_TITLEBAR:
- case OB_FRAME_CONTEXT_HANDLE:
case OB_FRAME_CONTEXT_FRAME:
case OB_FRAME_CONTEXT_MOVE_RESIZE:
+ case OB_FRAME_CONTEXT_LEFT:
+ case OB_FRAME_CONTEXT_RIGHT:
break;
+ case OB_FRAME_CONTEXT_ROOT:
+ x = OB_FRAME_CONTEXT_DESKTOP;
+ break;
+ case OB_FRAME_CONTEXT_BOTTOM:
case OB_FRAME_CONTEXT_BLCORNER:
case OB_FRAME_CONTEXT_BRCORNER:
- x = OB_FRAME_CONTEXT_HANDLE;
+ x = OB_FRAME_CONTEXT_BOTTOM;
break;
case OB_FRAME_CONTEXT_TLCORNER:
case OB_FRAME_CONTEXT_TRCORNER:
+ case OB_FRAME_CONTEXT_TOP:
case OB_FRAME_CONTEXT_MAXIMIZE:
case OB_FRAME_CONTEXT_ALLDESKTOPS:
case OB_FRAME_CONTEXT_SHADE:
g_assert_not_reached();
}
- return x;
+ /* allow for multiple levels of fall-through */
+ if (x != context)
+ return mouse_button_frame_context(x, button, state);
+ else
+ return x;
}
void mouse_grab_for_client(ObClient *client, gboolean grab)
mode = GrabModeAsync;
mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
} else if (CLIENT_CONTEXT(i, client)) {
- win = client->frame->plate;
+ win = client->window;
mode = GrabModeSync; /* this is handled in event */
mask = ButtonPressMask; /* can't catch more than this with Sync
mode the release event is
{
gint i;
GSList *it;
-
+
for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) {
for (it = bound_contexts[i]; it; it = g_slist_next(it)) {
ObMouseBinding *b = it->data;
gint j;
for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
- GSList *it;
+ GSList *jt;
- for (it = b->actions[j]; it; it = g_slist_next(it))
- action_unref(it->data);
+ for (jt = b->actions[j]; jt; jt = g_slist_next(jt))
+ actions_act_unref(jt->data);
g_slist_free(b->actions[j]);
}
g_free(b);
}
}
+static ObUserAction mouse_action_to_user_action(ObMouseAction a)
+{
+ switch (a) {
+ case OB_MOUSE_ACTION_PRESS: return OB_USER_ACTION_MOUSE_PRESS;
+ case OB_MOUSE_ACTION_RELEASE: return OB_USER_ACTION_MOUSE_RELEASE;
+ case OB_MOUSE_ACTION_CLICK: return OB_USER_ACTION_MOUSE_CLICK;
+ case OB_MOUSE_ACTION_DOUBLE_CLICK:
+ return OB_USER_ACTION_MOUSE_DOUBLE_CLICK;
+ case OB_MOUSE_ACTION_MOTION: return OB_USER_ACTION_MOUSE_MOTION;
+ default:
+ g_assert_not_reached();
+ }
+}
+
static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
ObClient *c, guint state,
- guint button, gint x, gint y, Time time)
+ guint button, gint x, gint y)
{
GSList *it;
ObMouseBinding *b;
/* if not bound, then nothing to do! */
if (it == NULL) return FALSE;
- action_run_mouse(b->actions[a], c, context, state, button, x, y, time);
+ actions_run_acts(b->actions[a], mouse_action_to_user_action(a),
+ state, x, y, button, context, c);
return TRUE;
}
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 = mouse_button_frame_context(context, e->xbutton.button);
+ context = frame_context(client, e->xbutton.window,
+ e->xbutton.x, e->xbutton.y);
+ context = mouse_button_frame_context(context, e->xbutton.button,
+ e->xbutton.state);
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;
fire_binding(OB_MOUSE_ACTION_PRESS, context,
client, e->xbutton.state,
e->xbutton.button,
- e->xbutton.x_root, e->xbutton.y_root,
- e->xbutton.time);
+ e->xbutton.x_root, e->xbutton.y_root);
+
+ /* if the bindings grab the pointer, there won't be a ButtonRelease
+ event for us */
+ if (grab_on_pointer())
+ button = 0;
if (CLIENT_CONTEXT(context, client)) {
/* Replay the event, so it goes to the client*/
break;
case ButtonRelease:
- context = frame_context(client, e->xany.window);
- context = mouse_button_frame_context(context, e->xbutton.button);
+ /* 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,
+ e->xbutton.state);
+
+ if (e->xbutton.button == button)
+ pwx = pwy = -1;
if (e->xbutton.button == button) {
/* clicks are only valid if its released over the window */
fire_binding(OB_MOUSE_ACTION_RELEASE, context,
client, e->xbutton.state,
e->xbutton.button,
- e->xbutton.x_root, e->xbutton.y_root,
- e->xbutton.time);
+ e->xbutton.x_root,
+ e->xbutton.y_root);
if (click)
fire_binding(OB_MOUSE_ACTION_CLICK, context,
client, e->xbutton.state,
e->xbutton.button,
e->xbutton.x_root,
- e->xbutton.y_root,
- e->xbutton.time);
+ e->xbutton.y_root);
if (dclick)
fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
client, e->xbutton.state,
e->xbutton.button,
e->xbutton.x_root,
- e->xbutton.y_root,
- e->xbutton.time);
+ e->xbutton.y_root);
break;
case MotionNotify:
if (button) {
- context = frame_context(client, e->xany.window);
- context = mouse_button_frame_context(context, button);
+ context = frame_context(client, e->xmotion.window, pwx, pwy);
+ context = mouse_button_frame_context(context, button, state);
- 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 ||
break;
fire_binding(OB_MOUSE_ACTION_MOTION, context,
- client, state, button, px, py, e->xmotion.time);
+ client, state, button, px, py);
button = 0;
state = 0;
}
}
gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
- ObMouseAction mact, ObAction *action)
+ ObMouseAction mact, ObActionsAct *action)
{
guint state, button;
ObFrameContext context;
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;
}
}
}
- /* when there are no modifiers in the binding, then the action cannot
- be interactive */
- if (!state && action->data.any.interactive) {
- action->data.any.interactive = FALSE;
- action->data.inter.final = TRUE;
- }
-
/* add the binding */
b = g_new0(ObMouseBinding, 1);
b->state = state;
projects / mikachu / openbox.git / blobdiff