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

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 3a98db37..ffed9093 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -583,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();
@@ -630,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;