1) translate all of openbox's output

[chaz/openbox] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index eb206a11f732cac4478273661cb83b1b026e2ad8..27172d525c614c7933b297d1f9108e3947c7edd6 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mouse.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana 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
@@ -27,6 +28,8 @@
 #include "frame.h"
 #include "translate.h"
 #include "mouse.h"
+#include "gettext.h"
+
 #include <glib.h>
 
 typedef struct {
@@ -89,16 +92,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 +127,25 @@ static void grab_all_clients(gboolean grab)
 {
     GList *it;
 
-    for (it = client_list; it != NULL; it = it->next)
-       mouse_grab_for_client(it->data, grab);
+    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 +157,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, Time time)
 {
     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 +170,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, time);
     return TRUE;
 }
 
@@ -176,7 +179,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;
@@ -195,11 +198,12 @@ void mouse_event(ObClient *client, XEvent *e)
         fire_binding(OB_MOUSE_ACTION_PRESS, context,
                      client, e->xbutton.state,
                      e->xbutton.button,
-                     e->xbutton.x_root, e->xbutton.y_root);
+                     e->xbutton.x_root, e->xbutton.y_root,
+                     e->xbutton.time);
 
         if (CLIENT_CONTEXT(context, client)) {
             /* Replay the event, so it goes to the client*/
-            XAllowEvents(ob_display, ReplayPointer, event_lasttime);
+            XAllowEvents(ob_display, ReplayPointer, event_curtime);
             /* Fall through to the release case! */
         } else
             break;
@@ -210,9 +214,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);
@@ -247,19 +252,22 @@ void mouse_event(ObClient *client, XEvent *e)
         fire_binding(OB_MOUSE_ACTION_RELEASE, context,
                      client, e->xbutton.state,
                      e->xbutton.button,
-                     e->xbutton.x_root, e->xbutton.y_root);
+                     e->xbutton.x_root, e->xbutton.y_root,
+                     e->xbutton.time);
         if (click)
             fire_binding(OB_MOUSE_ACTION_CLICK, context,
                          client, e->xbutton.state,
                          e->xbutton.button,
                          e->xbutton.x_root,
-                         e->xbutton.y_root);
+                         e->xbutton.y_root,
+                         e->xbutton.time);
         if (dclick)
             fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
                          client, e->xbutton.state,
                          e->xbutton.button,
                          e->xbutton.x_root,
-                         e->xbutton.y_root);
+                         e->xbutton.y_root,
+                         e->xbutton.time);
         break;
 
     case MotionNotify:
@@ -282,7 +290,7 @@ void mouse_event(ObClient *client, XEvent *e)
                     break;
 
                 fire_binding(OB_MOUSE_ACTION_MOTION, context,
-                             client, state, button, px, py);
+                             client, state, button, px, py, e->xmotion.time);
                 button = 0;
                 state = 0;
             }
@@ -303,22 +311,22 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
     GSList *it;
 
     if (!translate_button(buttonstr, &state, &button)) {
-        g_warning("invalid button '%s'", buttonstr);
+        g_message(_("Invalid button '%s' in pointer binding"), buttonstr);
         return FALSE;
     }
 
     context = frame_context_from_string(contextstr);
     if (!context) {
-        g_warning("invalid context '%s'", contextstr);
+        g_message(_("Invalid context '%s' in pointer binding"), contextstr);
         return FALSE;
     }
 
-    for (it = bound_contexts[context]; it != NULL; it = it->next){
-       b = it->data;
-       if (b->state == state && b->button == button) {
+    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);
             return TRUE;
-       }
+        }
     }
 
     /* when there are no modifiers in the binding, then the action cannot