GSList *actions[OB_NUM_MOUSE_ACTIONS]; /* lists of Action pointers */
} ObMouseBinding;
-#define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \
- co == OB_FRAME_CONTEXT_FRAME : FALSE)
-#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
- co == OB_FRAME_CONTEXT_DESKTOP : \
- co == OB_FRAME_CONTEXT_CLIENT)
-
/* Array of GSList*s of ObMouseBinding*s. */
static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
+/* TRUE when we have a grab on the pointer and need to replay the pointer event
+ to send it to other applications */
+static gboolean replay_pointer_needed;
ObFrameContext mouse_button_frame_context(ObFrameContext context,
guint button,
case OB_FRAME_CONTEXT_MOVE_RESIZE:
case OB_FRAME_CONTEXT_LEFT:
case OB_FRAME_CONTEXT_RIGHT:
+ case OB_FRAME_CONTEXT_DOCK:
break;
case OB_FRAME_CONTEXT_ROOT:
x = OB_FRAME_CONTEXT_DESKTOP;
actions_act_unref(jt->data);
g_slist_free(b->actions[j]);
}
- g_free(b);
+ g_slice_free(ObMouseBinding, b);
}
g_slist_free(bound_contexts[i]);
bound_contexts[i] = NULL;
return TRUE;
}
-void mouse_event(ObClient *client, XEvent *e)
+void mouse_replay_pointer(void)
+{
+ if (replay_pointer_needed) {
+ /* replay the pointer event before any windows move */
+ XAllowEvents(obt_display, ReplayPointer, event_time());
+ replay_pointer_needed = FALSE;
+ }
+}
+
+gboolean mouse_event(ObClient *client, XEvent *e)
{
static Time ltime;
static guint button = 0, state = 0, lbutton = 0;
static Window lwindow = None;
- static gint px, py, pwx = -1, pwy = -1;
+ static gint px, py, pwx = -1, pwy = -1, lx = -10, ly = -10;
+ gboolean used = FALSE;
ObFrameContext context;
gboolean click = FALSE;
XAllowEvents with ReplayPointer at some point, to send the event
through to the client. when this happens though depends. if
windows are going to be moved on screen, then the click will end
- up going somewhere wrong, so have the action system perform the
- ReplayPointer for us if that is the case. */
+ up going somewhere wrong, set that we need it, and if nothing
+ else causes the replay pointer to be run, then we will do it
+ after all the actions are finished.
+
+ (We do it after all the actions because FocusIn interrupts
+ dragging for kdesktop, so if we send the button event now, and
+ then they get a focus event after, it breaks. Instead, wait to send
+ the button press until after the actions when possible.)
+ */
if (CLIENT_CONTEXT(context, client))
- actions_set_need_pointer_replay_before_move(TRUE);
- else
- actions_set_need_pointer_replay_before_move(FALSE);
+ replay_pointer_needed = TRUE;
- fire_binding(OB_MOUSE_ACTION_PRESS, context,
- client, e->xbutton.state,
- e->xbutton.button,
- e->xbutton.x_root, e->xbutton.y_root);
+ used = fire_binding(OB_MOUSE_ACTION_PRESS, context,
+ client, e->xbutton.state,
+ e->xbutton.button,
+ e->xbutton.x_root, e->xbutton.y_root) || used;
/* if the bindings grab the pointer, there won't be a ButtonRelease
event for us */
/* replay the pointer event if it hasn't been replayed yet (i.e. no
windows were moved) */
- if (actions_get_need_pointer_replay_before_move())
- XAllowEvents(obt_display, ReplayPointer, event_curtime);
+ mouse_replay_pointer();
/* in the client context, we won't get a button release because of the
way it is grabbed, so just fake one */
if (e->xbutton.x >= (signed)-b &&
e->xbutton.y >= (signed)-b &&
e->xbutton.x < (signed)(w+b) &&
- e->xbutton.y < (signed)(h+b)) {
+ e->xbutton.y < (signed)(h+b))
+ {
click = TRUE;
/* double clicks happen if there were 2 in a row! */
if (lbutton == button &&
lwindow == e->xbutton.window &&
e->xbutton.time - config_mouse_dclicktime <=
- ltime) {
+ ltime &&
+ ABS(e->xbutton.x - lx) < 8 &&
+ ABS(e->xbutton.y - ly) < 8)
+ {
dclick = TRUE;
lbutton = 0;
} else {
lbutton = button;
lwindow = e->xbutton.window;
+ lx = e->xbutton.x;
+ ly = e->xbutton.y;
}
} else {
lbutton = 0;
state = 0;
ltime = e->xbutton.time;
}
- fire_binding(OB_MOUSE_ACTION_RELEASE, context,
- client, e->xbutton.state,
- e->xbutton.button,
- e->xbutton.x_root,
- e->xbutton.y_root);
+ used = fire_binding(OB_MOUSE_ACTION_RELEASE, context,
+ client, e->xbutton.state,
+ e->xbutton.button,
+ e->xbutton.x_root,
+ e->xbutton.y_root) || used;
if (click)
- fire_binding(OB_MOUSE_ACTION_CLICK, context,
- client, e->xbutton.state,
- e->xbutton.button,
- e->xbutton.x_root,
- e->xbutton.y_root);
+ used = fire_binding(OB_MOUSE_ACTION_CLICK, context,
+ client, e->xbutton.state,
+ e->xbutton.button,
+ e->xbutton.x_root,
+ e->xbutton.y_root) || used;
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);
+ used = fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
+ client, e->xbutton.state,
+ e->xbutton.button,
+ e->xbutton.x_root,
+ e->xbutton.y_root) || used;
break;
case MotionNotify:
context == OB_FRAME_CONTEXT_CLOSE)
break;
- fire_binding(OB_MOUSE_ACTION_MOTION, context,
- client, state, button, px, py);
+ used = fire_binding(OB_MOUSE_ACTION_MOTION, context,
+ client, state, button, px, py);
button = 0;
state = 0;
}
default:
g_assert_not_reached();
}
+ return used;
}
-gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
+gboolean mouse_bind(const gchar *buttonstr, ObFrameContext context,
ObMouseAction mact, ObActionsAct *action)
{
- guint state, button;
- ObFrameContext context;
+ guint state = 0, button = 0;
ObMouseBinding *b;
GSList *it;
- if (!translate_button(buttonstr, &state, &button)) {
- g_message(_("Invalid button '%s' in mouse binding"), buttonstr);
- return FALSE;
- }
+ g_assert(context != OB_FRAME_CONTEXT_NONE);
- context = frame_context_from_string(contextstr);
- if (!context) {
- g_message(_("Invalid context '%s' in mouse binding"), contextstr);
+ if (!translate_button(buttonstr, &state, &button)) {
+ g_message(_("Invalid button \"%s\" in mouse binding"), buttonstr);
return FALSE;
}
}
/* add the binding */
- b = g_new0(ObMouseBinding, 1);
+ b = g_slice_new0(ObMouseBinding);
b->state = state;
b->button = button;
b->actions[mact] = g_slist_append(NULL, action);
projects / mikachu / openbox.git / blobdiff