X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=6ba52c8959f13d140fbea9a3f5f0e1a7ae3adb08;hb=aaba799e1d7d48f33de3eb7b8956f5572c013141;hp=de5f9a8a089682b0c96bd842f8766d840c444455;hpb=097d02d9d3d4b2eeea11084c54812de9cd7d14c0;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index de5f9a8a..6ba52c89 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -39,8 +39,11 @@
 
 #include <glib.h>
 
+static gulong ignore_start = 0;
+
 static void client_action_start(union ActionData *data)
 {
+    ignore_start = event_start_ignore_all_enters();
 }
 
 static void client_action_end(union ActionData *data, gboolean allow_enters)
@@ -48,7 +51,7 @@ static void client_action_end(union ActionData *data, gboolean allow_enters)
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
             if (!data->any.button && data->any.c && !allow_enters) {
-                event_ignore_all_queued_enters();
+                event_end_ignore_all_enters(ignore_start);
             } else {
                 ObClient *c;
 
@@ -57,8 +60,12 @@ static void client_action_end(union ActionData *data, gboolean allow_enters)
                    event will come as a GrabNotify which is ignored, so this
                    makes a fake enter event
                 */
-                if ((c = client_under_pointer()) && c != data->any.c)
+                if ((c = client_under_pointer()) && c != data->any.c) {
+                    ob_debug_type(OB_DEBUG_FOCUS,
+                                  "Generating fake enter because we did a "
+                                  "mouse-event action");
                     event_enter_client(c);
+                }
             }
         }
 }
@@ -1311,7 +1318,7 @@ void action_focus(union ActionData *data)
 void action_unfocus (union ActionData *data)
 {
     if (data->client.any.c == focus_client)
-        focus_fallback(FALSE, FALSE);
+        focus_fallback(FALSE, FALSE, TRUE);
 }
 
 void action_iconify(union ActionData *data)
@@ -1423,11 +1430,12 @@ void action_move_to_center(union ActionData *data)
 {
     ObClient *c = data->client.any.c;
     Rect *area;
-    area = screen_area_monitor(c->desktop, 0);
+    area = screen_area(c->desktop, client_monitor(c), NULL);
     client_action_start(data);
     client_move(c, area->width / 2 - c->area.width / 2,
                 area->height / 2 - c->area.height / 2);
     client_action_end(data, FALSE);
+    g_free(area);
 }
 
 void action_resize_relative_horz(union ActionData *data)
@@ -1463,21 +1471,30 @@ void action_move_relative(union ActionData *data)
 void action_resize_relative(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
-    gint x, y, ow, w, oh, h, lw, lh;
+    gint x, y, ow, xoff, nw, oh, yoff, nh, lw, lh;
 
     client_action_start(data);
 
     x = c->area.x;
     y = c->area.y;
     ow = c->area.width;
-    w = ow + data->relative.deltax * c->size_inc.width
+    xoff = -data->relative.deltaxl * c->size_inc.width;
+    nw = ow + data->relative.deltax * c->size_inc.width
         + data->relative.deltaxl * c->size_inc.width;
     oh = c->area.height;
-    h = oh + data->relative.deltay * c->size_inc.height
+    yoff = -data->relative.deltayu * c->size_inc.height;
+    nh = oh + data->relative.deltay * c->size_inc.height
         + data->relative.deltayu * c->size_inc.height;
+
+    g_print("deltax %d %d x %d ow %d xoff %d nw %d\n",
+            data->relative.deltax, 
+            data->relative.deltaxl, 
+            x, ow, xoff, nw);
     
-    client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);
-    client_move_resize(c, x + (ow - w), y + (oh - h), w, h);
+    client_try_configure(c, &x, &y, &nw, &nh, &lw, &lh, TRUE);
+    xoff = xoff == 0 ? 0 : (xoff < 0 ? MAX(xoff, ow-nw) : MIN(xoff, ow-nw));
+    yoff = yoff == 0 ? 0 : (yoff < 0 ? MAX(yoff, oh-nh) : MIN(yoff, oh-nh));
+    client_move_resize(c, x + xoff, y + yoff, nw, nh);
     client_action_end(data, FALSE);
 }
 
@@ -1881,7 +1898,7 @@ void action_growtoedge(union ActionData *data)
     ObClient *c = data->diraction.any.c;
     Rect *a;
 
-    a = screen_area(c->desktop);
+    a = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS, &c->frame->area);
     x = c->frame->area.x;
     y = c->frame->area.y;
     /* get the unshaded frame's dimensions..if it is shaded */
@@ -1940,6 +1957,7 @@ void action_growtoedge(union ActionData *data)
     client_action_start(data);
     client_move_resize(c, x, y, width, height);
     client_action_end(data, FALSE);
+    g_free(a);
 }
 
 void action_send_to_layer(union ActionData *data)