prefix key bindnigs with 'kbind'

[chaz/openbox] / plugins / mouse / mouse.c

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index f505c887487f1d9e6f56f0c348b92c98e20e9d51..4c19d2436a65800004e2c77b6602e81e85487a4e 100644 (file)
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -6,6 +6,7 @@
 #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"
@@ -13,10 +14,17 @@
 
 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."));
 }
 
-static int drag_threshold = 3;
-
 /* GData of GSList*s of PointerBinding*s. */
 static GData *bound_contexts;
 
@@ -190,9 +198,16 @@ static void event(ObEvent *e, void *foo)
     static guint button = 0, lbutton = 0;
     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:
@@ -208,8 +223,15 @@ static void event(ObEvent *e, void *foo)
             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);
@@ -240,7 +262,7 @@ static void event(ObEvent *e, void *foo)
                             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 {
@@ -254,10 +276,11 @@ static void event(ObEvent *e, void *foo)
                     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 - doubleclicktime.integer <=
+                        ltime) {
                         dclick = TRUE;
                         lbutton = 0;
                     } else
@@ -287,7 +310,8 @@ static void event(ObEvent *e, void *foo)
             dx = e->data.x.e->xmotion.x_root - px;
             dy = e->data.x.e->xmotion.y_root - py;
             if (!drag &&
-                (ABS(dx) >= drag_threshold || ABS(dy) >= drag_threshold))
+                (ABS(dx) >= dragthreshold.integer ||
+                 ABS(dy) >= dragthreshold.integer))
                 drag = TRUE;
             if (drag) {
                 context = engine_get_context(e->data.x.client,