add suppot for showing pixmap masks in menus where the rgba icons go too

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 14abd5cd14f4efb8bd7c9b2f1eee4074054ea2db..8f92f71f958f34af73564ba2a84e2edddbf5d502 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -4,7 +4,6 @@
 #include "prop.h"
 #include "client.h"
 #include "frame.h"
-#include "dispatch.h"
 #include "openbox.h"
 #include "resist.h"
 #include "popup.h"
@@ -31,6 +30,12 @@ static Popup *popup = NULL;
 #define POPUP_X (10)
 #define POPUP_Y (10)
 
+static void client_dest(ObClient *c)
+{
+    if (moveresize_client == c)
+        moveresize_end(TRUE);    
+}
+
 void moveresize_startup()
 {
     XSetWindowAttributes attrib;
@@ -39,10 +44,14 @@ void moveresize_startup()
     popup_size_to_string(popup, "W:  0000  W:  0000");
 
     attrib.save_under = True;
+
+    client_add_destructor(client_dest);
 }
 
 void moveresize_shutdown()
 {
+    client_remove_destructor(client_dest);
+
     popup_free(popup);
     popup = NULL;
 }
@@ -76,6 +85,14 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
     corner = cnr;
     button = b;
 
+    /*
+      have to change start_cx and start_cy if going to do this..
+    if (corner == prop_atoms.net_wm_moveresize_move_keyboard ||
+        corner == prop_atoms.net_wm_moveresize_size_keyboard)
+        XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
+                     c->area.width / 2, c->area.height / 2);
+    */
+
     if (corner == prop_atoms.net_wm_moveresize_move ||
         corner == prop_atoms.net_wm_moveresize_move_keyboard) {
         cur_x = start_cx;
@@ -149,8 +166,6 @@ static void do_move(gboolean resist)
     if (resist)
         resist_move(moveresize_client, &cur_x, &cur_y);
 
-    dispatch_move(moveresize_client, &cur_x, &cur_y);
-
     /* get where the client should be */
     frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
     client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
@@ -166,21 +181,20 @@ static void do_move(gboolean resist)
 
 static void do_resize(gboolean resist)
 {
-    /* dispatch_resize needs the frame size */
-    cur_x += moveresize_client->frame->size.left +
-        moveresize_client->frame->size.right;
-    cur_y += moveresize_client->frame->size.top +
-        moveresize_client->frame->size.bottom;
+    if (resist) {
+        /* resist_size needs the frame size */
+        cur_x += moveresize_client->frame->size.left +
+            moveresize_client->frame->size.right;
+        cur_y += moveresize_client->frame->size.top +
+            moveresize_client->frame->size.bottom;
 
-    if (resist)
         resist_size(moveresize_client, &cur_x, &cur_y, lockcorner);
 
-    dispatch_resize(moveresize_client, &cur_x, &cur_y, lockcorner);
-
-    cur_x -= moveresize_client->frame->size.left +
-        moveresize_client->frame->size.right;
-    cur_y -= moveresize_client->frame->size.top +
-        moveresize_client->frame->size.bottom;
+        cur_x -= moveresize_client->frame->size.left +
+            moveresize_client->frame->size.right;
+        cur_y -= moveresize_client->frame->size.top +
+            moveresize_client->frame->size.bottom;
+    }
     
     client_configure(moveresize_client, lockcorner, 
                      moveresize_client->area.x, moveresize_client->area.y,
@@ -262,28 +276,42 @@ void moveresize_event(XEvent *e)
             moveresize_end(FALSE);
         else {
             if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
+                int dx = 0, dy = 0;
+
                 if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
-                    cur_x += MAX(4, moveresize_client->size_inc.width);
+                    dx = MAX(4, moveresize_client->size_inc.width);
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
-                    cur_x -= MAX(4, moveresize_client->size_inc.width);
+                    dx = -MAX(4, moveresize_client->size_inc.width);
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
-                    cur_y += MAX(4, moveresize_client->size_inc.height);
+                    dy = MAX(4, moveresize_client->size_inc.height);
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
-                    cur_y -= MAX(4, moveresize_client->size_inc.height);
+                    dy = -MAX(4, moveresize_client->size_inc.height);
                 else
                     return;
+
+                cur_x += dx;
+                cur_y += dy;
+                XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
                 do_resize(FALSE);
             } else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
+                int dx = 0, dy = 0;
+
                 if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
-                    cur_x += 4;
+                    dx = 4;
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
-                    cur_x -= 4;
+                    dx = -4;
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
-                    cur_y += 4;
+                    dy = 4;
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
-                    cur_y -= 4;
+                    dy = -4;
                 else
                     return;
+
+                cur_x += dx;
+                cur_y += dy;
+                XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
                 do_move(FALSE);
             }
         }