#include "openbox.h"
#include "config.h"
-#include "xerror.h"
#include "actions.h"
#include "event.h"
#include "client.h"
-#include "prop.h"
#include "grab.h"
#include "frame.h"
#include "translate.h"
#include "mouse.h"
#include "gettext.h"
+#include "obt/display.h"
#include <glib.h>
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,
mouse_grab_for_client(it->data, grab);
}
-void mouse_unbind_all()
+void mouse_unbind_all(void)
{
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))
- actions_act_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);
+ g_slice_free(ObMouseBinding, b);
}
g_slist_free(bound_contexts[i]);
bound_contexts[i] = NULL;
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 (it == NULL) return FALSE;
actions_run_acts(b->actions[a], mouse_action_to_user_action(a),
- time, state, x, y, context, c);
+ state, x, y, button, context, c);
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_curtime);
+ 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;
+ gboolean used = FALSE;
ObFrameContext context;
gboolean click = FALSE;
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);
+ /* if the binding was in a client context, then we need to call
+ 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, 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))
+ replay_pointer_needed = TRUE;
+
+ 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 */
if (grab_on_pointer())
button = 0;
- if (CLIENT_CONTEXT(context, client)) {
- /* Replay the event, so it goes to the client*/
- XAllowEvents(ob_display, ReplayPointer, event_curtime);
- /* Fall through to the release case! */
- } else
+ /* replay the pointer event if it hasn't been replayed yet (i.e. no
+ windows were moved) */
+ 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 (!CLIENT_CONTEXT(context, client))
break;
case ButtonRelease:
Window wjunk;
guint ujunk, b, w, h;
/* this can cause errors to occur when the window closes */
- xerror_set_ignore(TRUE);
- junk1 = XGetGeometry(ob_display, e->xbutton.window,
+ obt_display_ignore_errors(TRUE);
+ junk1 = XGetGeometry(obt_display, e->xbutton.window,
&wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
- xerror_set_ignore(FALSE);
+ obt_display_ignore_errors(FALSE);
if (junk1) {
if (e->xbutton.x >= (signed)-b &&
e->xbutton.y >= (signed)-b &&
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,
- e->xbutton.time);
+ 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,
- e->xbutton.time);
+ 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,
- e->xbutton.time);
+ 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, e->xmotion.time);
+ 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,
GSList *it;
if (!translate_button(buttonstr, &state, &button)) {
- g_message(_("Invalid button '%s' in mouse 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 mouse binding"), contextstr);
+ g_message(_("Invalid context \"%s\" in mouse binding"), contextstr);
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);