Remove some evil tabs

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 3a98db37b8442849301e412f759a69f8d9e8f1fe..2d0dc3ac02a575bd447b2ff16d1581222e30eea2 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -582,19 +582,19 @@ static void edge_warp_move_ptr(void)
     a = screen_physical_area_all_monitors();
 
     switch (edge_warp_dir) {
-       case OB_DIRECTION_NORTH:
-           y = a->height - 1;
-           break;
-       case OB_DIRECTION_EAST:
-           x = a->x;
-           break;
-       case OB_DIRECTION_SOUTH:
-           y = a->y;
-           break;
-       case OB_DIRECTION_WEST:
-           x = a->width - 1;
-           break;
-       default:
+    case OB_DIRECTION_NORTH:
+        y = a->height - 1;
+        break;
+    case OB_DIRECTION_EAST:
+        x = a->x;
+        break;
+    case OB_DIRECTION_SOUTH:
+        y = a->y;
+        break;
+    case OB_DIRECTION_WEST:
+        x = a->width - 1;
+        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;