From: Yuri D'Elia <yuri.delia@eurac.edu>
Date: Sat, 22 Mar 2014 20:41:11 +0000 (+0100)
Subject: Add 'MINIMALBORDER' quirk to remove borders from floating/unfocused windows.
X-Git-Tag: SPECTRWM_2_7_0~12
X-Git-Url: https://code.delx.au/spectrwm/commitdiff_plain/734f4a1b0e2837489ed578fcf9587e05b677f22d

Add 'MINIMALBORDER' quirk to remove borders from floating/unfocused windows.
---

diff --git a/spectrwm.1 b/spectrwm.1
index 1b97805..f03b59e 100644
--- a/spectrwm.1
+++ b/spectrwm.1
@@ -1050,6 +1050,8 @@ application in the stack.
 .It NOFOCUSCYCLE
 Remove from normal focus cycle (focus_prev or focus_next). The window can
 still be focused using search_win.
+.It MINIMALBORDER
+Remove border when window is unfocused and floating.
 .It NOFOCUSONMAP
 Don't change focus to the window when it first appears on the screen.
 Has no effect when
diff --git a/spectrwm.c b/spectrwm.c
index b4857bc..b84694b 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -678,7 +678,7 @@ struct quirk {
 #define SWM_Q_TRANSSZ		(1<<1)	/* transiend window size too small */
 #define SWM_Q_ANYWHERE		(1<<2)	/* don't position this window */
 #define SWM_Q_XTERM_FONTADJ	(1<<3)	/* adjust xterm fonts when resizing */
-#define SWM_Q_FULLSCREEN	(1<<4)	/* remove border */
+#define SWM_Q_FULLSCREEN	(1<<4)	/* remove border when fullscreen */
 #define SWM_Q_FOCUSPREV		(1<<5)	/* focus on caller */
 #define SWM_Q_NOFOCUSONMAP	(1<<6)	/* Don't focus on window when mapped. */
 #define SWM_Q_FOCUSONMAP_SINGLE	(1<<7)	/* Only focus if single win of type. */
@@ -686,6 +686,7 @@ struct quirk {
 #define SWM_Q_IGNOREPID		(1<<9)	/* Ignore PID when determining ws. */
 #define SWM_Q_IGNORESPAWNWS	(1<<10)	/* Ignore _SWM_WS when managing win. */
 #define SWM_Q_NOFOCUSCYCLE	(1<<11)	/* Remove from normal focus cycle. */
+#define SWM_Q_MINIMALBORDER	(1<<12)	/* Remove border when floating/unfocused */
 };
 TAILQ_HEAD(quirk_list, quirk);
 struct quirk_list		quirks = TAILQ_HEAD_INITIALIZER(quirks);
@@ -3606,6 +3607,15 @@ unfocus_win(struct ws_win *win)
 	if (win->ws->always_raise)
 		raise_window(win);
 
+	/* Update border width */
+	if (win->bordered && (win->quirks & SWM_Q_MINIMALBORDER) &&
+	    FLOATING(win)) {
+		win->bordered = 0;
+		X(win) += border_width;
+		Y(win) += border_width;
+		update_window(win);
+	}
+
 	xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
 	    ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none);
 
@@ -3733,10 +3743,20 @@ focus_win(struct ws_win *win)
 		    &win->id);
 	}
 
-	if (cfw != win)
+	if (cfw != win) {
 		/* Update window border even if workspace is hidden. */
 		update_window_color(win);
 
+		/* Update border width */
+		if (!win->bordered && WS_FOCUSED(win->ws) &&
+		    (win->quirks & SWM_Q_MINIMALBORDER) && FLOATING(win)) {
+			win->bordered = 1;
+			X(win) -= border_width;
+			Y(win) -= border_width;
+			update_window(win);
+		}
+	}
+
 out:
 	bar_draw();
 
@@ -4709,9 +4729,11 @@ update_floater(struct ws_win *win)
 		if (r != ws->old_r)
 			load_float_geom(win);
 
-		if ((win->quirks & SWM_Q_FULLSCREEN) &&
-		    WIDTH(win) >= WIDTH(r) && HEIGHT(win) >= HEIGHT(r)) {
-			/* Remove border for FULLSCREEN quirk. */
+		if (((win->quirks & SWM_Q_FULLSCREEN) &&
+		     WIDTH(win) >= WIDTH(r) && HEIGHT(win) >= HEIGHT(r)) ||
+		    ((!WS_FOCUSED(win->ws) || win->ws->focus != win) &&
+		     (win->quirks & SWM_Q_MINIMALBORDER))) {
+			/* Remove border */
 			win->bordered = false;
 		} else if (!MANUAL(win)) {
 			if (TRANS(win) && (win->quirks & SWM_Q_TRANSSZ)) {
@@ -7747,6 +7769,7 @@ const char *quirkname[] = {
 	"IGNOREPID",
 	"IGNORESPAWNWS",
 	"NOFOCUSCYCLE",
+	"MINIMALBORDER",
 };
 
 /* SWM_Q_DELIM: retain '|' for back compat for now (2009-08-11) */