rename the Client struct to ObClient

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

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index a2b3d7e04d01578f4a21e994c83292ffc486eed4..4ed7b9dda22a05d93b75fdd7e65bcfbd761e77eb 100644 (file)
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -13,7 +13,6 @@
 
 static int threshold;
 static int dclicktime;
-
 /*
 
 <context name="Titlebar"> 
@@ -105,7 +104,7 @@ void plugin_setup_config()
 /* 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;
@@ -168,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;
@@ -199,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)
 {
@@ -275,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,