ssd: allow hiding titlebar on maximization

<core disableMaximizedServerDecor="yes"> hides the titlebar when a window
is maximized.

Co-authored-by: @CosmicFusion

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 860391c9f7719fb92e68770b89c02895d65ae8ec..e86fb75f1b296644904676f6f5aa6572c1afc708 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -171,6 +171,7 @@ this is for compatibility with Openbox.
 ```
 <core>
   <decoration>server</decoration>
+  <maximizedDecoration>titlebar</maximizedDecoration>
   <gap>0</gap>
   <adaptiveSync>no</adaptiveSync>
   <allowTearing>no</allowTearing>
@@ -186,6 +187,11 @@ this is for compatibility with Openbox.
        that it is not always possible to turn off client side decorations.
        Default is server.
 
+*<core><maximizedDecoration>* [titlebar|none]
+       Specify how server side decorations are shown for maximized windows.
+       *titlebar* shows titlebar above a maximized window. *none* shows no server
+       side decorations around a maximized window. Default is titlebar.
+
 *<core><gap>*
        The distance in pixels between windows and output edges when using
        movement actions, for example MoveToEdge. Default is 0.

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 3084aee5f933b093ad3e8db42f0caeaf2187b4cd..91dc77913e05546e85767def1c706c3078264902 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -11,6 +11,7 @@
 
   <core>
     <decoration>server</decoration>
+    <maximizedDecoration>titlebar</maximizedDecoration>
     <gap>0</gap>
     <adaptiveSync>no</adaptiveSync>
     <allowTearing>no</allowTearing>

diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index a7eb22bdd21ac3a03df920125cdc09a1bd443b3a..cb3dd1b942a8c9603c285d9393f794a5debc4c29 100644 (file)
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -66,6 +66,7 @@ struct rcxml {
 
        /* core */
        bool xdg_shell_server_side_deco;
+       bool hide_maximized_window_titlebar;
        int gap;
        enum adaptive_sync_mode adaptive_sync;
        enum tearing_mode allow_tearing;

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 8746836bc15d8c62895a2efc6c366b19b8650dcb..52e02c4be129c90a78b2a1e009810565c73ba6eb 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -1094,6 +1094,12 @@ entry(xmlNode *node, char *nodename, char *content)
                } else {
                        rc.xdg_shell_server_side_deco = true;
                }
+       } else if (!strcasecmp(nodename, "maximizedDecoration.core")) {
+               if (!strcasecmp(content, "titlebar")) {
+                       rc.hide_maximized_window_titlebar = false;
+               } else if (!strcasecmp(content, "none")) {
+                       rc.hide_maximized_window_titlebar = true;
+               }
        } else if (!strcmp(nodename, "gap.core")) {
                rc.gap = atoi(content);
        } else if (!strcasecmp(nodename, "adaptiveSync.core")) {
@@ -1370,6 +1376,7 @@ rcxml_init(void)
        rc.placement_cascade_offset_y = 0;
 
        rc.xdg_shell_server_side_deco = true;
+       rc.hide_maximized_window_titlebar = false;
        rc.show_title = true;
        rc.title_layout_loaded = false;
        rc.ssd_keep_border = true;

diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index db706085b493b03126bc377d7f22dfe16b30bbd6..3d0dd7a07b0a37c6c3122107b6ac69436e04cedf 100644 (file)
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -312,6 +312,12 @@ ssd_update_geometry(struct ssd *ssd)
                || ssd->state.was_squared != squared
                || ssd->state.was_omnipresent != view->visible_on_all_workspaces;
 
+       /*
+        * (Un)maximization updates titlebar visibility with
+        * maximizedDecoration=none
+        */
+       ssd_set_titlebar(ssd, view_titlebar_visible(view));
+
        if (update_extents) {
                ssd_extents_update(ssd);
        }

diff --git a/src/view.c b/src/view.c
index 75f8bad18a1d2180124db4e7b51c5f1e4c8fe0b1..a81b03ad0839fd6493fd65d687572aeb86cc12ae 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -1660,6 +1660,10 @@ undecorate(struct view *view)
 bool
 view_titlebar_visible(struct view *view)
 {
+       if (view->maximized == VIEW_AXIS_BOTH
+                       && rc.hide_maximized_window_titlebar) {
+               return false;
+       }
        return view->ssd_mode == LAB_SSD_MODE_FULL;
 }