Mechanical change from xinerama to region backed areas.

1 files changed, 6 insertions, 9 deletions

diff --git a/screen.c b/screen.c
index 9f05194..04d42ac 100644
--- a/screen.c
+++ b/screen.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: screen.c,v 1.73 2015/06/26 16:11:21 okan Exp $
+ * $OpenBSD: screen.c,v 1.74 2015/06/26 17:17:46 okan Exp $
  */
 
 #include <sys/types.h>
@@ -124,25 +124,22 @@ screen_updatestackingorder(struct screen_ctx *sc)
 	}
 }
 
-/*
- * Find which xinerama screen the coordinates (x,y) is on.
- */
 struct geom
-screen_find_xinerama(struct screen_ctx *sc, int x, int y, int flags)
+screen_area(struct screen_ctx *sc, int x, int y, int flags)
 {
 	struct region_ctx	*region;
-	struct geom		 geom = sc->work;
+	struct geom		 area = sc->work;
 
 	TAILQ_FOREACH(region, &sc->regionq, entry) {
 		if (x >= region->area.x && x < region->area.x+region->area.w &&
 		    y >= region->area.y && y < region->area.y+region->area.h) {
-			geom = region->area;
+			area = region->area;
 			break;
 		}
 	}
 	if (flags & CWM_GAP)
-		geom = screen_apply_gap(sc, geom);
-	return(geom);
+		area = screen_apply_gap(sc, area);
+	return(area);
 }
 
 void