X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmouse%2Fmouse.c;h=4ed7b9dda22a05d93b75fdd7e65bcfbd761e77eb;hb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;hp=e39720cbb022961b448d0bbf8e74ce4b00ec1c18;hpb=f6b61bb60e8f3a090ad9bbbdf88470eb5c7c3158;p=chaz%2Fopenbox

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index e39720cb..4ed7b9dd 100644
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -5,48 +5,106 @@
 #include "kernel/client.h"
 #include "kernel/prop.h"
 #include "kernel/grab.h"
-#include "kernel/parse.h"
 #include "kernel/frame.h"
+#include "parser/parse.h"
 #include "translate.h"
 #include "mouse.h"
-#include "mouseparse.h"
 #include <glib.h>
 
 static int threshold;
 static int dclicktime;
+/*
 
-static void parse_assign(char *name, ParseToken *value)
+<context name="Titlebar"> 
+  <mousebind button="Left" action="Press">
+    <action name="Raise"></action>
+  </mousebind>
+</context>
+
+*/
+
+static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
-    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;
+    xmlNodePtr n, nbut, nact;
+    char *buttonstr;
+    char *contextstr;
+    MouseAction mact;
+    Action *action;
+
+    if ((n = parse_find_node("dragThreshold", node)))
+        threshold = parse_int(doc, n);
+    if ((n = parse_find_node("doubleClickTime", node)))
+        dclicktime = parse_int(doc, n);
+
+    n = parse_find_node("context", node);
+    while (n) {
+        if (!parse_attr_string("name", n, &contextstr))
+            goto next_n;
+        nbut = parse_find_node("mousebind", n->xmlChildrenNode);
+        while (nbut) {
+            if (!parse_attr_string("button", nbut, &buttonstr))
+                goto next_nbut;
+            if (parse_attr_contains("press", nbut, "action"))
+                mact = MouseAction_Press;
+            else if (parse_attr_contains("release", nbut, "action"))
+                mact = MouseAction_Release;
+            else if (parse_attr_contains("click", nbut, "action"))
+                mact = MouseAction_Click;
+            else if (parse_attr_contains("doubleclick", nbut,"action"))
+                mact = MouseAction_DClick;
+            else if (parse_attr_contains("drag", nbut, "action"))
+                mact = MouseAction_Motion;
+            else
+                goto next_nbut;
+            nact = parse_find_node("action", nbut->xmlChildrenNode);
+            while (nact) {
+                if ((action = action_parse(doc, nact))) {
+                    /* validate that its okay for a mouse binding*/
+                    if (mact == MouseAction_Motion) {
+                        if (action->func != action_moveresize ||
+                            action->data.moveresize.corner ==
+                            prop_atoms.net_wm_moveresize_move_keyboard ||
+                            action->data.moveresize.corner ==
+                            prop_atoms.net_wm_moveresize_size_keyboard) {
+                            action_free(action);
+                            action = NULL;
+                        }
+                    } else {
+                        if (action->func == action_moveresize &&
+                            action->data.moveresize.corner !=
+                            prop_atoms.net_wm_moveresize_move_keyboard &&
+                            action->data.moveresize.corner !=
+                            prop_atoms.net_wm_moveresize_size_keyboard) {
+                            action_free(action);
+                            action = NULL;
+                        }
+                    }
+                    if (action)
+                        mbind(buttonstr, contextstr, mact, action);
+                }
+                nact = parse_find_node("action", nact->next);
+            }
+            g_free(buttonstr);
+        next_nbut:
+            nbut = parse_find_node("mousebind", nbut->next);
         }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
+        g_free(contextstr);
+    next_n:
+        n = parse_find_node("context", n->next);
+    }
 }
 
 void plugin_setup_config()
 {
     threshold = 3;
     dclicktime = 200;
-    parse_reg_section("mouse", mouseparse, parse_assign);
+    parse_register("mouse", parse_xml, NULL);
 }
 
 /* Array of GSList*s of PointerBinding*s. */
 static GSList *bound_contexts[NUM_CONTEXTS];
 
-static void grab_for_client(Client *client, gboolean grab)
+static void grab_for_client(ObClient *client, gboolean grab)
 {
     int i;
     GSList *it;
@@ -109,7 +167,7 @@ static void clearall()
     }
 }
 
-static void fire_button(MouseAction a, Context context, Client *c, guint state,
+static void fire_button(MouseAction a, Context context, ObClient *c, guint state,
                         guint button, int x, int y)
 {
     GSList *it;
@@ -140,7 +198,7 @@ static void fire_button(MouseAction a, Context context, Client *c, guint state,
     }
 }
 
-static void fire_motion(MouseAction a, Context context, Client *c,
+static void fire_motion(MouseAction a, Context context, ObClient *c,
                         guint state, guint button, int x_root, int y_root,
                         guint32 corner)
 {
@@ -216,12 +274,10 @@ static void event(ObEvent *e, void *foo)
         context = frame_context(e->data.x.client,
                                 e->data.x.e->xbutton.window);
 
-        if (!button) {
-            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;
-        }
+        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;
 
         fire_button(MouseAction_Press, context,
                     e->data.x.client, e->data.x.e->xbutton.state,
@@ -240,11 +296,11 @@ static void event(ObEvent *e, void *foo)
                                 e->data.x.e->xbutton.window);
         if (e->data.x.e->xbutton.button == button) {
             /* clicks are only valid if its released over the window */
-            int junk;
+            int junk1, junk2;
             Window wjunk;
             guint ujunk, b, w, h;
             XGetGeometry(ob_display, e->data.x.e->xbutton.window,
-                         &wjunk, &junk, &junk, &w, &h, &b, &ujunk);
+                         &wjunk, &junk1, &junk2, &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) &&