consistant glib type usage

[chaz/openbox] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 27bd658466213e2f7776faa47ec2bf82483acc6d..8456079d7a1c020ca6f817edb94d924c6a68f795 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   mouse.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "openbox.h"
 #include "config.h"
 #include "xerror.h"
@@ -71,7 +89,7 @@ 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)
@@ -79,8 +97,8 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
             /* 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;
@@ -110,21 +128,21 @@ static void grab_all_clients(gboolean grab)
        mouse_grab_for_client(it->data, grab);
 }
 
-static void clearall()
+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) {
             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);
+                    action_unref(it->data);
                 g_slist_free(b->actions[j]);
             }
             g_free(b);
@@ -136,7 +154,7 @@ static void clearall()
 
 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;
@@ -149,8 +167,7 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
     /* if not bound, then nothing to do! */
     if (it == NULL) return FALSE;
 
-    for (it = b->actions[a]; it; it = it->next)
-        action_run_mouse(it->data, c, state, button, x, y);
+    action_run_mouse(b->actions[a], c, context, state, button, x, y);
     return TRUE;
 }
 
@@ -159,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;
@@ -193,9 +210,10 @@ 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 */
             xerror_set_ignore(TRUE);
             junk1 = XGetGeometry(ob_display, e->xbutton.window,
                                  &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
@@ -277,8 +295,8 @@ void mouse_event(ObClient *client, XEvent *e)
     }
 }
 
-gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
-                    ObAction *action)
+gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
+                    ObMouseAction mact, ObAction *action)
 {
     guint state, button;
     ObFrameContext context;
@@ -329,5 +347,5 @@ void mouse_startup(gboolean reconfig)
 void mouse_shutdown(gboolean reconfig)
 {
     grab_all_clients(FALSE);
-    clearall();
+    mouse_unbind_all();
 }