}
#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"
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;
MenuItems::const_iterator it = menuitems.begin();
while (it != menuitems.end()) {
BasemenuItem *item = *it;
- if ((! internal_menu)) {
+ if (! internal_menu) {
Basemenu *tmp = (Basemenu *) item->submenu();
if (tmp) {
if (! tmp->internal_menu) {
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);
}
-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];
}
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();
BasemenuItem *item = find(index);
if (! item) return -1;
- if ((! internal_menu)) {
+ if (! internal_menu) {
Basemenu *tmp = (Basemenu *) item->submenu();
if (tmp) {
if (! tmp->internal_menu) {
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() < 9 ? 9 : style->f_font->height()) +
+ menu.bevel_w; // 9 for the menu pixmaps (checkmarks)
+ 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;
}
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);
}
}
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)
void Basemenu::hide(void) {
- if ((! torn) && hide_tree && parent && parent->isVisible()) {
+ if (! torn && hide_tree && parent && parent->isVisible()) {
Basemenu *p = parent;
- while (p->isVisible() && (! p->torn) && p->parent) p = p->parent;
+ while (p->isVisible() && ! p->torn && p->parent) p = p->parent;
p->internal_hide();
} else {
internal_hide();
if (tmp)
tmp->submenu()->internal_hide();
- if (parent && (! torn)) {
+ if (parent && ! torn) {
parent->drawItem(parent->which_sub, False, True);
parent->which_sub = -1;
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:
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);
}
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;
- bool dotext = True, dohilite = True, dosel = True;
+ bool dotext = True, dohilite = True, dosel = True, dooppsel = True;
const char *text = item->label();
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, oppsel_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:
}
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;
if (screen->getMenuStyle()->bullet_pos == Right)
sel_x += (menu.item_w - menu.item_h - menu.bevel_w);
sel_x += quarter_w;
+ oppsel_x = sel_x;
+ if (screen->getMenuStyle()->bullet_pos == Right)
+ oppsel_x -= (menu.item_w - menu.item_h - menu.bevel_w);
+ else
+ oppsel_x += (menu.item_w - menu.item_h - menu.bevel_w);
sel_y = item_y + quarter_w;
if (clear) {
if (! (max(sel_x, x) <= min<signed>(sel_x + half_w, x + w) &&
max(sel_y, y) <= min<signed>(sel_y + half_w, y + h)))
dosel = False;
+
+ // check if we need to redraw the select pixmap/menu bullet
+ // on the opposite side of the menu
+ if (! (max(oppsel_x, x) <= min<signed>(oppsel_x + half_w, x + w) &&
+ max(sel_y, y) <= min<signed>(sel_y + half_w, y + h)))
+ dooppsel = False;
}
if (dohilite && highlight && (menu.hilite_pixmap != ParentRelative)) {
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 (dooppsel && item->isSelected()) {
+ XPoint pts[6];
+
+ pts[0].x = oppsel_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,
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);
if (me->window == menu.title && (me->state & Button1Mask)) {
if (movable) {
if (! moving) {
- if (parent && (! torn)) {
+ if (parent && ! torn) {
parent->drawItem(parent->which_sub, False, True);
parent->which_sub = -1;
}
drawSubmenu(which_sub);
}
}
- } else if ((! (me->state & Button1Mask)) && me->window == menu.frame &&
+ } else if (! (me->state & Button1Mask) && me->window == menu.frame &&
me->x >= 0 && me->x < static_cast<signed>(menu.width) &&
me->y >= 0 && me->y < static_cast<signed>(menu.frame_h)) {
int sbl = (me->x / menu.item_w), i = (me->y / menu.item_h),
drawItem(p, False, True);
if (item->submenu())
if (item->submenu()->isVisible() &&
- (! item->submenu()->isTorn())) {
+ ! item->submenu()->isTorn()) {
item->submenu()->internal_hide();
which_sub = -1;
}
int sbl = (ce->x / menu.item_w), i = (ce->y / menu.item_h),
w = (sbl * menu.persub) + i;
- if (w != which_sub && (! tmp->submenu()->isTorn())) {
+ if (w != which_sub && ! tmp->submenu()->isTorn()) {
tmp->submenu()->internal_hide();
drawItem(which_sub, False, True);
void Basemenu::changeItemLabel(unsigned int index, const string& label) {
BasemenuItem *item = find(index);
- assert(item);
- item->newLabel(label);
+ if (item)
+ item->newLabel(label);
}
projects / chaz / openbox / blobdiff