new method for loading menu files etc

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 564bf7117513cb71ed148192e278586ea248b2a9..981a9df25dc30fd73afb4f2919c1776d4756cfec 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -6,6 +6,7 @@
 #include "frame.h"
 #include "dispatch.h"
 #include "openbox.h"
+#include "resist.h"
 #include "popup.h"
 #include "config.h"
 #include "render/render.h"
@@ -72,12 +73,16 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
     start_ch = c->area.height;
     start_x = x;
     start_y = y;
+    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)
-        button = 0; /* mouse can't end it without being pressed first */
-    else
-        button = b;
-    corner = cnr;
+        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) {
@@ -145,10 +150,13 @@ void moveresize_end(gboolean cancel)
     moveresize_client = NULL;
 }
 
-static void do_move()
+static void do_move(gboolean resist)
 {
     Rect *a;
 
+    if (resist)
+        resist_move(moveresize_client, &cur_x, &cur_y);
+
     dispatch_move(moveresize_client, &cur_x, &cur_y);
 
     /* get where the client should be */
@@ -164,7 +172,7 @@ static void do_move()
                  moveresize_client->frame->area.y - a->y);
 }
 
-static void do_resize()
+static void do_resize(gboolean resist)
 {
     /* dispatch_resize needs the frame size */
     cur_x += moveresize_client->frame->size.left +
@@ -172,6 +180,9 @@ static void do_resize()
     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 +
@@ -207,7 +218,7 @@ void moveresize_event(XEvent *e)
         if (moving) {
             cur_x = start_cx + e->xmotion.x_root - start_x;
             cur_y = start_cy + e->xmotion.y_root - start_y;
-            do_move();
+            do_move(TRUE);
         } else {
             if (corner == prop_atoms.net_wm_moveresize_size_topleft) {
                 cur_x = start_cw - (e->xmotion.x_root - start_x);
@@ -250,7 +261,7 @@ void moveresize_event(XEvent *e)
             } else
                 g_assert_not_reached();
 
-            do_resize();
+            do_resize(TRUE);
         }
     } else if (e->type == KeyPress) {
         if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
@@ -259,29 +270,43 @@ 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;
-                do_resize();
+
+                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;
-                do_move();
+
+                cur_x += dx;
+                cur_y += dy;
+                XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
+                do_move(FALSE);
             }
         }
     }