Merge branch 'master' into chaz

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 2d0dc3ac02a575bd447b2ff16d1581222e30eea2..a8965570b10c22de31cb0b9269ae4bcf1ff0c022 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -83,6 +83,8 @@ static void client_dest(ObClient *client, gpointer data)
 {
     if (moveresize_client == client)
         moveresize_end(TRUE);
+    if (popup && client == popup->client)
+        popup->client = NULL;
 }
 
 void moveresize_startup(gboolean reconfig)
@@ -167,6 +169,7 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 
         popup_position(popup, gravity, x, y);
     }
+    popup->client = c;
     popup_show(popup, text);
     g_free(text);
 }
@@ -312,6 +315,7 @@ void moveresize_end(gboolean cancel)
     ungrab_pointer();
 
     popup_hide(popup);
+    popup->client = NULL;
 
     if (!moving) {
 #ifdef SYNC
@@ -583,16 +587,16 @@ static void edge_warp_move_ptr(void)
 
     switch (edge_warp_dir) {
     case OB_DIRECTION_NORTH:
-        y = a->height - 1;
+        y = a->height - 2;
         break;
     case OB_DIRECTION_EAST:
-        x = a->x;
+        x = a->x + 1;
         break;
     case OB_DIRECTION_SOUTH:
-        y = a->y;
+        y = a->y + 1;
         break;
     case OB_DIRECTION_WEST:
-        x = a->width - 1;
+        x = a->width - 2;
         break;
     default:
         g_assert_not_reached();