From 4197ad0bfccfe389538024cdce8247f25c2a8dc3 Mon Sep 17 00:00:00 2001 From: seanpringle Date: Wed, 7 Nov 2012 18:05:52 +1000 Subject: [PATCH] remove monitor_start. does not play that well with spot_start --- config.h | 7 ------- event.c | 3 +-- xoat.c | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config.h b/config.h index ce30658..7dd230b 100644 --- a/config.h +++ b/config.h @@ -50,13 +50,6 @@ // If spot is not current, window won't steal focus. //#define SPOT_START SPOT1 -// If on multi-head, place windows on monitor N. -// (0-based index, same order as xrandr list) -//#define MONITOR_START 0 - -// If on multi-head, place windows on monitor holding current window. -#define MONITOR_START MONITOR_CURRENT - // Available actions... // action_move .num = SPOT1/2/3 // action_focus .num = SPOT1/2/3 diff --git a/event.c b/event.c index 71c3d2d..7e27861 100644 --- a/event.c +++ b/event.c @@ -73,8 +73,7 @@ void map_request(XEvent *e) client *c = window_build_client(e->xmaprequest.window); if (c && c->manage) { - c->monitor = MONITOR_START == MONITOR_CURRENT ? current_mon: MONITOR_START; - c->monitor = MIN(nmonitors-1, MAX(0, c->monitor)); + c->monitor = current_mon; monitor *m = &monitors[c->monitor]; int i, spot = SPOT_START == SPOT_CURRENT ? current_spot: SPOT_START; diff --git a/xoat.c b/xoat.c index 3db47a5..dfa09ae 100644 --- a/xoat.c +++ b/xoat.c @@ -57,7 +57,6 @@ Display *display; #define STACK 64 #define MONITORS 3 #define ATOMLIST 10 -enum { MONITOR_CURRENT=-1 }; enum { SPOT1=1, SPOT2, SPOT3, SPOT_CURRENT, SPOT_SMART, SPOT1_LEFT, SPOT1_RIGHT }; enum { LEFT=1, RIGHT, UP, DOWN };