-#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/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/parse.h"
+#include "kernel/frame.h"
#include "translate.h"
#include "mouse.h"
-#include "mouserc_parse.h"
+#include "mouseparse.h"
#include <glib.h>
-void plugin_setup_config()
+static int threshold;
+static int dclicktime;
+
+static void parse_assign(char *name, ParseToken *value)
{
+ if (!g_ascii_strcasecmp(name, "dragthreshold")) {
+ if (value->type != TOKEN_INTEGER)
+ yyerror("invalid value");
+ else {
+ if (value->data.integer >= 0)
+ threshold = value->data.integer;
+ }
+ } else if (!g_ascii_strcasecmp(name, "doubleclicktime")) {
+ if (value->type != TOKEN_INTEGER)
+ yyerror("invalid value");
+ else {
+ if (value->data.integer >= 0)
+ dclicktime = value->data.integer;
+ }
+ } else
+ yyerror("invalid option");
+ parse_free_token(value);
}
-static int drag_threshold = 3;
-
-/* GData of GSList*s of PointerBinding*s. */
-static GData *bound_contexts;
-
-struct foreach_grab_temp {
- Client *client;
- gboolean grab;
-};
-
-static void foreach_grab(GQuark key, gpointer data, gpointer user_data)
+void plugin_setup_config()
{
- struct foreach_grab_temp *d = user_data;
- GSList *it;
- for (it = data; it != NULL; it = it->next) {
- /* grab/ungrab the button */
- MouseBinding *b = it->data;
- Window win;
- int mode;
- unsigned int mask;
-
- if (key == g_quark_try_string("frame")) {
- win = d->client->frame->window;
- mode = GrabModeAsync;
- mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
- } else if (key == g_quark_try_string("client")) {
- win = d->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 manufactured
- in event */
- } else return;
-
- if (d->grab)
- grab_button(b->button, b->state, win, mask, mode);
- else
- ungrab_button(b->button, b->state, win);
- }
+ threshold = 3;
+ dclicktime = 200;
+ parse_reg_section("mouse", mouseparse, parse_assign);
}
-
+
+/* Array of GSList*s of PointerBinding*s. */
+static GSList *bound_contexts[NUM_CONTEXTS];
+
static void grab_for_client(Client *client, gboolean grab)
{
- struct foreach_grab_temp bt;
- bt.client = client;
- bt.grab = grab;
- g_datalist_foreach(&bound_contexts, foreach_grab, &bt);
+ int i;
+ GSList *it;
+
+ for (i = 0; i < NUM_CONTEXTS; ++i)
+ for (it = bound_contexts[i]; it != NULL; it = it->next) {
+ /* grab/ungrab the button */
+ MouseBinding *b = it->data;
+ Window win;
+ int mode;
+ unsigned int mask;
+
+ if (i == Context_Frame) {
+ win = client->frame->window;
+ mode = GrabModeAsync;
+ mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
+ } else if (i == Context_Client) {
+ 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
+ manufactured in event() */
+ } else continue;
+
+ if (grab)
+ grab_button(b->button, b->state, win, mask, mode);
+ else
+ ungrab_button(b->button, b->state, win);
+ }
}
static void grab_all_clients(gboolean grab)
{
- GSList *it;
+ GList *it;
for (it = client_list; it != NULL; it = it->next)
grab_for_client(it->data, grab);
}
-static void foreach_clear(GQuark key, gpointer data, gpointer user_data)
+static void clearall()
{
+ int i;
GSList *it;
- user_data = user_data;
- for (it = data; it != NULL; it = it->next) {
- int i;
-
- MouseBinding *b = it->data;
- for (i = 0; i < NUM_MOUSEACTION; ++i)
- if (b->action[i] != NULL)
- action_free(b->action[i]);
- g_free(b);
+
+ for(i = 0; i < NUM_CONTEXTS; ++i) {
+ for (it = bound_contexts[i]; it != NULL; it = it->next) {
+ int j;
+
+ MouseBinding *b = it->data;
+ for (j = 0; j < NUM_MOUSEACTION; ++j)
+ if (b->action[j] != NULL)
+ action_free(b->action[j]);
+ g_free(b);
+ }
+ g_slist_free(bound_contexts[i]);
}
- g_slist_free(data);
}
-static void fire_button(MouseAction a, GQuark context, Client *c, guint state,
+static void fire_button(MouseAction a, Context context, Client *c, guint state,
guint button)
{
GSList *it;
MouseBinding *b;
- for (it = g_datalist_id_get_data(&bound_contexts, context);
- it != NULL; it = it->next) {
+ for (it = bound_contexts[context]; it != NULL; it = it->next) {
b = it->data;
if (b->state == state && b->button == button)
break;
}
/* 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, Context 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;
- for (it = g_datalist_id_get_data(&bound_contexts, context);
- it != NULL; it = it->next) {
+ for (it = bound_contexts[context]; it != NULL; it = it->next) {
b = it->data;
if (b->state == state && b->button == button)
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;
gboolean click = FALSE;
gboolean dclick = FALSE;
- GQuark context;
-
+ Context context;
+
switch (e->type) {
case Event_Client_Mapped:
grab_for_client(e->data.c.client, TRUE);
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);
e->data.x.client, e->data.x.e->xbutton.state,
e->data.x.e->xbutton.button);
- if (context == g_quark_try_string("client")) {
+ if (context == Context_Client) {
/* Replay the event, so it goes to the client*/
XAllowEvents(ob_display, ReplayPointer, event_lasttime);
/* Fall through to the release case! */
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 {
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;
+ click = TRUE;
/* double clicks happen if there were 2 in a row! */
if (lbutton == button &&
- e->data.x.e->xbutton.time - 300 <= ltime) {
+ e->data.x.e->xbutton.time - dclicktime <= ltime) {
dclick = TRUE;
lbutton = 0;
} else
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) >= threshold || ABS(dy) >= threshold))
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;
Action *action)
{
guint state, button;
- GQuark context;
+ Context context;
MouseBinding *b;
GSList *it;
}
contextstr = g_ascii_strdown(contextstr, -1);
- context = g_quark_try_string(contextstr);
+ context = frame_context_from_string(contextstr);
if (!context) {
g_warning("invalid context '%s'", contextstr);
g_free(contextstr);
}
g_free(contextstr);
- for (it = g_datalist_id_get_data(&bound_contexts, context);
- it != NULL; it = it->next){
+ for (it = bound_contexts[context]; it != NULL; it = it->next){
b = it->data;
if (b->state == state && b->button == button) {
/* already bound */
b->state = state;
b->button = button;
b->action[mact] = action;
- g_datalist_id_set_data(&bound_contexts, context,
- g_slist_append(g_datalist_id_get_data(&bound_contexts, context), b));
+ bound_contexts[context] = g_slist_append(bound_contexts[context], b);
grab_all_clients(TRUE);
dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
Event_X_ButtonPress | Event_X_ButtonRelease |
Event_X_MotionNotify, (EventHandler)event, NULL);
-
- mouserc_parse();
}
void plugin_shutdown()
dispatch_register(0, (EventHandler)event, NULL);
grab_all_clients(FALSE);
- g_datalist_foreach(&bound_contexts, foreach_clear, NULL);
+ clearall();
}
projects / chaz / openbox / blobdiff