expose focus_cycle_client

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index ee6e000f51f2a56ce101a9174855a6d09e990d1a..0abb8e8d5a8d53fbda25ec1122653b464bfabc28 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -28,44 +28,39 @@ static ObCorner lockcorner;
 
 static Popup *popup = NULL;
 
-#define POPUP_X (10)
-#define POPUP_Y (10)
-
-static void client_dest(ObClient *c)
+static void client_dest(gpointer client)
 {
-    if (moveresize_client == c)
+    if (moveresize_client == client)
         moveresize_end(TRUE);    
 }
 
-void moveresize_startup()
+void moveresize_startup(gboolean reconfig)
 {
-    XSetWindowAttributes attrib;
-
     popup = popup_new(FALSE);
-    popup_size_to_string(popup, "W:  0000  W:  0000");
-
-    attrib.save_under = True;
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void moveresize_shutdown()
+void moveresize_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     popup_free(popup);
     popup = NULL;
 }
 
-static void popup_coords(char *format, int a, int b)
+static void popup_coords(ObClient *c, char *format, int a, int b)
 {
     char *text;
-    Rect *area;
 
     text = g_strdup_printf(format, a, b);
-    area = screen_physical_area_monitor(0);
-    popup_position(popup, NorthWestGravity,
-                   POPUP_X + area->x, POPUP_Y + area->y);
+    popup_position(popup, CenterGravity,
+                   c->frame->area.x + c->frame->size.left +
+                   c->area.width / 2,
+                   c->frame->area.y + c->frame->size.top +
+                   c->area.height / 2);
     popup_show(popup, text, NULL);
     g_free(text);
 }
@@ -76,6 +71,9 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 
     g_assert(!moveresize_in_progress);
 
+    if (!c->frame->visible)
+        return;
+
     moveresize_client = c;
     start_cx = c->frame->area.x;
     start_cy = c->frame->area.y;
@@ -84,8 +82,8 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
        increment instead of at 0, so you have to move half an increment
        either way instead of a full increment one and 1 px the other. and this
        is one large mother fucking comment. */
-    start_cw = c->area.width + (c->size_inc.width + 1) / 2;
-    start_ch = c->area.height + (c->size_inc.height + 1) / 2;
+    start_cw = c->area.width + c->size_inc.width / 2;
+    start_ch = c->area.height + c->size_inc.height / 2;
     start_x = x;
     start_y = y;
     corner = cnr;
@@ -144,7 +142,7 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 void moveresize_end(gboolean cancel)
 {
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);
 
@@ -166,24 +164,14 @@ void moveresize_end(gboolean cancel)
 
 static void do_move(gboolean resist)
 {
-    Rect *a;
-
     if (resist)
         resist_move_windows(moveresize_client, &cur_x, &cur_y);
     resist_move_monitors(moveresize_client, &cur_x, &cur_y);
 
     /* get where the client should be */
     frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
-    g_message("%d %d", cur_x, cur_y);
     client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
                      start_cw, start_ch, TRUE, FALSE);
-
-    /* this would be better with a fixed width font ... XXX can do it better
-       if there are 2 text boxes */
-    a = screen_area(screen_desktop);
-    popup_coords("X:  %4d  Y:  %4d",
-                 moveresize_client->frame->area.x - a->x,
-                 moveresize_client->frame->area.y - a->y);
 }
 
 static void do_resize(gboolean resist)
@@ -209,8 +197,11 @@ static void do_resize(gboolean resist)
 
     /* this would be better with a fixed width font ... XXX can do it better
        if there are 2 text boxes */
-    popup_coords("W:  %4d  H:  %4d", moveresize_client->logical_size.width,
-                 moveresize_client->logical_size.height);
+    if (moveresize_client->size_inc.width > 1 ||
+        moveresize_client->size_inc.height > 1)
+        popup_coords(moveresize_client, "%d x %d",
+                     moveresize_client->logical_size.width,
+                     moveresize_client->logical_size.height);
 }
 
 void moveresize_event(XEvent *e)
@@ -229,7 +220,6 @@ void moveresize_event(XEvent *e)
         }
     } else if (e->type == MotionNotify) {
         if (moving) {
-            g_message("root %d start %d", e->xmotion.x_root, start_x);
             cur_x = start_cx + e->xmotion.x_root - start_x;
             cur_y = start_cy + e->xmotion.y_root - start_y;
             do_move(TRUE);
@@ -317,6 +307,7 @@ void moveresize_event(XEvent *e)
                 start_y += dy - (cur_y - oy);
             } else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
                 int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+                int opx, px, opy, py;
 
                 if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
                     dx = 4;
@@ -331,6 +322,7 @@ void moveresize_event(XEvent *e)
 
                 cur_x += dx;
                 cur_y += dy;
+                screen_pointer_pos(&opx, &opy);
                 XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
                 /* steal the motion events this causes */
                 XSync(ob_display, FALSE);
@@ -338,6 +330,7 @@ void moveresize_event(XEvent *e)
                     XEvent ce;
                     while (XCheckTypedEvent(ob_display, MotionNotify, &ce));
                 }
+                screen_pointer_pos(&px, &py);
 
                 do_move(FALSE);
 
@@ -345,8 +338,8 @@ void moveresize_event(XEvent *e)
                    not nessesarily (resistance), this adjusts where the curor
                    thinks it started so that it keeps up with where the window
                    actually is */
-                start_x += dx - (cur_x - ox);
-                start_y += dy - (cur_y - oy);
+                start_x += (px - opx) - (cur_x - ox);
+                start_y += (py - opy) - (cur_y - oy);
             }
         }
     }