X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.cc;h=dac1ad7f16611b8189d8b5e29deffa92062b7e4f;hb=20bc088a998a362977233086577d74d00eea8765;hp=5ff333ad9c6a6501fd97f1cf2325904ebe6ab61a;hpb=0305cbdc3ae8525c74b2bb9b23884035549e3407;p=chaz%2Fopenbox

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 5ff333ad..dac1ad7f 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -54,6 +54,7 @@ using std::string;
 #include "i18n.hh"
 #include "blackbox.hh"
 #include "Clientmenu.hh"
+#include "Font.hh"
 #include "GCCache.hh"
 #include "Iconmenu.hh"
 #include "Image.hh"
@@ -76,8 +77,8 @@ static long aMinuteFromNow(void) {
 Toolbar::Toolbar(BScreen *scrn) {
   screen = scrn;
   blackbox = screen->getBlackbox();
-  toolbarstr = (string)"session.screen" + itostring(screen->getScreenNumber())
-    + ".toolbar.";
+  toolbarstr = "session.screen" + itostring(screen->getScreenNumber()) +
+    ".toolbar.";
   config = blackbox->getConfig();
 
   load_rc();
@@ -158,17 +159,13 @@ Toolbar::Toolbar(BScreen *scrn) {
   frame.base = frame.label = frame.wlabel = frame.clk = frame.button =
     frame.pbutton = None;
 
-  screen->addStrut(&strut);
-
   reconfigure();
-
-  XMapSubwindows(display, frame.window);
-  XMapWindow(display, frame.window);
+  mapToolbar();
 }
 
 
 Toolbar::~Toolbar(void) {
-  XUnmapWindow(display, frame.window);
+  unmapToolbar();
 
   if (frame.base) screen->getImageControl()->removeImage(frame.base);
   if (frame.label) screen->getImageControl()->removeImage(frame.label);
@@ -198,6 +195,29 @@ Toolbar::~Toolbar(void) {
 }
 
 
+void Toolbar::mapToolbar() {
+  if (!screen->doHideToolbar()) {
+    //not hidden, so windows should not maximize over the toolbar
+    XMapSubwindows(display, frame.window);
+    XMapWindow(display, frame.window);
+  }
+  screen->addStrut(&strut);
+  updateStrut();
+}
+
+
+void Toolbar::unmapToolbar() {
+  if (toolbarmenu->isVisible())
+    toolbarmenu->hide();
+  //hidden so we can maximize over the toolbar
+  screen->removeStrut(&strut);
+  screen->updateAvailableArea();
+
+  XUnmapWindow(display, frame.window);
+  updateStrut();
+}
+
+
 void Toolbar::saveOnTop(bool b) {
   on_top = b;
   config->setValue(toolbarstr + "onTop", on_top);
@@ -272,14 +292,10 @@ void Toolbar::load_rc(void) {
 
 
 void Toolbar::reconfigure(void) {
-  unsigned int height = 0,
-    width = (screen->getWidth() * width_percent) / 100;
-
-  if (i18n.multibyte())
-    height = screen->getToolbarStyle()->fontset_extents->max_ink_extent.height;
-  else
-    height = screen->getToolbarStyle()->font->ascent +
-      screen->getToolbarStyle()->font->descent;
+  unsigned int width, height;
+ 
+  width = (screen->getWidth() * width_percent) / 100;
+  height = screen->getToolbarStyle()->font->height();
 
   frame.bevel_w = screen->getBevelWidth();
   frame.button_w = height;
@@ -345,47 +361,26 @@ void Toolbar::reconfigure(void) {
       int len = strftime(t, 1024, screen->getStrftimeFormat(), tt);
       if (len == 0) { // invalid time format found
         screen->saveStrftimeFormat("%I:%M %p"); // so use the default
-        len = strftime(t, 1024, screen->getStrftimeFormat(), tt);
+        strftime(t, 1024, screen->getStrftimeFormat(), tt);
       }
       // find the length of the rendered string and add room for two extra
       // characters to it.  This allows for variable width output of the fonts
-      if (i18n.multibyte()) {
-        XRectangle ink, logical;
-        XmbTextExtents(screen->getToolbarStyle()->fontset, t, len,
-                       &ink, &logical);
-        XFontSetExtents* extents = screen->getToolbarStyle()->fontset_extents;
-        frame.clock_w = logical.width +
-          (extents->max_logical_extent.width * 2);
-      } else {
-        XFontStruct* font = screen->getToolbarStyle()->font;
-        frame.clock_w = XTextWidth(font, t, len) +
-          ((font->max_bounds.rbearing - font->min_bounds.lbearing) * 2);
-      }
+      BFont *font = screen->getToolbarStyle()->font;
+      frame.clock_w = font->measureString(t) + font->maxCharWidth() * 2;
     }
   }
 #else // !HAVE_STRFTIME
-  frame.clock_w =
-    XTextWidth(screen->getToolbarStyle()->font,
-               i18n(ToolbarSet, ToolbarNoStrftimeLength, "00:00000"),
-               strlen(i18n(ToolbarSet, ToolbarNoStrftimeLength,
-                           "00:00000")));
+  {
+    string s = i18n(ToolbarSet, ToolbarNoStrftimeLength, "00:00000");
+    frame.clock_w = screen->getToolbarStyle()->font->measureString(s);
+  }
 #endif // HAVE_STRFTIME
 
   frame.workspace_label_w = 0;
 
   for (unsigned int i = 0; i < screen->getWorkspaceCount(); i++) {
     const string& workspace_name = screen->getWorkspace(i)->getName();
-    if (i18n.multibyte()) {
-      XRectangle ink, logical;
-      XmbTextExtents(screen->getToolbarStyle()->fontset,
-                     workspace_name.c_str(), workspace_name.length(),
-                     &ink, &logical);
-      width = logical.width;
-    } else {
-      width = XTextWidth(screen->getToolbarStyle()->font,
-                     workspace_name.c_str(), workspace_name.length());
-    }
-
+    width = screen->getToolbarStyle()->font->measureString(workspace_name);
     if (width > frame.workspace_label_w) frame.workspace_label_w = width;
   }
 
@@ -511,14 +506,21 @@ void Toolbar::updateStrut(void) {
   // left and right are always 0
   strut.top = strut.bottom = 0;
 
-  switch(placement) {
-  case TopLeft:
-  case TopCenter:
-  case TopRight:
-    strut.top = getExposedHeight() + (screen->getBorderWidth() * 2);
-    break;
-  default:
-    strut.bottom = getExposedHeight() + (screen->getBorderWidth() * 2);
+  // when hidden only one border is visible
+  unsigned int border_width = screen->getBorderWidth();
+  if (! do_auto_hide)
+    border_width *= 2;
+
+  if (! screen->doHideToolbar()) {
+    switch(placement) {
+    case TopLeft:
+    case TopCenter:
+    case TopRight:
+      strut.top = getExposedHeight() + border_width;
+      break;
+    default:
+      strut.bottom = getExposedHeight() + border_width;
+    }
   }
 
   screen->updateAvailableArea();
@@ -580,17 +582,9 @@ void Toolbar::checkClock(bool redraw, bool date) {
 
     ToolbarStyle *style = screen->getToolbarStyle();
 
-    int pos = frame.bevel_w * 2, // this is modified by doJustify()
-      dlen = style->doJustify(t, pos, frame.clock_w,
-                              frame.bevel_w * 4, i18n.multibyte());
-    BPen pen(style->c_text, style->font);
-    if (i18n.multibyte())
-      XmbDrawString(display, frame.clock, style->fontset, pen.gc(),
-                    pos, (1 - style->fontset_extents->max_ink_extent.y),
-                    t, dlen);
-    else
-      XDrawString(display, frame.clock, pen.gc(), pos,
-                  (style->font->ascent + 1), t, dlen);
+    int pos = frame.bevel_w * 2; // this is modified by doJustify()
+    style->doJustify(t, pos, frame.clock_w, frame.bevel_w * 4);
+    style->font->drawString(frame.clock, pos, 1, style->c_text, t);
   }
 }
 
@@ -610,17 +604,9 @@ void Toolbar::redrawWindowLabel(bool redraw) {
   const char *title = foc->getTitle();
   ToolbarStyle *style = screen->getToolbarStyle();
 
-  int pos = frame.bevel_w * 2, // modified by doJustify()
-    dlen = style->doJustify(title, pos, frame.window_label_w,
-                            frame.bevel_w * 4, i18n.multibyte());
-  BPen pen(style->w_text, style->font);
-  if (i18n.multibyte())
-    XmbDrawString(display, frame.window_label, style->fontset, pen.gc(), pos,
-                  (1 - style->fontset_extents->max_ink_extent.y),
-                  title, dlen);
-  else
-    XDrawString(display, frame.window_label, pen.gc(), pos,
-                (style->font->ascent + 1), title, dlen);
+  int pos = frame.bevel_w * 2; // modified by doJustify()
+  style->doJustify(title, pos, frame.window_label_w, frame.bevel_w * 4);
+  style->font->drawString(frame.window_label, pos, 1, style->w_text, title);
 }
 
 
@@ -632,18 +618,10 @@ void Toolbar::redrawWorkspaceLabel(bool redraw) {
 
   ToolbarStyle *style = screen->getToolbarStyle();
 
-  int pos = frame.bevel_w * 2,
-    dlen = style->doJustify(name.c_str(), pos, frame.workspace_label_w,
-                            frame.bevel_w * 4, i18n.multibyte());
-  BPen pen(style->l_text, style->font);
-  if (i18n.multibyte())
-    XmbDrawString(display, frame.workspace_label, style->fontset, pen.gc(),
-                  pos, (1 - style->fontset_extents->max_ink_extent.y),
-                  name.c_str(), dlen);
-  else
-    XDrawString(display, frame.workspace_label, pen.gc(), pos,
-                (style->font->ascent + 1),
-                name.c_str(), dlen);
+  int pos = frame.bevel_w * 2;
+  style->doJustify(name.c_str(), pos, frame.workspace_label_w,
+                   frame.bevel_w * 4);
+  style->font->drawString(frame.workspace_label, pos, 1, style->l_text, name);
 }
 
 
@@ -671,7 +649,7 @@ void Toolbar::redrawPrevWorkspaceButton(bool pressed, bool redraw) {
   pts[2].x = 0; pts[2].y = -4;
 
   ToolbarStyle *style = screen->getToolbarStyle();
-  BPen pen(style->b_pic, style->font);
+  BPen pen(style->b_pic);
   XFillPolygon(display, frame.psbutton, pen.gc(),
                pts, 3, Convex, CoordModePrevious);
 }
@@ -701,7 +679,7 @@ void Toolbar::redrawNextWorkspaceButton(bool pressed, bool redraw) {
   pts[2].x = -4; pts[2].y = 2;
 
   ToolbarStyle *style = screen->getToolbarStyle();
-  BPen pen(style->b_pic, style->font);
+  BPen pen(style->b_pic);
   XFillPolygon(display, frame.nsbutton, pen.gc(),
                pts, 3, Convex, CoordModePrevious);
 }
@@ -731,7 +709,7 @@ void Toolbar::redrawPrevWindowButton(bool pressed, bool redraw) {
   pts[2].x = 0; pts[2].y = -4;
 
   ToolbarStyle *style = screen->getToolbarStyle();
-  BPen pen(style->b_pic, style->font);
+  BPen pen(style->b_pic);
   XFillPolygon(display, frame.pwbutton, pen.gc(),
                pts, 3, Convex, CoordModePrevious);
 }
@@ -761,7 +739,7 @@ void Toolbar::redrawNextWindowButton(bool pressed, bool redraw) {
   pts[2].x = -4; pts[2].y = 2;
 
   ToolbarStyle *style = screen->getToolbarStyle();
-  BPen pen(style->b_pic, style->font);
+  BPen pen(style->b_pic);
   XFillPolygon(display, frame.nwbutton, pen.gc(), pts, 3, Convex,
                CoordModePrevious);
 }
@@ -785,7 +763,7 @@ void Toolbar::edit(void) {
     blackbox->getFocusedWindow()->setFocusFlag(False);
 
   ToolbarStyle *style = screen->getToolbarStyle();
-  BPen pen(style->l_text, style->font);
+  BPen pen(style->l_text);
   XDrawRectangle(display, frame.workspace_label, pen.gc(),
                  frame.workspace_label_w / 2, 0, 1,
                  frame.label_h - 1);
@@ -801,7 +779,7 @@ void Toolbar::edit(void) {
 }
 
 
-void Toolbar::buttonPressEvent(XButtonEvent *be) {
+void Toolbar::buttonPressEvent(const XButtonEvent *be) {
   if (be->button == 1) {
     if (be->window == frame.psbutton)
       redrawPrevWorkspaceButton(True, True);
@@ -850,7 +828,7 @@ void Toolbar::buttonPressEvent(XButtonEvent *be) {
 
 
 
-void Toolbar::buttonReleaseEvent(XButtonEvent *re) {
+void Toolbar::buttonReleaseEvent(const XButtonEvent *re) {
   if (re->button == 1) {
     if (re->window == frame.psbutton) {
       redrawPrevWorkspaceButton(False, True);
@@ -897,7 +875,7 @@ void Toolbar::buttonReleaseEvent(XButtonEvent *re) {
 }
 
 
-void Toolbar::enterNotifyEvent(XCrossingEvent *) {
+void Toolbar::enterNotifyEvent(const XCrossingEvent *) {
   if (! do_auto_hide)
     return;
 
@@ -908,7 +886,7 @@ void Toolbar::enterNotifyEvent(XCrossingEvent *) {
   }
 }
 
-void Toolbar::leaveNotifyEvent(XCrossingEvent *) {
+void Toolbar::leaveNotifyEvent(const XCrossingEvent *) {
   if (! do_auto_hide)
     return;
 
@@ -920,7 +898,7 @@ void Toolbar::leaveNotifyEvent(XCrossingEvent *) {
 }
 
 
-void Toolbar::exposeEvent(XExposeEvent *ee) {
+void Toolbar::exposeEvent(const XExposeEvent *ee) {
   if (ee->window == frame.clock) checkClock(True);
   else if (ee->window == frame.workspace_label && (! editing))
     redrawWorkspaceLabel();
@@ -932,7 +910,7 @@ void Toolbar::exposeEvent(XExposeEvent *ee) {
 }
 
 
-void Toolbar::keyPressEvent(XKeyEvent *ke) {
+void Toolbar::keyPressEvent(const XKeyEvent *ke) {
   if (ke->window == frame.workspace_label && editing) {
     if (new_workspace_name.empty()) {
       new_name_pos = 0;
@@ -940,7 +918,7 @@ void Toolbar::keyPressEvent(XKeyEvent *ke) {
 
     KeySym ks;
     char keychar[1];
-    XLookupString(ke, keychar, 1, &ks, 0);
+    XLookupString(const_cast<XKeyEvent*>(ke), keychar, 1, &ks, 0);
 
     // either we are told to end with a return or we hit 127 chars
     if (ks == XK_Return || new_name_pos == 127) {
@@ -996,32 +974,17 @@ void Toolbar::keyPressEvent(XKeyEvent *ke) {
       }
 
       XClearWindow(display, frame.workspace_label);
-      unsigned int l = new_workspace_name.length(), tw, x;
+      unsigned int tw, x;
 
-      if (i18n.multibyte()) {
-        XRectangle ink, logical;
-        XmbTextExtents(screen->getToolbarStyle()->fontset,
-                       new_workspace_name.c_str(), l, &ink, &logical);
-        tw = logical.width;
-      } else {
-        tw = XTextWidth(screen->getToolbarStyle()->font,
-                        new_workspace_name.c_str(), l);
-      }
+      tw = screen->getToolbarStyle()->font->measureString(new_workspace_name);
       x = (frame.workspace_label_w - tw) / 2;
 
       if (x < frame.bevel_w) x = frame.bevel_w;
 
       ToolbarStyle *style = screen->getToolbarStyle();
-      BPen pen(style->l_text, style->font);
-      if (i18n.multibyte())
-        XmbDrawString(display, frame.workspace_label, style->fontset,
-                      pen.gc(), x,
-                      (1 - style->fontset_extents->max_ink_extent.y),
-                      new_workspace_name.c_str(), l);
-      else
-        XDrawString(display, frame.workspace_label, pen.gc(), x,
-                    (style->font->ascent + 1),
-                    new_workspace_name.c_str(), l);
+      style->font->drawString(frame.workspace_label, x, 1, style->l_text,
+                              new_workspace_name);
+      BPen pen(style->l_text);
       XDrawRectangle(display, frame.workspace_label, pen.gc(), x + tw, 0, 1,
                      frame.label_h - 1);
     }
@@ -1211,21 +1174,14 @@ void Toolbarmenu::Placementmenu::itemSelected(int button, unsigned int index) {
 }
 
 
-int ToolbarStyle::doJustify(const char *text, int &start_pos,
-                            unsigned int max_length, unsigned int modifier,
-                            bool multibyte) const {
-  size_t text_len = strlen(text);
+void ToolbarStyle::doJustify(const std::string &text, int &start_pos,
+                             unsigned int max_length,
+                             unsigned int modifier) const {
+  size_t text_len = text.size();
   unsigned int length;
 
   do {
-    if (multibyte) {
-      XRectangle ink, logical;
-      XmbTextExtents(fontset, text, text_len, &ink, &logical);
-      length = logical.width;
-    } else {
-      length = XTextWidth(font, text, text_len);
-    }
-    length += modifier;
+    length = font->measureString(string(text, 0, text_len)) + modifier;
   } while (length > max_length && text_len-- > 0);
 
   switch (justify) {
@@ -1241,6 +1197,4 @@ int ToolbarStyle::doJustify(const char *text, int &start_pos,
   default:
     break;
   }
-
-  return text_len;
 }