#include "../../kernel/openbox.h"
#include "../../kernel/dispatch.h"
#include "../../kernel/action.h"
+#include "../../kernel/event.h"
#include "../../kernel/client.h"
#include "../../kernel/frame.h"
#include "../../kernel/grab.h"
#include "../../kernel/engine.h"
+#include "../../kernel/config.h"
#include "translate.h"
#include "mouse.h"
+#include "mouserc_parse.h"
#include <glib.h>
-static int drag_threshold = 3;
+void plugin_setup_config()
+{
+ config_def_set(config_def_new("mouse.dragThreshold", Config_Integer,
+ "Drag Threshold",
+ "The drag threshold in pixels before a Drag "
+ "event starts."));
+ config_def_set(config_def_new("mouse.doubleClickTime", Config_Integer,
+ "Double Click Interval",
+ "The amount of time (in milliseconds) in "
+ "which two clicks must occur to cause a "
+ "DoubleClick event."));
+}
/* GData of GSList*s of PointerBinding*s. */
static GData *bound_contexts;
}
/* corner should be the opposite corner of the window in which the pointer
- clicked, Corner_TopLeft if a good default if there is no client */
-static void fire_motion(MouseAction a, GQuark context, Client *c, guint state,
- guint button, int cx, int cy, int cw, int ch,
- int dx, int dy, gboolean final, Corner corner)
+ clicked, Corner_TopLeft if a good default if there is no client
+ Returns True or False for if a binding existed for the action or not.
+*/
+static gboolean fire_motion(MouseAction a, GQuark context, Client *c,
+ guint state, guint button, int cx, int cy,
+ int cw, int ch, int dx, int dy,
+ gboolean final, Corner corner)
{
GSList *it;
MouseBinding *b;
break;
}
/* if not bound, then nothing to do! */
- if (it == NULL) return;
+ if (it == NULL) return FALSE;
if (b->action[a] != NULL && b->action[a]->func != NULL) {
b->action[a]->data.any.c = c;
b->action[a]->data.resize.final = final;
}
b->action[a]->func(&b->action[a]->data);
+ return TRUE;
}
+ return FALSE;
}
static Corner pick_corner(int x, int y, int cx, int cy, int cw, int ch)
static Time ltime;
static int px, py, cx, cy, cw, ch, dx, dy;
static guint button = 0, lbutton = 0;
- static gboolean drag = FALSE;
+ static gboolean drag = FALSE, drag_used = FALSE;
static Corner corner = Corner_TopLeft;
+ ConfigValue doubleclicktime;
+ ConfigValue dragthreshold;
gboolean click = FALSE;
gboolean dclick = FALSE;
GQuark context;
+
+ if (!config_get("mouse.dragThreshold", Config_Integer, &dragthreshold))
+ dragthreshold.integer = 3; /* default */
+ if (!config_get("mouse.doubleClickTime", Config_Integer, &doubleclicktime))
+ doubleclicktime.integer = 200; /* default */
switch (e->type) {
case Event_Client_Mapped:
if (e->data.x.client != NULL) {
cx = e->data.x.client->frame->area.x;
cy = e->data.x.client->frame->area.y;
- cw = e->data.x.client->frame->area.width;
- ch = e->data.x.client->frame->area.height;
+ /* use the client size because the frame can be differently
+ sized (shaded windows) and we want this based on the clients
+ size */
+ cw = e->data.x.client->area.width +
+ e->data.x.client->frame->size.left +
+ e->data.x.client->frame->size.right;
+ ch = e->data.x.client->area.height +
+ e->data.x.client->frame->size.top +
+ e->data.x.client->frame->size.bottom;
px = e->data.x.e->xbutton.x_root;
py = e->data.x.e->xbutton.y_root;
corner = pick_corner(px, py, cx, cy, cw, ch);
if (context == g_quark_try_string("client")) {
/* Replay the event, so it goes to the client*/
- XAllowEvents(ob_display, ReplayPointer, CurrentTime);
+ XAllowEvents(ob_display, ReplayPointer, event_lasttime);
/* Fall through to the release case! */
} else
break;
e->data.x.e->xbutton.window);
if (e->data.x.e->xbutton.button == button) {
/* end drags */
- if (drag) {
+ if (drag_used) {
fire_motion(MouseAction_Motion, context,
e->data.x.client, e->data.x.e->xbutton.state,
e->data.x.e->xbutton.button,
cx, cy, cw, ch, dx, dy, TRUE, corner);
- drag = FALSE;
+ drag = drag_used = FALSE;
lbutton = 0;
} else {
/* clicks are only valid if its released over the window */
- if (e->data.x.e->xbutton.x >= 0 &&
- e->data.x.e->xbutton.y >= 0) {
- int junk;
- Window wjunk;
- guint ujunk, w, h;
- XGetGeometry(ob_display, e->data.x.e->xbutton.window,
- &wjunk, &junk, &junk, &w, &h, &ujunk, &ujunk);
- if (e->data.x.e->xbutton.x < (signed)w &&
- e->data.x.e->xbutton.y < (signed)h) {
- click =TRUE;
- /* double clicks happen if there were 2 in a row! */
- if (lbutton == button &&
- e->data.x.e->xbutton.time - 300 <= ltime)
- dclick = TRUE;
- }
- lbutton = button;
+ int junk;
+ Window wjunk;
+ guint ujunk, b, w, h;
+ XGetGeometry(ob_display, e->data.x.e->xbutton.window,
+ &wjunk, &junk, &junk, &w, &h, &b, &ujunk);
+ if (e->data.x.e->xbutton.x >= (signed)-b &&
+ e->data.x.e->xbutton.y >= (signed)-b &&
+ e->data.x.e->xbutton.x < (signed)(w+b) &&
+ e->data.x.e->xbutton.y < (signed)(h+b)) {
+ click = TRUE;
+ /* double clicks happen if there were 2 in a row! */
+ if (lbutton == button &&
+ e->data.x.e->xbutton.time - doubleclicktime.integer <=
+ ltime) {
+ dclick = TRUE;
+ lbutton = 0;
+ } else
+ lbutton = button;
} else
lbutton = 0;
}
button = 0;
ltime = e->data.x.e->xbutton.time;
}
- fire_button(MouseAction_Press, context,
+ fire_button(MouseAction_Release, context,
e->data.x.client, e->data.x.e->xbutton.state,
e->data.x.e->xbutton.button);
if (click)
if (button) {
dx = e->data.x.e->xmotion.x_root - px;
dy = e->data.x.e->xmotion.y_root - py;
- if (ABS(dx) >= drag_threshold || ABS(dy) >= drag_threshold)
+ if (!drag &&
+ (ABS(dx) >= dragthreshold.integer ||
+ ABS(dy) >= dragthreshold.integer))
drag = TRUE;
if (drag) {
context = engine_get_context(e->data.x.client,
e->data.x.e->xbutton.window);
- fire_motion(MouseAction_Motion, context,
- e->data.x.client, e->data.x.e->xmotion.state,
- button, cx, cy, cw, ch, dx, dy, FALSE, corner);
+ drag_used = fire_motion(MouseAction_Motion, context,
+ e->data.x.client,
+ e->data.x.e->xmotion.state,
+ button, cx, cy, cw, ch, dx, dy,
+ FALSE, corner);
}
}
break;
}
}
-static gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
- Action *action)
+gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
+ Action *action)
{
guint state, button;
GQuark context;
MouseBinding *b;
GSList *it;
- guint i;
if (!translate_button(buttonstr, &state, &button)) {
- g_warning("invalid button");
+ g_warning("invalid button '%s'", buttonstr);
return FALSE;
}
+ contextstr = g_ascii_strdown(contextstr, -1);
context = g_quark_try_string(contextstr);
if (!context) {
- g_warning("invalid context");
+ g_warning("invalid context '%s'", contextstr);
+ g_free(contextstr);
return FALSE;
}
+ g_free(contextstr);
for (it = g_datalist_id_get_data(&bound_contexts, context);
it != NULL; it = it->next){
grab_all_clients(FALSE);
/* add the binding */
- b = g_new(MouseBinding, 1);
+ b = g_new0(MouseBinding, 1);
b->state = state;
b->button = button;
- for (i = 0; i < NUM_MOUSEACTION; ++i)
- b->action[i] = NULL;
b->action[mact] = action;
g_datalist_id_set_data(&bound_contexts, context,
g_slist_append(g_datalist_id_get_data(&bound_contexts, context), b));
return TRUE;
}
-static void binddef()
-{
- Action *a;
-
- /* When creating an Action struct, all of the data elements in the
- appropriate struct need to be set, except the Client*, which will be set
- at call-time when then action function is used.
-
- For action_move and action_resize, the 'x', 'y', and 'final' data
- elements should not be set, as they are set at call-time.
- */
-
- a = action_new(action_move);
- mbind("1", "titlebar", MouseAction_Motion, a);
- a = action_new(action_move);
- mbind("1", "handle", MouseAction_Motion, a);
- a = action_new(action_move);
- mbind("A-1", "frame", MouseAction_Motion, a);
-
- a = action_new(action_resize);
- mbind("1", "blcorner", MouseAction_Motion, a);
- a = action_new(action_resize);
- mbind("1", "brcorner", MouseAction_Motion, a);
- a = action_new(action_resize);
- mbind("A-3", "frame", MouseAction_Motion, a);
-
- a = action_new(action_focus);
- mbind("1", "titlebar", MouseAction_Press, a);
- a = action_new(action_focus);
- mbind("1", "handle", MouseAction_Press, a);
- a = action_new(action_raise);
- mbind("1", "titlebar", MouseAction_Click, a);
- a = action_new(action_raise);
- mbind("1", "handle", MouseAction_Click, a);
- a = action_new(action_lower);
- mbind("2", "titlebar", MouseAction_Press, a);
- a = action_new(action_lower);
- mbind("2", "handle", MouseAction_Press, a);
- a = action_new(action_raise);
- mbind("A-1", "frame", MouseAction_Click, a);
- a = action_new(action_lower);
- mbind("A-3", "frame", MouseAction_Click, a);
-
- a = action_new(action_focus);
- mbind("1", "client", MouseAction_Press, a);
-
- a = action_new(action_toggle_shade);
- mbind("1", "titlebar", MouseAction_DClick, a);
- a = action_new(action_shade);
- mbind("4", "titlebar", MouseAction_Press, a);
- a = action_new(action_unshade);
- mbind("5", "titlebar", MouseAction_Click, a);
-
- a = action_new(action_toggle_maximize_full);
- mbind("1", "maximize", MouseAction_Click, a);
- a = action_new(action_toggle_maximize_vert);
- mbind("2", "maximize", MouseAction_Click, a);
- a = action_new(action_toggle_maximize_horz);
- mbind("3", "maximize", MouseAction_Click, a);
- a = action_new(action_iconify);
- mbind("1", "iconify", MouseAction_Click, a);
- a = action_new(action_close);
- mbind("1", "icon", MouseAction_DClick, a);
- a = action_new(action_close);
- mbind("1", "close", MouseAction_Click, a);
- a = action_new(action_kill);
- mbind("2", "close", MouseAction_Click, a);
- a = action_new(action_toggle_omnipresent);
- mbind("1", "alldesktops", MouseAction_Click, a);
-
- a = action_new(action_next_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- mbind("4", "root", MouseAction_Click, a);
- a = action_new(action_previous_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- mbind("5", "root", MouseAction_Click, a);
- a = action_new(action_next_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- mbind("A-4", "root", MouseAction_Click, a);
- a = action_new(action_previous_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- mbind("A-5", "root", MouseAction_Click, a);
- a = action_new(action_next_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- mbind("A-4", "frame", MouseAction_Click, a);
- a = action_new(action_previous_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- mbind("A-5", "frame", MouseAction_Click, a);
-}
-
void plugin_startup()
{
dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
Event_X_ButtonPress | Event_X_ButtonRelease |
Event_X_MotionNotify, (EventHandler)event, NULL);
- /* XXX parse a config */
- binddef();
+ mouserc_parse();
}
void plugin_shutdown()
projects / chaz / openbox / blobdiff