From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Thu, 14 Aug 2014 18:39:50 +0000 (-0600)
Subject: Merge branch 'master' into chaz
X-Git-Url: https://git.brokenzipper.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=d67b818ae90c5574166d08422d3e9a68d8d65e16

Merge branch 'master' into chaz

Conflicts:
	openbox/moveresize.c
---

d67b818ae90c5574166d08422d3e9a68d8d65e16
diff --cc openbox/moveresize.c
index ffed9093,333a1bea..a8965570
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@@ -582,19 -586,19 +586,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 - 2;
- 	    break;
- 	case OB_DIRECTION_EAST:
- 	    x = a->x + 1;
- 	    break;
- 	case OB_DIRECTION_SOUTH:
- 	    y = a->y + 1;
- 	    break;
- 	case OB_DIRECTION_WEST:
- 	    x = a->width - 2;
- 	    break;
- 	default:
+     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();
      }