- if (_decorations & OBClient::Decor_Titlebar) {
- // set the titlebar size
- _titlebar.setGeometry(-bwidth,
- -bwidth,
- width,
- _style->getFont()->height() + bevel * 2);
- _innersize.top += _titlebar.height() + bwidth;
-
- // set the label size
- _label.setGeometry(0, bevel, width, _style->getFont()->height());
- // set the buttons sizes
- if (_decorations & OBClient::Decor_Iconify)
- _button_iconify.setGeometry(0, bevel + 1,
- _label.height() - 2,
- _label.height() - 2);
- if (_decorations & OBClient::Decor_Maximize)
- _button_max.setGeometry(0, bevel + 1,
- _label.height() - 2,
- _label.height() - 2);
- if (_decorations & OBClient::Decor_Sticky)
- _button_stick.setGeometry(0, bevel + 1,
- _label.height() - 2,
- _label.height() - 2);
- if (_decorations & OBClient::Decor_Close)
- _button_close.setGeometry(0, bevel + 1,
- _label.height() - 2,
- _label.height() - 2);
-
- // separation between titlebar elements
- const int sep = bevel + 1;
-
- std::string layout = "SLIMC"; // XXX: get this from somewhere
- // XXX: it is REQUIRED that by this point, the string only has one of each
- // possible letter, all of the letters are valid, and L exists somewhere in
- // the string!
-
- // the size of the label. this ASSUMES the layout has only buttons other
- // that the ONE LABEL!!
- // adds an extra sep so that there's a space on either side of the
- // titlebar.. note: x = sep, below.
- int lwidth = width - sep * 2 -
- (_button_iconify.width() + sep) * (layout.size() - 1);
- // quick sanity check for really small windows. if this is needed, its
- // obviously not going to be displayed right...
- // XXX: maybe we should make this look better somehow? constraints?
- if (lwidth <= 0) lwidth = 1;
- _label.setWidth(lwidth);
-
- int x = sep;
- for (int i = 0, len = layout.size(); i < len; ++i) {
- switch (layout[i]) {
- case 'I':
- _button_iconify.move(x, _button_iconify.rect().y());
- x += _button_iconify.width();
- break;
- case 'L':
- _label.move(x, _label.rect().y());
- x += _label.width();
- break;
- case 'M':
- _button_max.move(x, _button_max.rect().y());
- x += _button_max.width();
- break;
- case 'S':
- _button_stick.move(x, _button_stick.rect().y());
- x += _button_stick.width();
- break;
- case 'C':
- _button_close.move(x, _button_close.rect().y());
- x += _button_close.width();
- break;
- default:
- assert(false); // the layout string is invalid!
- }
- x += sep;
+ int x = geom.bevel;
+ bool n, d, i, l, m ,c;
+ n = d = i = l = m = c = false;
+ for (const char *lc = _layout.c_str(); *lc; ++lc) {
+ switch (*lc) {
+ case 'n':
+ case 'N':
+ geom.icon_x = x;
+ XMapWindow(**otk::display, _icon);
+ XMoveWindow(**otk::display, _icon, x, geom.bevel + 1);
+ n = true;
+ x += geom.button_size;
+ break;
+ case 'd':
+ case 'D':
+ XMapWindow(**otk::display, _desk);
+ XMoveWindow(**otk::display, _desk, x, geom.bevel + 1);
+ d = true;
+ x += geom.button_size;
+ break;
+ case 'i':
+ case 'I':
+ XMapWindow(**otk::display, _iconify);
+ XMoveWindow(**otk::display, _iconify, x, geom.bevel + 1);
+ i = true;
+ x += geom.button_size;
+ break;
+ case 't':
+ case 'T':
+ XMapWindow(**otk::display, _label);
+ XMoveWindow(**otk::display, _label, x, geom.bevel);
+ l = true;
+ x += geom.label_width;
+ break;
+ case 'm':
+ case 'M':
+ XMapWindow(**otk::display, _max);
+ XMoveWindow(**otk::display, _max, x, geom.bevel + 1);
+ m = true;
+ x += geom.button_size;
+ break;
+ case 'c':
+ case 'C':
+ XMapWindow(**otk::display, _close);
+ XMoveWindow(**otk::display, _close, x, geom.bevel + 1);
+ c = true;
+ x += geom.button_size;
+ break;