X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.cc;h=57c10fcb65223defa2e2615fc55418b538247e95;hb=9500c095f81b038f3c2d2b508f63befecfdf2e13;hp=7358df3c3a6c814791ed62416a4b67cf89d788f4;hpb=1766453ca2ce30adf84798cb504e8b4d258bd08f;p=chaz%2Fopenbox

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 7358df3c..57c10fcb 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -46,6 +46,7 @@ using namespace std;
 #include "i18n.hh"
 #include "blackbox.hh"
 #include "Basemenu.hh"
+#include "Font.hh"
 #include "GCCache.hh"
 #include "Image.hh"
 #include "Screen.hh"
@@ -85,32 +86,19 @@ Basemenu::Basemenu(BScreen *scrn) {
 
   menu.frame_pixmap =
     menu.title_pixmap =
-    menu.hilite_pixmap =
-    menu.sel_pixmap = None;
+    menu.hilite_pixmap = None;
 
   menu.bevel_w = screen->getBevelWidth();
 
-  if (i18n.multibyte())
-    menu.width = menu.title_h = menu.item_w = menu.frame_h =
-      screen->getMenuStyle()->t_fontset_extents->max_ink_extent.height +
-      (menu.bevel_w  * 2);
-  else
-    menu.width = menu.title_h = menu.item_w = menu.frame_h =
-      screen->getMenuStyle()->t_font->ascent +
-      screen->getMenuStyle()->t_font->descent + (menu.bevel_w * 2);
+  MenuStyle *style = screen->getMenuStyle();
+  menu.width = menu.title_h = menu.item_w = menu.frame_h =
+    style->t_font->height() + (menu.bevel_w  * 2);
 
   menu.sublevels =
     menu.persub =
     menu.minsub = 0;
 
-  MenuStyle *style = screen->getMenuStyle();
-  if (i18n.multibyte()) {
-    menu.item_h = style->f_fontset_extents->max_ink_extent.height +
-      (menu.bevel_w);
-  } else {
-    menu.item_h = style->f_font->ascent + style->f_font->descent +
-      (menu.bevel_w);
-  }
+  menu.item_h = style->f_font->height() + menu.bevel_w;
 
   menu.height = menu.title_h + screen->getBorderWidth() + menu.frame_h;
 
@@ -187,9 +175,6 @@ Basemenu::~Basemenu(void) {
   if (menu.hilite_pixmap)
     image_ctrl->removeImage(menu.hilite_pixmap);
 
-  if (menu.sel_pixmap)
-    image_ctrl->removeImage(menu.sel_pixmap);
-
   blackbox->removeMenuSearch(menu.title);
   XDestroyWindow(display, menu.title);
 
@@ -213,7 +198,7 @@ int Basemenu::insert(BasemenuItem *item, int pos) {
   if (pos < 0) {
     menuitems.push_back(item);
   } else {
-    assert(pos < static_cast<signed>(menuitems.size()));
+    assert(pos <= static_cast<signed>(menuitems.size()));
     menuitems.insert((menuitems.begin() + pos), item);
   }
   return menuitems.size();
@@ -265,31 +250,12 @@ int Basemenu::remove(int index) {
 
 void Basemenu::update(void) {
   MenuStyle *style = screen->getMenuStyle();
-  if (i18n.multibyte()) {
-    menu.item_h = style->f_fontset_extents->max_ink_extent.height +
-      menu.bevel_w;
-    menu.title_h = style->t_fontset_extents->max_ink_extent.height +
-      (menu.bevel_w * 2);
-  } else {
-    menu.item_h = style->f_font->ascent + style->f_font->descent +
-      menu.bevel_w;
-    menu.title_h = style->t_font->ascent + style->t_font->descent +
-      (menu.bevel_w * 2);
-  }
+  menu.item_h = style->f_font->height() + menu.bevel_w;
+  menu.title_h = style->t_font->height() + menu.bevel_w * 2;
 
   if (title_vis) {
-    const char *s = getLabel();
-    int l = strlen(s);
-
-    if (i18n.multibyte()) {
-      XRectangle ink, logical;
-      XmbTextExtents(screen->getMenuStyle()->t_fontset, s, l, &ink, &logical);
-      menu.item_w = logical.width;
-    } else {
-      menu.item_w = XTextWidth(screen->getMenuStyle()->t_font, s, l);
-    }
-
-    menu.item_w += (menu.bevel_w * 2);
+    menu.item_w = screen->getMenuStyle()->t_font->measureString(menu.label) +
+      menu.bevel_w * 2;
   }  else {
     menu.item_w = 1;
   }
@@ -297,18 +263,8 @@ void Basemenu::update(void) {
   unsigned int ii = 0;
   MenuItems::iterator it = menuitems.begin(), end = menuitems.end();
   for (; it != end; ++it) {
-    BasemenuItem *tmp = *it;
-    const char *s = tmp->l.c_str();
-    int l = strlen(s);
-
-    if (i18n.multibyte()) {
-      XRectangle ink, logical;
-      XmbTextExtents(screen->getMenuStyle()->f_fontset, s, l, &ink, &logical);
-      ii = logical.width;
-    } else
-      ii = XTextWidth(screen->getMenuStyle()->f_font, s, l);
-
-    ii += (menu.bevel_w * 2) + (menu.item_h * 2);
+    ii = screen->getMenuStyle()->f_font->measureString((*it)->l) +
+      (menu.bevel_w * 2) + (menu.item_h * 2);
 
     menu.item_w = ((menu.item_w < ii) ? ii : menu.item_w);
   }
@@ -381,16 +337,6 @@ void Basemenu::update(void) {
   }
   if (tmp) image_ctrl->removeImage(tmp);
 
-  tmp = menu.sel_pixmap;
-  if (texture->texture() == (BTexture::Flat | BTexture::Solid)) {
-    menu.sel_pixmap = None;
-  } else {
-    int hw = menu.item_h / 2;
-    menu.sel_pixmap =
-      image_ctrl->renderImage(hw, hw, *texture);
-  }
-  if (tmp) image_ctrl->removeImage(tmp);
-
   XResizeWindow(display, menu.window, menu.width, menu.height);
 
   if (title_vis)
@@ -482,19 +428,11 @@ void Basemenu::move(int x, int y) {
 void Basemenu::redrawTitle(void) {
   const char *text = (! menu.label.empty()) ? getLabel() :
     i18n(BasemenuSet, BasemenuBlackboxMenu, "Blackbox Menu");
-  int dx = menu.bevel_w, len = strlen(text);
+  int dx = menu.bevel_w;
   unsigned int l;
+  MenuStyle *style = screen->getMenuStyle();
 
-  if (i18n.multibyte()) {
-    XRectangle ink, logical;
-    XmbTextExtents(screen->getMenuStyle()->t_fontset, text, len,
-                   &ink, &logical);
-    l = logical.width;
-  } else {
-    l = XTextWidth(screen->getMenuStyle()->t_font, text, len);
-  }
-
-  l +=  (menu.bevel_w * 2);
+  l = style->t_font->measureString(text) + menu.bevel_w * 2;
 
   switch (screen->getMenuStyle()->t_justify) {
   case RightJustify:
@@ -510,15 +448,8 @@ void Basemenu::redrawTitle(void) {
     break;
   }
 
-  MenuStyle *style = screen->getMenuStyle();
-  BPen pen(style->t_text, style->t_font);
-  if (i18n.multibyte())
-    XmbDrawString(display, menu.title, style->t_fontset, pen.gc(), dx,
-                  (menu.bevel_w - style->t_fontset_extents->max_ink_extent.y),
-                  text, len);
-  else
-    XDrawString(display, menu.title, pen.gc(), dx,
-                (style->t_font->ascent + menu.bevel_w), text, len);
+  style->t_font->drawString(menu.title, dx, menu.bevel_w,
+                            style->t_text, text);
 }
 
 
@@ -599,25 +530,14 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   int sbl = index / menu.persub, i = index - (sbl * menu.persub);
   int item_x = (sbl * menu.item_w), item_y = (i * menu.item_h);
   int hilite_x = item_x, hilite_y = item_y, hoff_x = 0, hoff_y = 0;
-  int text_x = 0, text_y = 0, len = strlen(text), sel_x = 0, sel_y = 0;
+  int text_x = 0, text_y = 0, sel_x = 0, sel_y = 0;
   unsigned int hilite_w = menu.item_w, hilite_h = menu.item_h, text_w = 0,
     text_h = 0;
   unsigned int half_w = menu.item_h / 2, quarter_w = menu.item_h / 4;
 
   if (text) {
-    if (i18n.multibyte()) {
-      XRectangle ink, logical;
-      XmbTextExtents(screen->getMenuStyle()->f_fontset,
-                     text, len, &ink, &logical);
-      text_w = logical.width;
-      text_y = item_y + (menu.bevel_w / 2) -
-        screen->getMenuStyle()->f_fontset_extents->max_ink_extent.y;
-    } else {
-      text_w = XTextWidth(screen->getMenuStyle()->f_font, text, len);
-      text_y =  item_y +
-        screen->getMenuStyle()->f_font->ascent +
-        (menu.bevel_w / 2);
-    }
+    text_w = screen->getMenuStyle()->f_font->measureString(text);
+    text_y = item_y + menu.bevel_w / 2;
 
     switch(screen->getMenuStyle()->f_justify) {
     case LeftJustify:
@@ -637,10 +557,11 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   }
 
   MenuStyle *style = screen->getMenuStyle();
-  BPen pen((highlight || item->isSelected()) ? style->h_text : style->f_text),
-      textpen((highlight) ? style->h_text :
-              item->isEnabled() ? style->f_text : style->d_text, style->f_font),
-      hipen(style->hilite.color());
+  BPen hipen(style->hilite.color());
+  // match the text color
+  BPen pen((highlight ? style->h_text :
+            (item->isEnabled() ? style->f_text :
+             style->d_text)));
 
 
   sel_x = item_x;
@@ -686,46 +607,75 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
     else
       XFillRectangle(display, menu.frame, hipen.gc(),
                      hilite_x, hilite_y, hilite_w, hilite_h);
-  } else if (dosel && item->isSelected() &&
-             (menu.sel_pixmap != ParentRelative)) {
-    if (menu.sel_pixmap)
-      XCopyArea(display, menu.sel_pixmap, menu.frame, hipen.gc(), 0, 0,
-                half_w, half_w, sel_x, sel_y);
-    else
-      XFillRectangle(display, menu.frame, hipen.gc(), sel_x, sel_y, half_w, half_w);
+  }
+  
+  if (dosel && item->isSelected()) {
+      XPoint pts[6];
+
+      // put the check mark on the opposite side of the menu
+      int x = sel_x;
+      if (screen->getMenuStyle()->bullet_pos == Right)
+        x -= (menu.item_w - menu.item_h - menu.bevel_w);
+      else
+        x += (menu.item_w - menu.item_h - menu.bevel_w);
+
+      pts[0].x = x + 0;
+      pts[0].y = sel_y + 2;
+      
+      pts[1].x = 0;
+      pts[1].y = 3;
+      
+      pts[2].x = 2;
+      pts[2].y = 3;
+      
+      pts[3].x = 5;
+      pts[3].y = -5;
+      
+      
+      pts[4].x = 0;
+      pts[4].y = -3;
+      
+      pts[5].x = -5;
+      pts[5].y = 5;
+
+      XFillPolygon(display, menu.frame, pen.gc(), pts, 6, Nonconvex,
+                   CoordModePrevious);
   }
 
   if (dotext && text) {
-    if (i18n.multibyte())
-      XmbDrawString(display, menu.frame, screen->getMenuStyle()->f_fontset,
-                    textpen.gc(), text_x, text_y, text, len);
-    else
-      XDrawString(display, menu.frame, textpen.gc(), text_x, text_y, text, len);
+    style->f_font->drawString(menu.frame, text_x, text_y,
+                              (highlight ? style->h_text :
+                               (item->isEnabled() ? style->f_text :
+                                style->d_text)),
+                              text);
   }
 
   if (dosel && item->submenu()) {
+    const int bullet_size = 3;
+
     switch (screen->getMenuStyle()->bullet) {
     case Square:
-      XDrawRectangle(display, menu.frame, pen.gc(), sel_x, sel_y, half_w, half_w);
+      XDrawRectangle(display, menu.frame, pen.gc(), sel_x, sel_y,
+                     bullet_size * 2, bullet_size * 2);
       break;
 
     case Triangle:
       XPoint tri[3];
 
       if (screen->getMenuStyle()->bullet_pos == Right) {
-        tri[0].x = sel_x + quarter_w - 2;
-        tri[0].y = sel_y + quarter_w - 2;
-        tri[1].x = 4;
-        tri[1].y = 2;
-        tri[2].x = -4;
-        tri[2].y = 2;
+        tri[0].x = sel_x + quarter_w - bullet_size;
+        tri[0].y = sel_y + quarter_w - bullet_size;
+        tri[1].x = 2 * bullet_size;
+        tri[1].y = bullet_size;
+        tri[2].x = -(2 * bullet_size);
+        tri[2].y = bullet_size;
       } else {
-        tri[0].x = sel_x + quarter_w - 2;
+        tri[0].x = sel_x + quarter_w - bullet_size;
         tri[0].y = item_y + half_w;
-        tri[1].x = 4;
-        tri[1].y = 2;
+        tri[1].x = 2 * bullet_size;
+        tri[1].y = bullet_size;
         tri[2].x = 0;
-        tri[2].y = -4;
+        tri[2].y = -(2 * bullet_size);
       }
 
       XFillPolygon(display, menu.frame, pen.gc(), tri, 3, Convex,
@@ -735,14 +685,14 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
     case Diamond:
       XPoint dia[4];
 
-      dia[0].x = sel_x + quarter_w - 3;
+      dia[0].x = sel_x + quarter_w - bullet_size;
       dia[0].y = item_y + half_w;
-      dia[1].x = 3;
-      dia[1].y = -3;
-      dia[2].x = 3;
-      dia[2].y = 3;
-      dia[3].x = -3;
-      dia[3].y = 3;
+      dia[1].x = bullet_size;
+      dia[1].y = -bullet_size;
+      dia[2].x = bullet_size;
+      dia[2].y = bullet_size;
+      dia[3].x = -bullet_size;
+      dia[3].y = bullet_size;
 
       XFillPolygon(display, menu.frame, pen.gc(), dia, 4, Convex,
                    CoordModePrevious);