Fix MINIMALBORDER on region focus cycling.

Fix quirk ordering in man page.

diff --git a/spectrwm.1 b/spectrwm.1
index f03b59ec6a69476def031fb1c46cf93eb24071bd..97b0b70e29b32c1c13dc462f7798375eed4a701d 100644 (file)
--- a/spectrwm.1
+++ b/spectrwm.1
@@ -1047,11 +1047,11 @@ Remove border to allow window to use full region size.
 .It FOCUSPREV
 On exit force focus on previously focused application not previous
 application in the stack.
 .It FOCUSPREV
 On exit force focus on previously focused application not previous
 application in the stack.

+.It MINIMALBORDER
+Remove border when window is unfocused and floating.

 .It NOFOCUSCYCLE
 Remove from normal focus cycle (focus_prev or focus_next). The window can
 still be focused using search_win.
 .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
 .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 b84694b06d8613dc50158f0ebbc5eb0ba361e24a..0e29167b06c353aadb07da09f9e5751ca1f76650 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -3655,6 +3655,16 @@ focus_win(struct ws_win *win)
                                    &cfw->s->c[(MAXIMIZED(cfw) ?
                                    SWM_S_COLOR_UNFOCUS_MAXIMIZED :
                                    SWM_S_COLOR_UNFOCUS)].pixel);
                                    &cfw->s->c[(MAXIMIZED(cfw) ?
                                    SWM_S_COLOR_UNFOCUS_MAXIMIZED :
                                    SWM_S_COLOR_UNFOCUS)].pixel);

+
+                               /* Update border width */
+                               if (cfw->bordered &&
+                                   (cfw->quirks & SWM_Q_MINIMALBORDER) &&
+                                   FLOATING(cfw)) {
+                                       cfw->bordered = 0;
+                                       X(cfw) += border_width;
+                                       Y(cfw) += border_width;
+                                       update_window(cfw);
+                               }

                        } else {
                                unfocus_win(cfw);
                        }
                        } else {
                                unfocus_win(cfw);
                        }