X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=dca6e6baf6604c9ead3dd2e577a4b04b638b6f5f;hb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;hp=91b98c6ac573657e15667af2fa0546b310dd25ce;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 91b98c6a..dca6e6ba 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -1,21 +1,40 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   mouse.c for the Openbox window manager
+   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
+   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"
-#include "action.h"
+#include "actions.h"
 #include "event.h"
 #include "client.h"
-#include "prop.h"
 #include "grab.h"
 #include "frame.h"
 #include "translate.h"
 #include "mouse.h"
-#include "keyboard.h"
+#include "gettext.h"
+#include "obt/display.h"
+
 #include <glib.h>
 
 typedef struct {
     guint state;
     guint button;
-    GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */
+    GSList *actions[OB_NUM_MOUSE_ACTIONS]; /* lists of Action pointers */
 } ObMouseBinding;
 
 #define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \
@@ -24,28 +43,82 @@ typedef struct {
                                 co == OB_FRAME_CONTEXT_DESKTOP : \
                                 co == OB_FRAME_CONTEXT_CLIENT)
 
-/* Array of GSList*s of PointerBinding*s. */
+/* Array of GSList*s of ObMouseBinding*s. */
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
 
+ObFrameContext mouse_button_frame_context(ObFrameContext context,
+                                          guint button,
+                                          guint state)
+{
+    GSList *it;
+    ObFrameContext x = context;
+
+    for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
+        ObMouseBinding *b = it->data;
+
+        if (b->button == button && b->state == state)
+            return context;
+    }
+
+    switch (context) {
+    case OB_FRAME_CONTEXT_NONE:
+    case OB_FRAME_CONTEXT_DESKTOP:
+    case OB_FRAME_CONTEXT_CLIENT:
+    case OB_FRAME_CONTEXT_TITLEBAR:
+    case OB_FRAME_CONTEXT_FRAME:
+    case OB_FRAME_CONTEXT_MOVE_RESIZE:
+    case OB_FRAME_CONTEXT_LEFT:
+    case OB_FRAME_CONTEXT_RIGHT:
+        break;
+    case OB_FRAME_CONTEXT_ROOT:
+        x = OB_FRAME_CONTEXT_DESKTOP;
+        break;
+    case OB_FRAME_CONTEXT_BOTTOM:
+    case OB_FRAME_CONTEXT_BLCORNER:
+    case OB_FRAME_CONTEXT_BRCORNER:
+        x = OB_FRAME_CONTEXT_BOTTOM;
+        break;
+    case OB_FRAME_CONTEXT_TLCORNER:
+    case OB_FRAME_CONTEXT_TRCORNER:
+    case OB_FRAME_CONTEXT_TOP:
+    case OB_FRAME_CONTEXT_MAXIMIZE:
+    case OB_FRAME_CONTEXT_ALLDESKTOPS:
+    case OB_FRAME_CONTEXT_SHADE:
+    case OB_FRAME_CONTEXT_ICONIFY:
+    case OB_FRAME_CONTEXT_ICON:
+    case OB_FRAME_CONTEXT_CLOSE:
+        x = OB_FRAME_CONTEXT_TITLEBAR;
+        break;
+    case OB_FRAME_NUM_CONTEXTS:
+        g_assert_not_reached();
+    }
+
+    /* allow for multiple levels of fall-through */
+    if (x != context)
+        return mouse_button_frame_context(x, button, state);
+    else
+        return x;
+}
+
 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 = it->next) {
+        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;
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
             } else if (CLIENT_CONTEXT(i, client)) {
-                win = client->frame->plate;
+                win = client->window;
                 mode = GrabModeSync; /* this is handled in event */
                 mask = ButtonPressMask; /* can't catch more than this with Sync
                                            mode the release event is
@@ -53,7 +126,8 @@ void mouse_grab_for_client(ObClient *client, gboolean grab)
             } else continue;
 
             if (grab)
-                grab_button_full(b->button, b->state, win, mask, mode, None);
+                grab_button_full(b->button, b->state, win, mask, mode,
+                                 OB_CURSOR_NONE);
             else
                 ungrab_button(b->button, b->state, win);
         }
@@ -63,25 +137,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);
 }
 
-static void clearall()
+void mouse_unbind_all(void)
 {
-    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) {
-            int j;
 
+    for(i = 0; i < OB_FRAME_NUM_CONTEXTS; ++i) {
+        for (it = bound_contexts[i]; it; it = g_slist_next(it)) {
             ObMouseBinding *b = it->data;
-            for (j = 0; j < OB_MOUSE_NUM_ACTIONS; ++j) {
-                GSList *it;
-                for (it = b->actions[j]; it; it = it->next) {
-                    action_free(it->data);
-                }
+            gint j;
+
+            for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
+                GSList *jt;
+
+                for (jt = b->actions[j]; jt; jt = g_slist_next(jt))
+                    actions_act_unref(jt->data);
                 g_slist_free(b->actions[j]);
             }
             g_free(b);
@@ -91,139 +165,101 @@ static void clearall()
     }
 }
 
-static gboolean fire_button(ObMouseAction a, ObFrameContext context,
-                            ObClient *c, guint state,
-                            guint button, int x, int y)
+static ObUserAction mouse_action_to_user_action(ObMouseAction a)
 {
-    GSList *it;
-    ObMouseBinding *b;
-
-    for (it = bound_contexts[context]; it != NULL; it = it->next) {
-        b = it->data;
-        if (b->state == state && b->button == button)
-            break;
-    }
-    /* if not bound, then nothing to do! */
-    if (it == NULL) return FALSE;
-
-    for (it = b->actions[a]; it; it = it->next) {
-        ObAction *act = it->data;
-        if (act->func != NULL) {
-            act->data.any.c = c;
-
-            g_assert(act->func != action_moveresize);
-
-            if (act->func == action_showmenu) {
-                act->data.showmenu.x = x;
-                act->data.showmenu.y = y;
-            }
-
-            if (act->data.any.interactive) {
-                act->data.inter.cancel = FALSE;
-                act->data.inter.final = FALSE;
-                keyboard_interactive_grab(state, c, context, act);
-            }
-
-            act->func(&act->data);
-        }
+    switch (a) {
+    case OB_MOUSE_ACTION_PRESS: return OB_USER_ACTION_MOUSE_PRESS;
+    case OB_MOUSE_ACTION_RELEASE: return OB_USER_ACTION_MOUSE_RELEASE;
+    case OB_MOUSE_ACTION_CLICK: return OB_USER_ACTION_MOUSE_CLICK;
+    case OB_MOUSE_ACTION_DOUBLE_CLICK:
+        return OB_USER_ACTION_MOUSE_DOUBLE_CLICK;
+    case OB_MOUSE_ACTION_MOTION: return OB_USER_ACTION_MOUSE_MOTION;
+    default:
+        g_assert_not_reached();
     }
-    return TRUE;
 }
 
-static gboolean fire_motion(ObMouseAction a, ObFrameContext context,
-                            ObClient *c, guint state, guint button,
-                            int x_root, int y_root, guint32 corner)
+static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
+                             ObClient *c, guint state,
+                             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;
+            break;
     }
     /* if not bound, then nothing to do! */
     if (it == NULL) return FALSE;
 
-    for (it = b->actions[a]; it; it = it->next) {
-        ObAction *act = it->data;
-        if (act->func != NULL) {
-            act->data.any.c = c;
-
-            if (act->func == action_moveresize) {
-                act->data.moveresize.x = x_root;
-                act->data.moveresize.y = y_root;
-                act->data.moveresize.button = button;
-                if (!(act->data.moveresize.corner ==
-                      prop_atoms.net_wm_moveresize_move ||
-                      act->data.moveresize.corner ==
-                      prop_atoms.net_wm_moveresize_move_keyboard ||
-                      act->data.moveresize.corner ==
-                      prop_atoms.net_wm_moveresize_size_keyboard))
-                    act->data.moveresize.corner = corner;
-            } else
-                g_assert_not_reached();
-
-            act->func(&act->data);
-        }
-    }
+    actions_run_acts(b->actions[a], mouse_action_to_user_action(a),
+                     state, x, y, button, context, c);
     return TRUE;
 }
 
-static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
-{
-    if (x - cx < cw / 2) {
-        if (y - cy < ch / 2)
-            return prop_atoms.net_wm_moveresize_size_topleft;
-        else
-            return prop_atoms.net_wm_moveresize_size_bottomleft;
-    } else {
-        if (y - cy < ch / 2)
-            return prop_atoms.net_wm_moveresize_size_topright;
-        else
-            return prop_atoms.net_wm_moveresize_size_bottomright;
-    }
-}
-
-void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
+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, pwx = -1, pwy = -1;
+
+    ObFrameContext context;
     gboolean click = FALSE;
     gboolean dclick = FALSE;
 
     switch (e->type) {
     case ButtonPress:
+        context = frame_context(client, e->xbutton.window,
+                                e->xbutton.x, e->xbutton.y);
+        context = mouse_button_frame_context(context, e->xbutton.button,
+                                             e->xbutton.state);
+
         px = e->xbutton.x_root;
         py = e->xbutton.y_root;
+        if (!button) pwx = e->xbutton.x;
+        if (!button) pwy = e->xbutton.y;
         button = e->xbutton.button;
         state = e->xbutton.state;
 
-        fire_button(OB_MOUSE_ACTION_PRESS, context,
-                    client, e->xbutton.state,
-                    e->xbutton.button,
-                    e->xbutton.x_root, e->xbutton.y_root);
+        fire_binding(OB_MOUSE_ACTION_PRESS, context,
+                     client, e->xbutton.state,
+                     e->xbutton.button,
+                     e->xbutton.x_root, e->xbutton.y_root);
+
+        /* if the bindings grab the pointer, there won't be a ButtonRelease
+           event for us */
+        if (grab_on_pointer())
+            button = 0;
 
         if (CLIENT_CONTEXT(context, client)) {
             /* Replay the event, so it goes to the client*/
-            XAllowEvents(ob_display, ReplayPointer, event_lasttime);
+            XAllowEvents(obt_display, ReplayPointer, event_curtime);
             /* Fall through to the release case! */
         } else
             break;
 
     case ButtonRelease:
+        /* use where the press occured in the window */
+        context = frame_context(client, e->xbutton.window, pwx, pwy);
+        context = mouse_button_frame_context(context, e->xbutton.button,
+                                             e->xbutton.state);
+
+        if (e->xbutton.button == button)
+            pwx = pwy = -1;
+
         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;
-            xerror_set_ignore(TRUE);
-            junk1 = XGetGeometry(ob_display, e->xbutton.window,
+            /* this can cause errors to occur when the window closes */
+            obt_display_ignore_errors(TRUE);
+            junk1 = XGetGeometry(obt_display, e->xbutton.window,
                                  &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
-            xerror_set_ignore(FALSE);
+            obt_display_ignore_errors(FALSE);
             if (junk1) {
                 if (e->xbutton.x >= (signed)-b &&
                     e->xbutton.y >= (signed)-b &&
@@ -251,31 +287,32 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
             state = 0;
             ltime = e->xbutton.time;
         }
-        fire_button(OB_MOUSE_ACTION_RELEASE, context,
-                    client, e->xbutton.state,
-                    e->xbutton.button,
-                    e->xbutton.x_root, e->xbutton.y_root);
+        fire_binding(OB_MOUSE_ACTION_RELEASE, context,
+                     client, e->xbutton.state,
+                     e->xbutton.button,
+                     e->xbutton.x_root,
+                     e->xbutton.y_root);
         if (click)
-            fire_button(OB_MOUSE_ACTION_CLICK, context,
-                        client, e->xbutton.state,
-                        e->xbutton.button,
-                        e->xbutton.x_root,
-                        e->xbutton.y_root);
+            fire_binding(OB_MOUSE_ACTION_CLICK, context,
+                         client, e->xbutton.state,
+                         e->xbutton.button,
+                         e->xbutton.x_root,
+                         e->xbutton.y_root);
         if (dclick)
-            fire_button(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
-                        client, e->xbutton.state,
-                        e->xbutton.button,
-                        e->xbutton.x_root,
-                        e->xbutton.y_root);
+            fire_binding(OB_MOUSE_ACTION_DOUBLE_CLICK, context,
+                         client, e->xbutton.state,
+                         e->xbutton.button,
+                         e->xbutton.x_root,
+                         e->xbutton.y_root);
         break;
 
     case MotionNotify:
         if (button) {
-            if (ABS(e->xmotion.x_root - px) >=
-                config_mouse_threshold ||
-                ABS(e->xmotion.y_root - py) >=
-                config_mouse_threshold) {
-                guint32 corner;
+            context = frame_context(client, e->xmotion.window, pwx, pwy);
+            context = mouse_button_frame_context(context, button, state);
+
+            if (ABS(e->xmotion.x_root - px) >= config_mouse_threshold ||
+                ABS(e->xmotion.y_root - py) >= config_mouse_threshold) {
 
                 /* You can't drag on buttons */
                 if (context == OB_FRAME_CONTEXT_MAXIMIZE ||
@@ -286,26 +323,8 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
                     context == OB_FRAME_CONTEXT_CLOSE)
                     break;
 
-                if (!client)
-                    corner = prop_atoms.net_wm_moveresize_size_bottomright;
-                else
-                    corner =
-                        pick_corner(e->xmotion.x_root,
-                                    e->xmotion.y_root,
-                                    client->frame->area.x,
-                                    client->frame->area.y,
-                                    /* use the client size because the frame
-                                       can be differently sized (shaded
-                                       windows) and we want this based on the
-                                       clients size */
-                                    client->area.width +
-                                    client->frame->size.left +
-                                    client->frame->size.right,
-                                    client->area.height +
-                                    client->frame->size.top +
-                                    client->frame->size.bottom);
-                fire_motion(OB_MOUSE_ACTION_MOTION, context,
-                            client, state, button, px, py, corner);
+                fire_binding(OB_MOUSE_ACTION_MOTION, context,
+                             client, state, button, px, py);
                 button = 0;
                 state = 0;
             }
@@ -317,8 +336,8 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
     }
 }
 
-gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
-                    ObAction *action)
+gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
+                    ObMouseAction mact, ObActionsAct *action)
 {
     guint state, button;
     ObFrameContext context;
@@ -326,34 +345,22 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
     GSList *it;
 
     if (!translate_button(buttonstr, &state, &button)) {
-        g_warning("invalid button '%s'", buttonstr);
+        g_message(_("Invalid button '%s' in mouse binding"), buttonstr);
         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);
+        g_message(_("Invalid context '%s' in mouse binding"), contextstr);
         return FALSE;
     }
-    g_free(contextstr);
 
-    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;
-	}
-    }
-
-    grab_all_clients(FALSE);
-
-    /* when there are no modifiers in the binding, then the action cannot
-       be interactive */
-    if (!state && action->data.any.interactive) {
-        action->data.any.interactive = FALSE;
-        action->data.inter.final = TRUE;
+        }
     }
 
     /* add the binding */
@@ -363,17 +370,16 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
     b->actions[mact] = g_slist_append(NULL, action);
     bound_contexts[context] = g_slist_append(bound_contexts[context], b);
 
-    grab_all_clients(TRUE);
-
     return TRUE;
 }
 
 void mouse_startup(gboolean reconfig)
 {
+    grab_all_clients(TRUE);
 }
 
 void mouse_shutdown(gboolean reconfig)
 {
     grab_all_clients(FALSE);
-    clearall();
+    mouse_unbind_all();
 }