Take menu file from rc file if it isn't specified on the command line.

[chaz/openbox] / src / Toolbar.cc

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index d7dc36a412284e6db8afd53b719733f58a3a0653..587d3fd430269c444c93dc39010347368c4fdb75 100644 (file)
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -581,6 +581,11 @@ void Toolbar::checkClock(bool redraw, bool date) {
 
     int pos = frame.bevel_w * 2; // this is modified by doJustify()
     style->doJustify(t, pos, frame.clock_w, frame.bevel_w * 4);
+
+#ifdef    XFT
+    XClearWindow(display, frame.clock);
+#endif // XFT
+
     style->font->drawString(frame.clock, pos, 1, style->c_text, t);
   }
 }
@@ -593,6 +598,10 @@ void Toolbar::redrawWindowLabel(bool redraw) {
     return;
   }
 
+#ifdef    XFT
+  redraw = true;
+#endif // XFT
+
   if (redraw)
     XClearWindow(display, frame.window_label);
 
@@ -610,6 +619,10 @@ void Toolbar::redrawWindowLabel(bool redraw) {
 void Toolbar::redrawWorkspaceLabel(bool redraw) {
   const string& name = screen->getCurrentWorkspace()->getName();
 
+#ifdef    XFT
+  redraw = true;
+#endif // XFT
+
   if (redraw)
     XClearWindow(display, frame.workspace_label);
 
@@ -633,16 +646,8 @@ void Toolbar::drawArrow(Drawable surface, bool left) const {
 
 
   if (left) {
-    if (style->left_button.mask == None) {
-      pts[0].x = hw - bullet_size;
-      pts[0].y = hh;
-      pts[1].x = 2 * bullet_size;
-      pts[1].y = bullet_size;
-      pts[2].x = 0;
-      pts[2].y = -(2 * bullet_size);
-      XFillPolygon(display, surface, pen.gc(), pts, 3, Convex,
-                   CoordModePrevious);
-    } else {
+#ifdef    BITMAPBUTTONS
+    if (style->left_button.mask != None) {
       XSetClipMask(blackbox->getXDisplay(), pen.gc(), style->left_button.mask);
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
                      (frame.button_w - style->left_button.w)/2,
@@ -655,18 +660,22 @@ void Toolbar::drawArrow(Drawable surface, bool left) const {
 
       XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0);
-    }
-  } else {
-    if (style->right_button.mask == None) {
+    } else {
+#endif // BITMAPBUTTONS
       pts[0].x = hw - bullet_size;
-      pts[0].y = hh - bullet_size;
-      pts[1].x = (2 * bullet_size);
-      pts[1].y =  bullet_size;
-      pts[2].x = -(2 * bullet_size);
-      pts[2].y = bullet_size;
+      pts[0].y = hh;
+      pts[1].x = 2 * bullet_size;
+      pts[1].y = bullet_size;
+      pts[2].x = 0;
+      pts[2].y = -(2 * bullet_size);
       XFillPolygon(display, surface, pen.gc(), pts, 3, Convex,
                    CoordModePrevious);
-    } else {
+#ifdef    BITMAPBUTTONS      
+    }
+#endif // BITMAPBUTTONS
+  } else {
+#ifdef    BITMAPBUTTONS
+    if (style->right_button.mask != None) {
       XSetClipMask(blackbox->getXDisplay(), pen.gc(),
                    style->right_button.mask);
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
@@ -681,7 +690,19 @@ void Toolbar::drawArrow(Drawable surface, bool left) const {
 
       XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0);
+    } else {
+#endif // BITMAPBUTTONS
+      pts[0].x = hw - bullet_size;
+      pts[0].y = hh - bullet_size;
+      pts[1].x = (2 * bullet_size);
+      pts[1].y =  bullet_size;
+      pts[2].x = -(2 * bullet_size);
+      pts[2].y = bullet_size;
+      XFillPolygon(display, surface, pen.gc(), pts, 3, Convex,
+                   CoordModePrevious);
+#ifdef    BITMAPBUTTONS
     }
+#endif
   }
 }