X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FBasemenu.cc;h=5b4acdf001009f2bf96b6f752c1e26a97158e157;hb=b950402ba238aeb6d76604b761b6fdc249b070ab;hp=fa2f4b0060185bca1b0a2e6320dc9199c0585ddd;hpb=8794d357e67abddf9fda9db77b235e294d0ec590;p=chaz%2Fopenbox

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index fa2f4b00..5b4acdf0 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -40,11 +40,13 @@ extern "C" {
 }
 
 #include <algorithm>
+#include <assert.h>
 using namespace std;
 
 #include "i18n.hh"
 #include "blackbox.hh"
 #include "Basemenu.hh"
+#include "Font.hh"
 #include "GCCache.hh"
 #include "Image.hh"
 #include "Screen.hh"
@@ -89,27 +91,15 @@ Basemenu::Basemenu(BScreen *scrn) {
 
   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;
 
@@ -200,14 +190,11 @@ Basemenu::~Basemenu(void) {
 }
 
 
-BasemenuItem::~BasemenuItem(void) {}
-
-
 BasemenuItem *Basemenu::find(int index) {
-  if (index < 0 || index > static_cast<signed>(menuitems.size()))
+  if (index < 0 || index >= static_cast<signed>(menuitems.size()))
     return (BasemenuItem*) 0;
 
-  return *(menuitems.begin() + index);
+  return menuitems[index];
 }
 
 
@@ -267,31 +254,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;
   }
@@ -299,18 +267,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);
   }
@@ -484,19 +442,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:
@@ -512,15 +462,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);
 }
 
 
@@ -592,8 +535,7 @@ bool Basemenu::hasSubmenu(int index) {
 
 
 void Basemenu::drawItem(int index, bool highlight, bool clear,
-                        int x, int y, unsigned int w, unsigned int h)
-{
+                        int x, int y, unsigned int w, unsigned int h) {
   BasemenuItem *item = find(index);
   if (! item) return;
 
@@ -602,25 +544,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:
@@ -641,8 +572,6 @@ 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());
 
 
@@ -699,11 +628,11 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
   }
 
   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()) {