From 96f64be368e434274f2fbf44aa153b656f7eff1e Mon Sep 17 00:00:00 2001
From: Derek Stevens <nilix@nilfm.cc>
Date: Tue, 7 Mar 2023 23:09:26 -0700
Subject: [PATCH] tweak border behavior, don't focus cycle through minimized
 windows

---
 configure.ac          | 28 ++++++++++------------------
 openbox/client.c      | 11 +++++------
 openbox/focus_cycle.c |  2 +-
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index df709b17..10b32fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ([2.54])
-AC_INIT([openbox], [3.6], [http://bugzilla.icculus.org])
+AC_PREREQ([2.71])
+AC_INIT([openbox],[3.6],[http://bugzilla.icculus.org])
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
 AM_INIT_AUTOMAKE([foreign])
@@ -126,10 +126,8 @@ AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
 AC_ARG_ENABLE(startup-notification,
-  AC_HELP_STRING(
-    [--disable-startup-notification],
-    [disable the startup notification library. [default=enabled]]
-  ),
+  AS_HELP_STRING([--disable-startup-notification],[disable the startup notification library. [default=enabled]
+  ]),
   [enable_sn=$enableval],
   [enable_sn=yes]
 )
@@ -151,10 +149,8 @@ else
 fi
 
 AC_ARG_ENABLE(xcursor,
-  AC_HELP_STRING(
-    [--disable-xcursor],
-    [disable use of the X Cursor library. [default=enabled]]
-  ),
+  AS_HELP_STRING([--disable-xcursor],[disable use of the X Cursor library. [default=enabled]
+  ]),
   [enable_xcursor=$enableval],
   [enable_xcursor=yes]
 )
@@ -176,10 +172,8 @@ else
 fi
 
 AC_ARG_ENABLE(imlib2,
-  AC_HELP_STRING(
-    [--disable-imlib2],
-    [disable use of Imlib2 image library for loading icons. [default=enabled]]
-  ),
+  AS_HELP_STRING([--disable-imlib2],[disable use of Imlib2 image library for loading icons. [default=enabled]
+  ]),
   [enable_imlib2=$enableval],
   [enable_imlib2=yes]
 )
@@ -206,10 +200,8 @@ fi
 AM_CONDITIONAL(USE_IMLIB2, [test $imlib2_found = yes])
 
 AC_ARG_ENABLE(librsvg,
-  AC_HELP_STRING(
-    [--disable-librsvg],
-    [disable use of SVG image files for loading icons. [default=enabled]]
-  ),
+  AS_HELP_STRING([--disable-librsvg],[disable use of SVG image files for loading icons. [default=enabled]
+  ]),
   [enable_librsvg=$enableval],
   [enable_librsvg=yes]
 )
diff --git a/openbox/client.c b/openbox/client.c
index 3ff278ae..3bf1cb77 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1861,13 +1861,12 @@ static void client_setup_default_decor_and_functions(ObClient *self)
             if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) ||
                    (self->mwmhints.decorations & OB_MWM_DECOR_TITLE)))
             {
-                /* if the mwm hints request no handle or title, then all
-                   decorations are disabled, but keep the border if that's
-                   specified */
-                if (self->mwmhints.decorations & OB_MWM_DECOR_BORDER)
+                if (self->type != OB_CLIENT_TYPE_DOCK) {
                     self->decorations = OB_FRAME_DECOR_BORDER;
-                else
+                }
+                else {
                     self->decorations = 0;
+                }
             }
         }
     }
@@ -1927,7 +1926,7 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
            the case any more though !
 
            but do kill the handle on fully maxed windows */
-        self->decorations &= ~(OB_FRAME_DECOR_HANDLE | OB_FRAME_DECOR_GRIPS);
+        self->decorations &= ~(OB_FRAME_DECOR_HANDLE | OB_FRAME_DECOR_GRIPS | OB_FRAME_DECOR_BORDER);
     }
 
     /* if we don't have a titlebar, then we cannot shade! */
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index de176501..5e9e776d 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -124,7 +124,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
 
     if (focus_cycle_target == NULL) {
         focus_cycle_linear = linear;
-        focus_cycle_iconic_windows = TRUE;
+        focus_cycle_iconic_windows = FALSE;
         focus_cycle_all_desktops = all_desktops;
         focus_cycle_nonhilite_windows = nonhilite_windows;
         focus_cycle_dock_windows = dock_windows;