]> Dogcows Code - chaz/openbox/blobdiff - plugins/mouse/mouse.c
let identifiers have '.' in them
[chaz/openbox] / plugins / mouse / mouse.c
index aeb3c59240066091ba944890542460ce9a5a4771..ea943f5a2820ac1a838efc4bf5a104ea4a82f660 100644 (file)
@@ -3,11 +3,14 @@
 #include "../../kernel/action.h"
 #include "../../kernel/client.h"
 #include "../../kernel/frame.h"
+#include "../../kernel/grab.h"
 #include "../../kernel/engine.h"
 #include "translate.h"
 #include "mouse.h"
 #include <glib.h>
 
+static int drag_threshold = 3;
+
 /* GData of GSList*s of PointerBinding*s. */
 static GData *bound_contexts;
 
@@ -16,40 +19,33 @@ struct foreach_grab_temp {
     gboolean grab;
 };
 
-static void grab_button(Client *client, guint state, guint button,
-                       GQuark context, gboolean grab)
-{
-    Window win;
-    int mode = GrabModeAsync;
-    unsigned int mask;
-
-    if (context == g_quark_try_string("frame")) {
-       win = client->frame->window;
-       mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
-    } else if (context == g_quark_try_string("client")) {
-       win = client->frame->plate;
-       mode = GrabModeSync; /* this is handled in pointer_event */
-       mask = ButtonPressMask; /* can't catch more than this with Sync mode
-                                  the release event is manufactured in
-                                  pointer_fire */
-    } else return;
-
-    if (grab)
-        /* XXX grab all lock keys */
-       XGrabButton(ob_display, button, state, win, FALSE, mask, mode,
-                   GrabModeAsync, None, None);
-    else
-        /* XXX ungrab all lock keys */
-       XUngrabButton(ob_display, button, state, win);
-}
-
 static void foreach_grab(GQuark key, gpointer data, gpointer user_data)
 {
     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;
-       grab_button(d->client, b->state, b->button, key, d->grab);
+        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);
     }
 }
   
@@ -185,6 +181,7 @@ static void event(ObEvent *e, void *foo)
     static Corner corner = Corner_TopLeft;
     gboolean click = FALSE;
     gboolean dclick = FALSE;
+    GQuark context;
 
     switch (e->type) {
     case Event_Client_Mapped:
@@ -197,9 +194,7 @@ static void event(ObEvent *e, void *foo)
 
     case Event_X_ButtonPress:
         if (!button) {
-            if (e->data.x.client == NULL)
-                corner = Corner_TopLeft;
-            else {
+            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;
@@ -207,80 +202,87 @@ static void event(ObEvent *e, void *foo)
                 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);
-                button = e->data.x.e->xbutton.button;
             }
+            button = e->data.x.e->xbutton.button;
         }
-        fire_button(MouseAction_Press,
-                    engine_get_context(e->data.x.client,
-                                       e->data.x.e->xbutton.window),
+        context = engine_get_context(e->data.x.client,
+                                     e->data.x.e->xbutton.window);
+
+        fire_button(MouseAction_Press, context,
                     e->data.x.client, e->data.x.e->xbutton.state,
                     e->data.x.e->xbutton.button);
-        break;
+
+        if (context == g_quark_try_string("client")) {
+            /* Replay the event, so it goes to the client*/
+            XAllowEvents(ob_display, ReplayPointer, CurrentTime);
+            /* Fall through to the release case! */
+        } else
+            break;
 
     case Event_X_ButtonRelease:
+        context = engine_get_context(e->data.x.client,
+                                     e->data.x.e->xbutton.window);
         if (e->data.x.e->xbutton.button == button) {
             /* end drags */
             if (drag) {
-                fire_motion(MouseAction_Motion,
-                            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->xbutton.state,
                             e->data.x.e->xbutton.button,
                             cx, cy, cw, ch, dx, dy, TRUE, corner);
                 drag = FALSE;
-            }
-
-            /* 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;
-           } else
+                
                 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;
+                } else
+                    lbutton = 0;
+            }
 
             button = 0;
             ltime = e->data.x.e->xbutton.time;
         }
-        fire_button(MouseAction_Press,
-                    engine_get_context(e->data.x.client,
-                                       e->data.x.e->xbutton.window),
+        fire_button(MouseAction_Press, context,
                     e->data.x.client, e->data.x.e->xbutton.state,
                     e->data.x.e->xbutton.button);
         if (click)
-            fire_button(MouseAction_Click,
-                        engine_get_context(e->data.x.client,
-                                           e->data.x.e->xbutton.window),
+            fire_button(MouseAction_Click, context,
                         e->data.x.client, e->data.x.e->xbutton.state,
                         e->data.x.e->xbutton.button);
         if (dclick)
-            fire_button(MouseAction_DClick,
-                        engine_get_context(e->data.x.client,
-                                           e->data.x.e->xbutton.window),
+            fire_button(MouseAction_DClick, context,
                         e->data.x.client, e->data.x.e->xbutton.state,
                         e->data.x.e->xbutton.button);
         break;
 
     case Event_X_MotionNotify:
         if (button) {
-            drag = TRUE;
             dx = e->data.x.e->xmotion.x_root - px;
             dy = e->data.x.e->xmotion.y_root - py;
-            fire_motion(MouseAction_Motion,
-                        engine_get_context(e->data.x.client,
-                                           e->data.x.e->xbutton.window),
-                        e->data.x.client, e->data.x.e->xmotion.state,
-                        button, cx, cy, cw, ch, dx, dy, FALSE, corner);
+            if (ABS(dx) >= drag_threshold || ABS(dy) >= drag_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);
+            }
         }
         break;
 
@@ -365,6 +367,69 @@ static void binddef()
     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()
This page took 0.026062 seconds and 4 git commands to generate.