prefixing and capitalization for the Frame->ObFrame struct and the Context->ObFrameCo...

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

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index 0bfe602c7cb936647785a9a78d98b70b1356097c..91ff7c4b18dd4ee358d44a42d67b4a0983584758 100644 (file)
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -5,15 +5,14 @@
 #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 <glib.h>
 
 static int threshold;
 static int dclicktime;
-
 /*
 
 <context name="Titlebar"> 
@@ -59,7 +58,7 @@ static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
                 goto next_nbut;
             nact = parse_find_node("action", nbut->xmlChildrenNode);
             while (nact) {
-                if ((action = parse_action(doc, nact))) {
+                if ((action = action_parse(doc, nact))) {
                     /* validate that its okay for a mouse binding*/
                     if (mact == MouseAction_Motion) {
                         if (action->func != action_moveresize ||
@@ -103,14 +102,14 @@ void plugin_setup_config()
 }
 
 /* Array of GSList*s of PointerBinding*s. */
-static GSList *bound_contexts[NUM_CONTEXTS];
+static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
 
-static void grab_for_client(Client *client, gboolean grab)
+static void grab_for_client(ObClient *client, gboolean grab)
 {
     int i;
     GSList *it;
 
-    for (i = 0; i < NUM_CONTEXTS; ++i)
+    for (i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i)
         for (it = bound_contexts[i]; it != NULL; it = it->next) {
             /* grab/ungrab the button */
             MouseBinding *b = it->data;
@@ -118,11 +117,11 @@ static void grab_for_client(Client *client, gboolean grab)
             int mode;
             unsigned int mask;
 
-            if (i == Context_Frame) {
+            if (i == OB_FRAME_CONTEXT_FRAME) {
                 win = client->frame->window;
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
-            } else if (i == Context_Client) {
+            } else if (i == OB_FRAME_CONTEXT_CLIENT) {
                 win = client->frame->plate;
                 mode = GrabModeSync; /* this is handled in event */
                 mask = ButtonPressMask; /* can't catch more than this with Sync
@@ -150,7 +149,7 @@ static void clearall()
     int i;
     GSList *it;
     
-    for(i = 0; i < NUM_CONTEXTS; ++i) {
+    for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) {
         for (it = bound_contexts[i]; it != NULL; it = it->next) {
             int j;
 
@@ -168,7 +167,8 @@ static void clearall()
     }
 }
 
-static void fire_button(MouseAction a, Context context, Client *c, guint state,
+static void fire_button(MouseAction a, ObFrameContext context,
+                        ObClient *c, guint state,
                         guint button, int x, int y)
 {
     GSList *it;
@@ -199,7 +199,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, ObFrameContext context, ObClient *c,
                         guint state, guint button, int x_root, int y_root,
                         guint32 corner)
 {
@@ -260,7 +260,7 @@ static void event(ObEvent *e, void *foo)
     static int px, py;
     gboolean click = FALSE;
     gboolean dclick = FALSE;
-    Context context;
+    ObFrameContext context;
     
     switch (e->type) {
     case Event_Client_Mapped:
@@ -275,19 +275,17 @@ 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,
                     e->data.x.e->xbutton.button,
                     e->data.x.e->xbutton.x_root, e->data.x.e->xbutton.y_root);
 
-        if (context == Context_Client) {
+        if (context == OB_FRAME_CONTEXT_CLIENT) {
             /* Replay the event, so it goes to the client*/
             XAllowEvents(ob_display, ReplayPointer, event_lasttime);
             /* Fall through to the release case! */
@@ -351,12 +349,12 @@ static void event(ObEvent *e, void *foo)
                                         e->data.x.e->xmotion.window);
 
                 /* You can't drag on buttons */
-                if (context == Context_Maximize ||
-                    context == Context_AllDesktops ||
-                    context == Context_Shade ||
-                    context == Context_Iconify ||
-                    context == Context_Icon ||
-                    context == Context_Close)
+                if (context == OB_FRAME_CONTEXT_MAXIMIZE ||
+                    context == OB_FRAME_CONTEXT_ALLDESKTOPS ||
+                    context == OB_FRAME_CONTEXT_SHADE ||
+                    context == OB_FRAME_CONTEXT_ICONIFY ||
+                    context == OB_FRAME_CONTEXT_ICON ||
+                    context == OB_FRAME_CONTEXT_CLOSE)
                     break;
 
                 if (!e->data.x.client)
@@ -396,7 +394,7 @@ gboolean mbind(char *buttonstr, char *contextstr, MouseAction mact,
                Action *action)
 {
     guint state, button;
-    Context context;
+    ObFrameContext context;
     MouseBinding *b;
     GSList *it;