X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=ffed909315037ae4b6882f92b391dbc3b0dc8a7d;hp=b0543f4a56dbae37baa52a935b906dd161ffef9c;hb=9325c92056ff4268db2263cdf8c07bb529e158aa;hpb=a8843b58c59f7042aa78289c3fc323793e16100f

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index b0543f4a..ffed9093 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -64,8 +64,8 @@ static ObDirection edge_warp_dir = -1;
 static gboolean edge_warp_odd = FALSE;
 static guint edge_warp_timer = 0;
 static ObDirection key_resize_edge = -1;
-#ifdef SYNC
 static guint waiting_for_sync;
+#ifdef SYNC
 static guint sync_timer = 0;
 #endif
 
@@ -263,6 +263,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     cur_h = start_ch;
 
     moveresize_in_progress = TRUE;
+    waiting_for_sync = 0;
 
 #ifdef SYNC
     if (config_resize_redraw && !moving && obt_display_extension_sync &&
@@ -301,8 +302,6 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
                                             XSyncCADelta |
                                             XSyncCAEvents,
                                             &aa);
-
-        waiting_for_sync = 0;
     }
 #endif
 }
@@ -584,16 +583,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();
@@ -631,6 +630,10 @@ static void do_edge_warp(gint x, gint y)
 
     for (i = 0; i < screen_num_monitors; ++i) {
         const Rect *a = screen_physical_area_monitor(i);
+
+        if (!RECT_CONTAINS(*a, x, y))
+            continue;
+
         if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST;
         if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST;
         if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH;