X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmouse.c;h=9a5ab53bc4be23b652c2e30c85f6229a2590b783;hb=def76092b587e7e9a2b212dc5211773e336525e1;hp=c0fcade49556e090e62b0a9de9db1403376422dc;hpb=ba05275408d8bab8f887f1c9d7e20a071e13c35a;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index c0fcade4..9a5ab53b 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -89,16 +89,16 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context,
 
 void mouse_grab_for_client(ObClient *client, gboolean grab)
 {
-    int i;
+    gint i;
     GSList *it;
 
     for (i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i)
-        for (it = bound_contexts[i]; it != NULL; it = g_slist_next(it)) {
+        for (it = bound_contexts[i]; it; it = g_slist_next(it)) {
             /* grab/ungrab the button */
             ObMouseBinding *b = it->data;
             Window win;
-            int mode;
-            unsigned int mask;
+            gint mode;
+            guint mask;
 
             if (FRAME_CONTEXT(i, client)) {
                 win = client->frame->window;
@@ -124,25 +124,25 @@ static void grab_all_clients(gboolean grab)
 {
     GList *it;
 
-    for (it = client_list; it != NULL; it = it->next)
+    for (it = client_list; it; it = g_list_next(it))
 	mouse_grab_for_client(it->data, grab);
 }
 
 void mouse_unbind_all()
 {
-    int i;
+    gint i;
     GSList *it;
     
     for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) {
-        for (it = bound_contexts[i]; it != NULL; it = it->next) {
+        for (it = bound_contexts[i]; it; it = g_slist_next(it)) {
             ObMouseBinding *b = it->data;
-            int j;
+            gint j;
 
             for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
                 GSList *it;
 
-                for (it = b->actions[j]; it; it = it->next)
-                    action_free(it->data);
+                for (it = b->actions[j]; it; it = g_slist_next(it))
+                    action_unref(it->data);
                 g_slist_free(b->actions[j]);
             }
             g_free(b);
@@ -154,12 +154,12 @@ void mouse_unbind_all()
 
 static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
                              ObClient *c, guint state,
-                             guint button, int x, int y)
+                             guint button, gint x, gint y)
 {
     GSList *it;
     ObMouseBinding *b;
 
-    for (it = bound_contexts[context]; it != NULL; it = it->next) {
+    for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
         b = it->data;
         if (b->state == state && b->button == button)
             break;
@@ -167,7 +167,7 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
     /* if not bound, then nothing to do! */
     if (it == NULL) return FALSE;
 
-    action_run_mouse(b->actions[a], c, state, button, x, y);
+    action_run_mouse(b->actions[a], c, context, state, button, x, y);
     return TRUE;
 }
 
@@ -176,7 +176,7 @@ void mouse_event(ObClient *client, XEvent *e)
     static Time ltime;
     static guint button = 0, state = 0, lbutton = 0;
     static Window lwindow = None;
-    static int px, py;
+    static gint px, py;
 
     ObFrameContext context;
     gboolean click = FALSE;
@@ -210,7 +210,7 @@ void mouse_event(ObClient *client, XEvent *e)
 
         if (e->xbutton.button == button) {
             /* clicks are only valid if its released over the window */
-            int junk1, junk2;
+            gint junk1, junk2;
             Window wjunk;
             guint ujunk, b, w, h;
             /* this can cause errors to occur when the window closes */
@@ -314,7 +314,7 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
         return FALSE;
     }
 
-    for (it = bound_contexts[context]; it != NULL; it = it->next){
+    for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
 	b = it->data;
 	if (b->state == state && b->button == button) {
             b->actions[mact] = g_slist_append(b->actions[mact], action);