X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmouse%2Fmouse.c;h=0d0b8fd9a9e59a0c0758ebb6897a0fbdccec7755;hb=ed4f84ac33765eee594ad6771df38768afd842a4;hp=1ef0ee8772a77813e632d2877733f5c401583643;hpb=251983186d919ea6e0c16418cf7939c02ef59afa;p=chaz%2Fopenbox

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index 1ef0ee87..0d0b8fd9 100644
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -1,100 +1,121 @@
-#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/prop.h"
+#include "kernel/grab.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_full(b->button, b->state, win, mask, mode, None);
+            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) {
+                GSList *it;
+                for (it = b->actions[j]; it; it = it->next) {
+                    action_free(it->data);
+                }
+                g_slist_free(b->actions[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,
-                        guint button)
+static void fire_button(MouseAction a, Context context, Client *c, guint state,
+                        guint button, int x, int y)
 {
     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;
@@ -102,98 +123,86 @@ static void fire_button(MouseAction a, GQuark context, Client *c, guint state,
     /* if not bound, then nothing to do! */
     if (it == NULL) return;
 
-    if (b->action[a] != NULL && b->action[a]->func != NULL) {
-        b->action[a]->data.any.c = c;
+    for (it = b->actions[a]; it; it = it->next) {
+        Action *act = it->data;
+        if (act->func != NULL) {
+            act->data.any.c = c;
 
-        g_assert(!(b->action[a]->func == action_move ||
-                   b->action[a]->func == action_resize));
+            g_assert(act->func != action_moveresize);
 
-        b->action[a]->func(&b->action[a]->data);
+            if (act->func == action_showmenu) {
+                act->data.showmenu.x = x;
+                act->data.showmenu.y = y;
+            }
+
+            act->func(&act->data);
+        }
     }
 }
 
-/* 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 
-   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)
+static void fire_motion(MouseAction a, Context context, Client *c,
+                        guint state, guint button, int x_root, int y_root,
+                        guint32 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 FALSE;
-
-    if (b->action[a] != NULL && b->action[a]->func != NULL) {
-        b->action[a]->data.any.c = c;
-
-        if (b->action[a]->func == action_move) {
-            b->action[a]->data.move.x = cx + dx;
-            b->action[a]->data.move.y = cy + dy;
-            b->action[a]->data.move.final = final;
-        } else if (b->action[a]->func == action_resize) {
-            b->action[a]->data.resize.corner = corner;
-            switch (corner) {
-            case Corner_TopLeft:
-                b->action[a]->data.resize.x = cw + dx;
-                b->action[a]->data.resize.y = ch + dy;
-                break;
-            case Corner_TopRight:
-                b->action[a]->data.resize.x = cw - dx;
-                b->action[a]->data.resize.y = ch + dy;
-                break;
-            case Corner_BottomLeft:
-                b->action[a]->data.resize.x = cw + dx;
-                b->action[a]->data.resize.y = ch - dy;
-                break;
-            case Corner_BottomRight:
-                b->action[a]->data.resize.x = cw - dx;
-                b->action[a]->data.resize.y = ch - dy;
-                break;
-            }
-            b->action[a]->data.resize.final = final;
+    if (it == NULL) return;
+
+    for (it = b->actions[a]; it; it = it->next) {
+        Action *act = it->data;
+        if (act->func != NULL) {
+            act->data.any.c = c;
+
+            if (act->func == action_moveresize) {
+                act->data.moveresize.x = x_root;
+                act->data.moveresize.y = y_root;
+                act->data.moveresize.button = button;
+                if (!(act->data.moveresize.corner ==
+                      prop_atoms.net_wm_moveresize_move ||
+                      act->data.moveresize.corner ==
+                      prop_atoms.net_wm_moveresize_move_keyboard ||
+                      act->data.moveresize.corner ==
+                      prop_atoms.net_wm_moveresize_size_keyboard))
+                    act->data.moveresize.corner = corner;
+            } else
+                g_assert_not_reached();
+
+            act->func(&act->data);
         }
-        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 guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
 {
     if (x - cx < cw / 2) {
         if (y - cy < ch / 2)
-            return Corner_BottomRight;
+            return prop_atoms.net_wm_moveresize_size_topleft;
         else
-            return Corner_TopRight;
+            return prop_atoms.net_wm_moveresize_size_bottomleft;
     } else {
         if (y - cy < ch / 2)
-            return Corner_BottomLeft;
+            return prop_atoms.net_wm_moveresize_size_topright;
         else
-            return Corner_TopLeft;
+            return prop_atoms.net_wm_moveresize_size_bottomright;
     }
 }
 
 static void event(ObEvent *e, void *foo)
 {
     static Time ltime;
-    static int px, py, cx, cy, cw, ch, dx, dy;
-    static guint button = 0, lbutton = 0;
-    static gboolean drag = FALSE, drag_used = FALSE;
-    static Corner corner = Corner_TopLeft;
+    static guint button = 0, state = 0, lbutton = 0;
+    static int px, py;
     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);
@@ -204,33 +213,22 @@ static void event(ObEvent *e, void *foo)
         break;
 
     case Event_X_ButtonPress:
+        context = frame_context(e->data.x.client,
+                                e->data.x.e->xbutton.window);
+
         if (!button) {
-            if (e->data.x.client != NULL) {
-                cx = e->data.x.client->frame->area.x;
-                cy = e->data.x.client->frame->area.y;
-                /* 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);
-            }
+            px = e->data.x.e->xbutton.x_root;
+            py = e->data.x.e->xbutton.y_root;
             button = e->data.x.e->xbutton.button;
+            state = e->data.x.e->xbutton.state;
         }
-        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);
+                    e->data.x.e->xbutton.button,
+                    e->data.x.e->xbutton.x_root, e->data.x.e->xbutton.y_root);
 
-        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! */
@@ -238,72 +236,84 @@ static void event(ObEvent *e, void *foo)
             break;
 
     case Event_X_ButtonRelease:
-        context = engine_get_context(e->data.x.client,
-                                     e->data.x.e->xbutton.window);
+        context = frame_context(e->data.x.client,
+                                e->data.x.e->xbutton.window);
         if (e->data.x.e->xbutton.button == button) {
-            /* end drags */
-            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 = drag_used = FALSE;
-                
-                lbutton = 0;
-            } else {
-                /* clicks are only valid if its released over the window */
-                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 - 300 <= ltime) {
-                        dclick = TRUE;
-                        lbutton = 0;
-                    } else
-                        lbutton = button;
-                } else
+            /* clicks are only valid if its released over the window */
+            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 - dclicktime <= ltime) {
+                    dclick = TRUE;
                     lbutton = 0;
-            }
+                } else
+                    lbutton = button;
+            } else
+                lbutton = 0;
 
             button = 0;
+            state = 0;
             ltime = e->data.x.e->xbutton.time;
         }
         fire_button(MouseAction_Release, context,
                     e->data.x.client, e->data.x.e->xbutton.state,
-                    e->data.x.e->xbutton.button);
+                    e->data.x.e->xbutton.button,
+                    e->data.x.e->xbutton.x_root, e->data.x.e->xbutton.y_root);
         if (click)
             fire_button(MouseAction_Click, context,
                         e->data.x.client, e->data.x.e->xbutton.state,
-                        e->data.x.e->xbutton.button);
+                        e->data.x.e->xbutton.button,
+                        e->data.x.e->xbutton.x_root,
+                        e->data.x.e->xbutton.y_root);
         if (dclick)
             fire_button(MouseAction_DClick, context,
                         e->data.x.client, e->data.x.e->xbutton.state,
-                        e->data.x.e->xbutton.button);
+                        e->data.x.e->xbutton.button,
+                        e->data.x.e->xbutton.x_root,
+                        e->data.x.e->xbutton.y_root);
         break;
 
     case Event_X_MotionNotify:
         if (button) {
-            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))
-                drag = TRUE;
-            if (drag) {
-                context = engine_get_context(e->data.x.client,
-                                             e->data.x.e->xbutton.window);
-                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);
+            if (ABS(e->data.x.e->xmotion.x_root - px) >= threshold ||
+                ABS(e->data.x.e->xmotion.y_root - py) >= threshold) {
+                guint32 corner;
+
+                if (!e->data.x.client)
+                    corner = prop_atoms.net_wm_moveresize_size_bottomright;
+                else
+                    corner =
+                        pick_corner(e->data.x.e->xmotion.x_root,
+                                    e->data.x.e->xmotion.y_root,
+                                    e->data.x.client->frame->area.x,
+                                    e->data.x.client->frame->area.y,
+                                    /* use the client size because the frame
+                                       can be differently sized (shaded
+                                       windows) and we want this based on the
+                                       clients size */
+                                    e->data.x.client->area.width +
+                                    e->data.x.client->frame->size.left +
+                                    e->data.x.client->frame->size.right,
+                                    e->data.x.client->area.height +
+                                    e->data.x.client->frame->size.top +
+                                    e->data.x.client->frame->size.bottom);
+                context = frame_context(e->data.x.client,
+                                        e->data.x.e->xmotion.window);
+                fire_motion(MouseAction_Motion, context,
+                            e->data.x.client, state, button,
+                            e->data.x.e->xmotion.x_root, 
+                            e->data.x.e->xmotion.y_root, corner);
+                button = 0;
+                state = 0;
             }
         }
         break;
@@ -317,7 +327,7 @@ gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
                Action *action)
 {
     guint state, button;
-    GQuark context;
+    Context context;
     MouseBinding *b;
     GSList *it;
 
@@ -327,7 +337,7 @@ gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
     }
 
     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);
@@ -335,16 +345,10 @@ gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
     }
     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 */
-            if (b->action[mact] != NULL) {
-                g_warning("duplicate binding");
-                return FALSE;
-            }
-            b->action[mact] = action;
+            b->actions[mact] = g_slist_append(b->actions[mact], action);
             return TRUE;
 	}
     }
@@ -355,9 +359,8 @@ gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
     b = g_new0(MouseBinding, 1);
     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));
+    b->actions[mact] = g_slist_append(NULL, action);
+    bound_contexts[context] = g_slist_append(bound_contexts[context], b);
 
     grab_all_clients(TRUE);
 
@@ -369,8 +372,6 @@ void plugin_startup()
     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()
@@ -378,5 +379,5 @@ void plugin_shutdown()
     dispatch_register(0, (EventHandler)event, NULL);
 
     grab_all_clients(FALSE);
-    g_datalist_foreach(&bound_contexts, foreach_clear, NULL);
+    clearall();
 }