X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=26aa85969d54fb09fb73a0126ef4d5a3db156a6d;hb=3a607fad9df628ab16e0f7436dfbfc9b22634003;hp=bb7689281f06c60129be6e430ad0dc4385d041bd;hpb=1045079482453424f8320de99639390e3020eb72;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index bb768928..26aa8596 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "config.h"
+#include "xerror.h"
 #include "action.h"
 #include "event.h"
 #include "client.h"
@@ -8,36 +9,83 @@
 #include "frame.h"
 #include "translate.h"
 #include "mouse.h"
-#include "keyboard.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;
 
-/* Array of GSList*s of PointerBinding*s. */
+#define FRAME_CONTEXT(co, cl) ((cl && cl->type != OB_CLIENT_TYPE_DESKTOP) ? \
+                               co == OB_FRAME_CONTEXT_FRAME : FALSE)
+#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
+                                co == OB_FRAME_CONTEXT_DESKTOP : \
+                                co == OB_FRAME_CONTEXT_CLIENT)
+
+/* Array of GSList*s of ObMouseBinding*s. */
 static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];
 
+ObFrameContext mouse_button_frame_context(ObFrameContext context,
+                                          guint button)
+{
+    GSList *it;
+    ObFrameContext x = context;
+
+    for (it = bound_contexts[context]; it; it = g_slist_next(it)) {
+        ObMouseBinding *b = it->data;
+
+        if (b->button == button)
+            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_HANDLE:
+    case OB_FRAME_CONTEXT_FRAME:
+        break;
+    case OB_FRAME_CONTEXT_BLCORNER:
+    case OB_FRAME_CONTEXT_BRCORNER:
+        x = OB_FRAME_CONTEXT_HANDLE;
+        break;
+    case OB_FRAME_CONTEXT_TLCORNER:
+    case OB_FRAME_CONTEXT_TRCORNER:
+    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();
+    }
+
+    return x;
+}
+
 void mouse_grab_for_client(ObClient *client, gboolean grab)
 {
     int 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 != NULL; it = g_slist_next(it)) {
             /* grab/ungrab the button */
             ObMouseBinding *b = it->data;
             Window win;
             int mode;
             unsigned int mask;
 
-            if (i == OB_FRAME_CONTEXT_FRAME) {
+            if (FRAME_CONTEXT(i, client)) {
                 win = client->frame->window;
                 mode = GrabModeAsync;
                 mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
-            } else if (i == OB_FRAME_CONTEXT_CLIENT) {
+            } else if (CLIENT_CONTEXT(i, client)) {
                 win = client->frame->plate;
                 mode = GrabModeSync; /* this is handled in event */
                 mask = ButtonPressMask; /* can't catch more than this with Sync
@@ -46,7 +94,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);
         }
@@ -67,25 +116,26 @@ static void clearall()
     
     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;
 
-            ObMouseBinding *b = it->data;
-            for (j = 0; j < OB_MOUSE_NUM_ACTIONS; ++j) {
+            for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
                 GSList *it;
-                for (it = b->actions[j]; it; it = it->next) {
+
+                for (it = b->actions[j]; it; it = it->next)
                     action_free(it->data);
-                }
                 g_slist_free(b->actions[j]);
             }
             g_free(b);
         }
         g_slist_free(bound_contexts[i]);
+        bound_contexts[i] = NULL;
     }
 }
 
-static gboolean fire_button(ObMouseAction a, ObFrameContext context,
-                            ObClient *c, guint state,
-                            guint button, int x, int y)
+static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
+                             ObClient *c, guint state,
+                             guint button, int x, int y)
 {
     GSList *it;
     ObMouseBinding *b;
@@ -98,120 +148,38 @@ static gboolean fire_button(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) {
-        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->func == action_desktop_dir)
-            {
-                act->data.desktopdir.final = FALSE;
-                act->data.desktopdir.cancel = FALSE;
-            }
-            if (act->func == action_send_to_desktop_dir)
-            {
-                act->data.sendtodir.final = FALSE;
-                act->data.sendtodir.cancel = FALSE;
-            }
-
-            if (config_desktop_popup &&
-                (act->func == action_desktop_dir ||
-                 act->func == action_send_to_desktop_dir))
-            {
-                keyboard_interactive_grab(state, c, context, act);
-            }
-
-            act->func(&act->data);
-        }
-    }
-    return TRUE;
-}
-
-static gboolean fire_motion(ObMouseAction a, ObFrameContext context,
-                            ObClient *c, guint state, guint button,
-                            int x_root, int y_root, guint32 corner)
-{
-    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;
-
-            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);
-        }
-    }
+    for (it = b->actions[a]; it; it = it->next)
+        action_run_mouse(it->data, c, state, button, x, y);
     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;
+
+    ObFrameContext context;
     gboolean click = FALSE;
     gboolean dclick = FALSE;
-    
+
     switch (e->type) {
     case ButtonPress:
+        context = frame_context(client, e->xany.window);
+        context = mouse_button_frame_context(context, e->xbutton.button);
+
         px = e->xbutton.x_root;
         py = e->xbutton.y_root;
         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 (context == OB_FRAME_CONTEXT_CLIENT) {
+        if (CLIENT_CONTEXT(context, client)) {
             /* Replay the event, so it goes to the client*/
             XAllowEvents(ob_display, ReplayPointer, event_lasttime);
             /* Fall through to the release case! */
@@ -219,63 +187,72 @@ void mouse_event(ObClient *client, ObFrameContext context, XEvent *e)
             break;
 
     case ButtonRelease:
+        context = frame_context(client, e->xany.window);
+        context = mouse_button_frame_context(context, e->xbutton.button);
+
         if (e->xbutton.button == button) {
             /* clicks are only valid if its released over the window */
             int junk1, junk2;
             Window wjunk;
             guint ujunk, b, w, h;
-            XGetGeometry(ob_display, e->xbutton.window,
-                         &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
-            if (e->xbutton.x >= (signed)-b &&
-                e->xbutton.y >= (signed)-b &&
-                e->xbutton.x < (signed)(w+b) &&
-                e->xbutton.y < (signed)(h+b)) {
-                click = TRUE;
-                /* double clicks happen if there were 2 in a row! */
-                if (lbutton == button &&
-                    lwindow == e->xbutton.window &&
-                    e->xbutton.time - config_mouse_dclicktime <=
-                    ltime) {
-                    dclick = TRUE;
-                    lbutton = 0;
+            xerror_set_ignore(TRUE);
+            junk1 = XGetGeometry(ob_display, e->xbutton.window,
+                                 &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
+            xerror_set_ignore(FALSE);
+            if (junk1) {
+                if (e->xbutton.x >= (signed)-b &&
+                    e->xbutton.y >= (signed)-b &&
+                    e->xbutton.x < (signed)(w+b) &&
+                    e->xbutton.y < (signed)(h+b)) {
+                    click = TRUE;
+                    /* double clicks happen if there were 2 in a row! */
+                    if (lbutton == button &&
+                        lwindow == e->xbutton.window &&
+                        e->xbutton.time - config_mouse_dclicktime <=
+                        ltime) {
+                        dclick = TRUE;
+                        lbutton = 0;
+                    } else {
+                        lbutton = button;
+                        lwindow = e->xbutton.window;
+                    }
                 } else {
-                    lbutton = button;
-                    lwindow = e->xbutton.window;
+                    lbutton = 0;
+                    lwindow = None;
                 }
-            } else {
-                lbutton = 0;
-                lwindow = None;
             }
 
             button = 0;
             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) {
+            context = frame_context(client, e->xany.window);
+            context = mouse_button_frame_context(context, button);
+
             if (ABS(e->xmotion.x_root - px) >=
                 config_mouse_threshold ||
                 ABS(e->xmotion.y_root - py) >=
                 config_mouse_threshold) {
-                guint32 corner;
 
                 /* You can't drag on buttons */
                 if (context == OB_FRAME_CONTEXT_MAXIMIZE ||
@@ -286,26 +263,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;
             }
@@ -347,7 +306,12 @@ gboolean mouse_bind(char *buttonstr, char *contextstr, ObMouseAction mact,
 	}
     }
 
-    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 */
     b = g_new0(ObMouseBinding, 1);
@@ -356,16 +320,15 @@ 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()
+void mouse_startup(gboolean reconfig)
 {
+    grab_all_clients(TRUE);
 }
 
-void mouse_shutdown()
+void mouse_shutdown(gboolean reconfig)
 {
     grab_all_clients(FALSE);
     clearall();