further work to r6205. make the disabled titlebar buttons hide if they won't move other buttons around by doing so.

4 files changed, 172 insertions, 194 deletions

diff --git a/openbox/config.c b/openbox/config.c
index 18db15f8..e9482703 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -466,8 +466,15 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         g_free(c);
     }
     if ((n = parse_find_node("titleLayout", node))) {
+        gchar *c, *d;
+
         g_free(config_title_layout);
         config_title_layout = parse_string(doc, n);
+
+        /* replace duplicates with spaces */
+        for (c = config_title_layout; *c != '\0'; ++c)
+            for (d = c+1; *d != '\0'; ++d)
+                if (*c == *d) *d = ' ';
     }
     if ((n = parse_find_node("keepBorder", node)))
         config_theme_keepborder = parse_bool(doc, n);
diff --git a/openbox/frame.c b/openbox/frame.c
index 6d484270..2d62b007 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -48,10 +48,21 @@
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
                            f->cbwidth_y)
 
-static void layout_title(ObFrame *self);
+/* the offsets for the titlebar elements from the edge of the titlebar.
+   negative means from the right edge. */
+gint icon_off;
+gint label_off;
+gint iconify_off;
+gint desk_off;
+gint shade_off;
+gint max_off;
+gint close_off;
+
+
 static void flash_done(gpointer data);
 static gboolean flash_timeout(gpointer data);
 
+static void layout_title(ObFrame *self);
 static void set_theme_statics(ObFrame *self);
 static void free_theme_statics(ObFrame *self);
 static gboolean frame_animate_iconify(gpointer self);
@@ -369,15 +380,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             self->innersize.bottom += ob_rr_theme->handle_height +
                 self->rbwidth + (self->rbwidth - self->bwidth);
   
-        /* they all default off, they're turned on in layout_title */
-        self->icon_x = -1;
-        self->desk_x = -1;
-        self->shade_x = -1;
-        self->iconify_x = -1;
-        self->label_x = -1;
-        self->max_x = -1;
-        self->close_x = -1;
-
         /* position/size and map/unmap all the windows */
 
         if (!fake) {
@@ -408,7 +410,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                 XUnmapWindow(ob_display, self->title);
         }
 
-        if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
+        if ((self->decorations & OB_FRAME_DECOR_TITLEBAR))
             /* layout the title bar elements */
             layout_title(self);
 
@@ -572,8 +574,6 @@ void frame_grab_client(ObFrame *self, ObClient *client)
        req's) the ButtonPress is to catch clicks on the client border */
     XSelectInput(ob_display, self->plate, PLATE_EVENTMASK);
 
-    frame_adjust_area(self, TRUE, TRUE, FALSE);
-
     /* map the client so it maps when the frame does */
     XMapWindow(ob_display, client->window);
 
@@ -662,18 +662,22 @@ void frame_release_client(ObFrame *self, ObClient *client)
 }
 
 /* is there anything present between us and the label? */
-static gboolean is_button_present(const gchar *lc, gint dir,
-                                  gboolean n, gboolean d, gboolean s,
-                                  gboolean i, gboolean m, gboolean c) {
-    for (lc += dir; *lc != '\0'; lc += dir) {
-        if (c == ' ') continue; /* it was invalid */
-        if (c == 'N' && n) return TRUE;
-        if (c == 'D' && d) return TRUE;
-        if (c == 'S' && s) return TRUE;
-        if (c == 'I' && i) return TRUE;
-        if (c == 'M' && m) return TRUE;
-        if (c == 'C' && c) return TRUE;
-        if (c == 'L') return FALSE;
+static gboolean is_button_present(ObFrame *self, const gchar *lc, gint dir) {
+    for (; *lc != '\0' && lc >= config_title_layout; lc += dir) {
+        if (*lc == ' ') continue; /* it was invalid */
+        if (*lc == 'N' && self->decorations & OB_FRAME_DECOR_ICON)
+            return TRUE;
+        if (*lc == 'D' && self->decorations & OB_FRAME_DECOR_ALLDESKTOPS)
+            return TRUE;
+        if (*lc == 'S' && self->decorations & OB_FRAME_DECOR_SHADE)
+            return TRUE;
+        if (*lc == 'I' && self->decorations & OB_FRAME_DECOR_ICONIFY)
+            return TRUE;
+        if (*lc == 'M' && self->decorations & OB_FRAME_DECOR_MAXIMIZE)
+            return TRUE;
+        if (*lc == 'C' && self->decorations & OB_FRAME_DECOR_CLOSE)
+            return TRUE;
+        if (*lc == 'L') return FALSE;
     }
     return FALSE;
 }
@@ -681,173 +685,132 @@ static gboolean is_button_present(const gchar *lc, gint dir,
 static void layout_title(ObFrame *self)
 {
     gchar *lc;
-    gint x;
-    /* which ones the user asked for */
-    gboolean has_n, has_d, has_i, has_m, has_c, has_s;
-    /* which ones to include in titlebar */
-    gboolean n, d, i, m, c, s, l;
-    gboolean before_label;
+    gint i, x;
+
     const gint bwidth = ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
+    /* position of the left most button */
+    const gint left = ob_rr_theme->paddingx + 1;
+    /* position of the right most button */
+    const gint right = self->width - bwidth;
+
+    /* turn them all off */
+    self->icon_on = self->desk_on = self->shade_on = self->iconify_on =
+        self->max_on = self->close_on = self->label_on = FALSE;
+    self->label_width = self->width - (ob_rr_theme->paddingx + 1) * 2;
 
-    has_n = has_d = has_s = has_i = has_m = has_c = FALSE;
-    l = FALSE;
+    /* figure out what's being show, find each element's position, and the
+       width of the label
 
-    /* figure out whats being shown, and the width of the label */
-    self->label_width = self->width - (ob_rr_theme->paddingx + 1) * 2;
-    for (lc = config_title_layout; *lc != '\0'; ++lc) {
-        switch (*lc) {
-        case 'N':
-            if (has_n) { *lc = ' '; break; } /* rm duplicates */
-            has_n = TRUE;
-            break;
-        case 'D':
-            if (has_d) { *lc = ' '; break; }
-            has_d = TRUE;
-            break;
-        case 'S':
-            if (has_s) { *lc = ' '; break; }
-            has_s = TRUE;
-            break;
-        case 'I':
-            if (has_i) { *lc = ' '; break; }
-            has_i = TRUE;
-            break;
-        case 'L':
-            if (l) { *lc = ' '; break; }
-            l = TRUE;
-            break;
-        case 'M':
-            if (has_m) { *lc = ' '; break; }
-            has_m = TRUE;
-            break;
-        case 'C':
-            if (has_c) { *lc = ' '; break; }
-            has_c = TRUE;
-            break;
-        default:
-            *lc = ' '; /* invalid */
-            break;
+       do the ones before the label, then after the label,
+       i will be +1 the first time through when working to the left,
+       and -1 the second time through when working to the right */
+    for (i = 1; i >= -1; i-=2) {
+        if (i > 0) {
+            x = left;
+            lc = config_title_layout;
+        } else {
+            x = right;
+            lc = config_title_layout + strlen(config_title_layout)-1;
         }
-    }
 
-    n = d = i = m = c = s = FALSE;
-    before_label = TRUE;
-
-    /* go through again and see which buttons can hide */
-    for (lc = config_title_layout; *lc != '\0'; ++lc) {
-        switch (*lc) {
-        case 'N':
-            n = has_n && (self->decorations & OB_FRAME_DECOR_ICON ||
-                          is_button_present(lc, (before_label?1:-1),
-                                            has_n, has_d, has_s, has_i,
-                                            has_m, has_c));
-            break;
-        case 'D':
-            d = has_d && (self->decorations & OB_FRAME_DECOR_ALLDESKTOPS ||
-                          is_button_present(lc, (before_label?1:-1),
-                                            has_n, has_d, has_s, has_i,
-                                            has_m, has_c));
-            break;
-        case 'S':
-            s = has_s && (self->decorations & OB_FRAME_DECOR_SHADE ||
-                          is_button_present(lc, (before_label?1:-1),
-                                            has_n, has_d, has_s, has_i,
-                                            has_m, has_c));
-            break;
-        case 'I':
-            i = has_i && (self->decorations & OB_FRAME_DECOR_ICONIFY ||
-                          is_button_present(lc, (before_label?1:-1),
-                                            has_n, has_d, has_s, has_i,
-                                            has_m, has_c));
-            break;
-        case 'L':
-            before_label = FALSE;
-            break;
-        case 'M':
-            m = has_m && (self->decorations & OB_FRAME_DECOR_MAXIMIZE ||
-                          is_button_present(lc, (before_label?1:-1),
-                                            has_n, has_d, has_s, has_i,
-                                            has_m, has_c));
-            break;
-        case 'C':
-            c = has_c && (self->decorations & OB_FRAME_DECOR_CLOSE ||
-                          is_button_present(lc, (before_label?1:-1),
-                                            has_n, has_d, has_s, has_i,
-                                            has_m, has_c));
-            break;
-        }
+        /* stop at the end of the string (or the label, which calls break) */
+        for (; *lc != '\0' && lc >= config_title_layout; lc+=i)
+            if (*lc == 'L') {
+                if (i > 0) {
+                    self->label_on = TRUE;
+                    self->label_x = x;
+                }
+                break; /* break the for loop, do other side of label */
+            } else if (*lc == 'N') {
+                if ((self->icon_on = is_button_present(self, lc, i))) {
+                    /* icon gets extra padding */
+                    self->label_width -= bwidth + 2;
+                    self->icon_x = x + (i * 1);
+                    x += i * (bwidth + 2);
+                }
+            } else if (*lc == 'D') {
+                if ((self->desk_on = is_button_present(self, lc, i))) {
+                    self->label_width -= bwidth;
+                    self->desk_x = x;
+                    x += i * bwidth;
+                }
+            } else if (*lc == 'S') {
+                if ((self->shade_on = is_button_present(self, lc, i))) {
+                    self->label_width -= bwidth;
+                    self->shade_x = x;
+                    x += i * bwidth;
+                }
+            } else if (*lc == 'I') {
+                if ((self->iconify_on = is_button_present(self, lc, i))) {
+                    self->label_width -= bwidth;
+                    self->iconify_x = x;
+                    x += i * bwidth;
+                }
+            } else if (*lc == 'M') {
+                if ((self->max_on = is_button_present(self, lc, i))) {
+                    self->label_width -= bwidth;
+                    self->max_x = x;
+                    x += i * bwidth;
+                }
+            } else if (*lc == 'C') {
+                if ((self->close_on = is_button_present(self, lc, i))) {
+                    self->label_width -= bwidth;
+                    self->close_x = x;
+                    x += i * bwidth;
+                }
+            }
     }
 
-    if (n) self->label_width -= bwidth + 2; /* icon gets extra padding */
-    if (d) self->label_width -= bwidth;
-    if (s) self->label_width -= bwidth;
-    if (i) self->label_width -= bwidth;
-    if (m) self->label_width -= bwidth;
-    if (c) self->label_width -= bwidth;
-    if (self->label_width < 1) self->label_width = 1;
-
-    if (!n) XUnmapWindow(ob_display, self->icon);
-    if (!d) XUnmapWindow(ob_display, self->desk);
-    if (!s) XUnmapWindow(ob_display, self->shade);
-    if (!i) XUnmapWindow(ob_display, self->iconify);
-    if (!l) XUnmapWindow(ob_display, self->label);
-    if (!m) XUnmapWindow(ob_display, self->max);
-    if (!c) XUnmapWindow(ob_display, self->close);
-
-    x = ob_rr_theme->paddingx + 1;
-    for (lc = config_title_layout; *lc != '\0'; ++lc) {
-        switch (*lc) {
-        case 'N':
-            if (!n) break;
-            self->icon_x = x;
-            XMapWindow(ob_display, self->icon);
-            XMoveWindow(ob_display, self->icon, x, ob_rr_theme->paddingy);
-            x += ob_rr_theme->button_size + 2 + ob_rr_theme->paddingx + 1;
-            break;
-        case 'D':
-            if (!d) break;
-            self->desk_x = x;
-            XMapWindow(ob_display, self->desk);
-            XMoveWindow(ob_display, self->desk, x, ob_rr_theme->paddingy + 1);
-            x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
-            break;
-        case 'S':
-            if (!s) break;
-            self->shade_x = x;
-            XMapWindow(ob_display, self->shade);
-            XMoveWindow(ob_display, self->shade, x, ob_rr_theme->paddingy + 1);
-            x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
-            break;
-        case 'I':
-            if (!i) break;
-            self->iconify_x = x;
-            XMapWindow(ob_display, self->iconify);
-            XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->paddingy + 1);
-            x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
-            break;
-        case 'L':
-            if (!l) break;
-            self->label_x = x;
-            XMapWindow(ob_display, self->label);
-            XMoveWindow(ob_display, self->label, x, ob_rr_theme->paddingy);
-            x += self->label_width + ob_rr_theme->paddingx + 1;
-            break;
-        case 'M':
-            if (!m) break;
-            self->max_x = x;
-            XMapWindow(ob_display, self->max);
-            XMoveWindow(ob_display, self->max, x, ob_rr_theme->paddingy + 1);
-            x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
-            break;
-        case 'C':
-            if (!c) break;
-            self->close_x = x;
-            XMapWindow(ob_display, self->close);
-            XMoveWindow(ob_display, self->close, x, ob_rr_theme->paddingy + 1);
-            x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
-            break;
-        }
-    }
+    /* position and map the elements */
+    if (self->icon_on) {
+        XMapWindow(ob_display, self->icon);
+        XMoveWindow(ob_display, self->icon, self->icon_x,
+                    ob_rr_theme->paddingy);
+    } else
+        XUnmapWindow(ob_display, self->icon);
+
+    if (self->desk_on) {
+        XMapWindow(ob_display, self->desk);
+        XMoveWindow(ob_display, self->desk, self->desk_x,
+                    ob_rr_theme->paddingy + 1);
+    } else
+        XUnmapWindow(ob_display, self->desk);
+
+    if (self->shade_on) {
+        XMapWindow(ob_display, self->shade);
+        XMoveWindow(ob_display, self->shade, self->shade_x,
+                    ob_rr_theme->paddingy + 1);
+    } else
+        XUnmapWindow(ob_display, self->shade);
+
+    if (self->iconify_on) {
+        XMapWindow(ob_display, self->iconify);
+        XMoveWindow(ob_display, self->iconify, self->iconify_x,
+                    ob_rr_theme->paddingy + 1);
+    } else
+        XUnmapWindow(ob_display, self->iconify);
+
+    if (self->max_on) {
+        XMapWindow(ob_display, self->max);
+        XMoveWindow(ob_display, self->max, self->max_x,
+                    ob_rr_theme->paddingy + 1);
+    } else
+        XUnmapWindow(ob_display, self->max);
+
+    if (self->close_on) {
+        XMapWindow(ob_display, self->close);
+        XMoveWindow(ob_display, self->close, self->close_x,
+                    ob_rr_theme->paddingy + 1);
+    } else
+        XUnmapWindow(ob_display, self->close);
+
+    if (self->label_on) {
+        self->label_width = MAX(1, self->label_width); /* no lower than 1 */
+        XMapWindow(ob_display, self->label);
+        XMoveWindow(ob_display, self->label, self->label_x,
+                    ob_rr_theme->paddingy);
+    } else
+        XUnmapWindow(ob_display, self->label);
 }
 
 ObFrameContext frame_context_from_string(const gchar *name)
diff --git a/openbox/frame.h b/openbox/frame.h
index 7be63d53..3a5dfdb2 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -114,8 +114,16 @@ struct _ObFrame
 
     GSList   *clients;
 
-    gint      width;         /* title and handle */
-    gint      label_width;
+    gint      icon_on;    /* if the window icon button is on */
+    gint      label_on;   /* if the window title is on */
+    gint      iconify_on; /* if the window iconify button is on */
+    gint      desk_on;    /* if the window all-desktops button is on */
+    gint      shade_on;   /* if the window shade button is on */
+    gint      max_on;     /* if the window maximize button is on */
+    gint      close_on;   /* if the window close button is on */
+
+    gint      width;         /* width of the titlebar and handle */
+    gint      label_width;   /* width of the label in the titlebar */
     gint      icon_x;        /* x-position of the window icon button */
     gint      label_x;       /* x-position of the window title */
     gint      iconify_x;     /* x-position of the window iconify button */
diff --git a/openbox/framerender.c b/openbox/framerender.c
index bbf13983..21474380 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -265,7 +265,7 @@ void framerender_frame(ObFrame *self)
 
 static void framerender_label(ObFrame *self, RrAppearance *a)
 {
-    if (self->label_x < 0) return;
+    if (!self->label_on) return;
     /* set the texture's text! */
     a->texture[0].data.text.string = self->client->title;
     RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height);
@@ -275,7 +275,7 @@ static void framerender_icon(ObFrame *self, RrAppearance *a)
 {
     const ObClientIcon *icon;
 
-    if (self->icon_x < 0) return;
+    if (!self->icon_on) return;
 
     icon = client_icon(self->client,
                        ob_rr_theme->button_size + 2,
@@ -294,33 +294,33 @@ static void framerender_icon(ObFrame *self, RrAppearance *a)
 
 static void framerender_max(ObFrame *self, RrAppearance *a)
 {
-    if (self->max_x < 0) return;
+    if (!self->max_on) return;
     RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_iconify(ObFrame *self, RrAppearance *a)
 {
-    if (self->iconify_x < 0) return;
+    if (!self->iconify_on) return;
     RrPaint(a, self->iconify,
             ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_desk(ObFrame *self, RrAppearance *a)
 {
-    if (self->desk_x < 0) return;
+    if (!self->desk_on) return;
     RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_shade(ObFrame *self, RrAppearance *a)
 {
-    if (self->shade_x < 0) return;
+    if (!self->shade_on) return;
     RrPaint(a, self->shade,
             ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_close(ObFrame *self, RrAppearance *a)
 {
-    if (self->close_x < 0) return;
+    if (!self->close_on) return;
     RrPaint(a, self->close,
             ob_rr_theme->button_size, ob_rr_theme->button_size);
 }