comment

[chaz/openbox] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 26aa85969d54fb09fb73a0126ef4d5a3db156a6d..c0fcade49556e090e62b0a9de9db1403376422dc 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"
@@ -46,6 +64,7 @@ ObFrameContext mouse_button_frame_context(ObFrameContext context,
     case OB_FRAME_CONTEXT_TITLEBAR:
     case OB_FRAME_CONTEXT_HANDLE:
     case OB_FRAME_CONTEXT_FRAME:
+    case OB_FRAME_CONTEXT_MOVE_RESIZE:
         break;
     case OB_FRAME_CONTEXT_BLCORNER:
     case OB_FRAME_CONTEXT_BRCORNER:
@@ -109,7 +128,7 @@ static void grab_all_clients(gboolean grab)
        mouse_grab_for_client(it->data, grab);
 }
 
-static void clearall()
+void mouse_unbind_all()
 {
     int i;
     GSList *it;
@@ -148,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, state, button, x, y);
     return TRUE;
 }
 
@@ -195,6 +213,7 @@ void mouse_event(ObClient *client, XEvent *e)
             int 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);
@@ -276,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;
@@ -289,14 +308,11 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
         return FALSE;
     }
 
-    contextstr = g_ascii_strdown(contextstr, -1);
     context = frame_context_from_string(contextstr);
     if (!context) {
         g_warning("invalid context '%s'", contextstr);
-        g_free(contextstr);
         return FALSE;
     }
-    g_free(contextstr);
 
     for (it = bound_contexts[context]; it != NULL; it = it->next){
        b = it->data;
@@ -331,5 +347,5 @@ void mouse_startup(gboolean reconfig)
 void mouse_shutdown(gboolean reconfig)
 {
     grab_all_clients(FALSE);
-    clearall();
+    mouse_unbind_all();
 }