}
#include "frame.hh"
+#include "config.hh"
#include "openbox.hh"
#include "otk/display.hh"
#include "otk/surface.hh"
applyStyle(*otk::RenderStyle::style(_client->screen()));
- _layout = openbox->screen(_client->screen())->config().titlebar_layout;
+ _layout = "ITMC";
+ python_get_string("titlebar_layout", &_layout);
// register all of the windows with the event dispatcher
Window *w = allWindows();
const otk::RenderTexture &texture, bool freedata=true)
{
otk::Surface *s = new otk::Surface(screen, size);
- otk::display->renderControl(screen)->drawBackground(*s, texture);
- XSetWindowBackgroundPixmap(**otk::display, win, s->pixmap());
+ if (texture.parentRelative())
+ XSetWindowBackgroundPixmap(**otk::display, win, ParentRelative);
+ else {
+ otk::display->renderControl(screen)->drawBackground(*s, texture);
+ XSetWindowBackgroundPixmap(**otk::display, win, s->pixmap());
+ }
XClearWindow(**otk::display, win);
if (*surface) delete *surface;
if (freedata) s->freePixelData();
render(screen, otk::Size(geom.grip_width(), geom.handle_height), _lgrip,
&_grip_sur, *(focus ? style->gripFocusBackground() :
style->gripUnfocusBackground()));
- XSetWindowBackgroundPixmap(**otk::display, _rgrip, _grip_sur->pixmap());
+ if ((focus ? style->gripFocusBackground() :
+ style->gripUnfocusBackground())->parentRelative())
+ XSetWindowBackgroundPixmap(**otk::display, _rgrip, ParentRelative);
+ else {
+ XSetWindowBackgroundPixmap(**otk::display, _rgrip, _grip_sur->pixmap());
+ }
XClearWindow(**otk::display, _rgrip);
}
otk::Surface *s = new otk::Surface(_client->screen(),
otk::Size(geom.label_width,
geom.label_height()));
- control->drawBackground(*s, *(_client->focused() ?
- style->labelFocusBackground() :
- style->labelUnfocusBackground()));
+ const otk::RenderTexture *tx = (_client->focused() ?
+ style->labelFocusBackground() :
+ style->labelUnfocusBackground());
+ if (tx->parentRelative()) {
+ otk::pixel32 *dest = s->pixelData(), *src;
+ int w = _title_sur->size().width();
+
+ src = _title_sur->pixelData() + w * geom.bevel + geom.title_x;
+
+ // get the background under the label
+ int xd = s->size().width();
+ int yd = s->size().height();
+ for (int y = 0; y < yd; ++y, src += w - xd)
+ for (int x = 0; x < xd; ++x, ++dest, ++src)
+ *dest = *src;
+ control->drawImage(*s, 0, 0, 0); // no image but draw the new background
+ } else
+ control->drawBackground(*s, *tx);
otk::ustring t = _client->title(); // the actual text to draw
int x = geom.bevel; // x coord for the text
- if (x * 2 > geom.label_width) return; // no room at all
-
- // find a string that will fit inside the area for text
- otk::ustring::size_type text_len = t.size();
- int length;
- int maxsize = geom.label_width - geom.bevel * 2;
+ if (x * 2 < geom.label_width) {
+ // find a string that will fit inside the area for text
+ otk::ustring::size_type text_len = t.size();
+ int length;
+ int maxsize = geom.label_width - geom.bevel * 2;
- do {
- t.resize(text_len);
- length = font->measureString(t); // this returns an unsigned, so check < 0
- if (length < 0) length = maxsize; // if the string's that long just adjust
- } while (length > maxsize && text_len-- > 0);
-
- if (text_len <= 0) return; // won't fit anything
-
- // justify the text
- switch (style->labelTextJustify()) {
- case otk::RenderStyle::RightBottomJustify:
- x += maxsize - length;
- break;
- case otk::RenderStyle::CenterJustify:
- x += (maxsize - length) / 2;
- break;
- case otk::RenderStyle::LeftTopJustify:
- break;
- }
+ do {
+ t.resize(text_len);
+ length = font->measureString(t);// this returns an unsigned, so check < 0
+ if (length < 0) length = maxsize;// if the string's that long just adjust
+ } while (length > maxsize && text_len-- > 0);
+
+ // justify the text
+ switch (style->labelTextJustify()) {
+ case otk::RenderStyle::RightBottomJustify:
+ x += maxsize - length;
+ break;
+ case otk::RenderStyle::CenterJustify:
+ x += (maxsize - length) / 2;
+ break;
+ case otk::RenderStyle::LeftTopJustify:
+ break;
+ }
- control->drawString(*s, *font, x, 0,
- *(_client->focused() ? style->textFocusColor() :
- style->textUnfocusColor()), t);
+ if (text_len > 0)
+ control->drawString(*s, *font, x, 0,
+ *(_client->focused() ? style->textFocusColor() :
+ style->textUnfocusColor()), t);
+ }
XSetWindowBackgroundPixmap(**otk::display, _label, s->pixmap());
XClearWindow(**otk::display, _label);
static void renderButton(int screen, bool focus, bool press, Window win,
otk::Surface **sur, int butsize,
- const otk::PixmapMask *mask)
+ const otk::PixmapMask *mask, int xoffset, int yoffset,
+ otk::Surface *bgsurface)
{
const otk::RenderStyle *style = otk::RenderStyle::style(screen);
const otk::RenderControl *control = otk::display->renderControl(screen);
const otk::RenderColor *maskcolor = (focus ?
style->buttonFocusColor() :
style->buttonUnfocusColor());
- control->drawBackground(*s, *tx);
+ if (tx->parentRelative()) {
+ otk::pixel32 *dest = s->pixelData(), *src;
+ int w = bgsurface->size().width();
+
+ src = bgsurface->pixelData() + w * yoffset + xoffset;
+
+ // get the background under the button
+ for (int y = 0; y < butsize; ++y, src += w - butsize)
+ for (int x = 0; x < butsize; ++x, ++dest, ++src)
+ *dest = *src;
+ control->drawImage(*s, 0, 0, 0); // no image but draw the new background
+ } else
+ control->drawBackground(*s, *tx);
control->drawMask(*s, *maskcolor, *mask);
XSetWindowBackgroundPixmap(**otk::display, win, s->pixmap());
bool press = _max_press || _client->maxVert() || _client->maxHorz();
renderButton(_client->screen(), _client->focused(), press, _max,
&_max_sur, geom.button_size,
- otk::RenderStyle::style(_client->screen())->maximizeMask());
+ otk::RenderStyle::style(_client->screen())->maximizeMask(),
+ geom.max_x, (geom.bevel + 1), _title_sur);
}
void Frame::renderDesk()
bool press = _desk_press || _client->desktop() == 0xffffffff;
renderButton(_client->screen(), _client->focused(), press, _desk,
&_desk_sur, geom.button_size,
- otk::RenderStyle::style(_client->screen())->alldesktopsMask());
+ otk::RenderStyle::style(_client->screen())->alldesktopsMask(),
+ geom.desktop_x, (geom.bevel + 1), _title_sur);
}
void Frame::renderIconify()
if (!(_decorations & Client::Decor_Iconify)) return;
renderButton(_client->screen(), _client->focused(), _iconify_press, _iconify,
&_iconify_sur, geom.button_size,
- otk::RenderStyle::style(_client->screen())->iconifyMask());
+ otk::RenderStyle::style(_client->screen())->iconifyMask(),
+ geom.iconify_x, (geom.bevel + 1), _title_sur);
}
void Frame::renderClose()
if (!(_decorations & Client::Decor_Close)) return;
renderButton(_client->screen(), _client->focused(), _close_press, _close,
&_close_sur, geom.button_size,
- otk::RenderStyle::style(_client->screen())->closeMask());
+ otk::RenderStyle::style(_client->screen())->closeMask(),
+ geom.close_x, (geom.bevel + 1), _title_sur);
}
void Frame::renderIcon()
const Icon *icon = _client->icon(otk::Size(geom.button_size,
geom.button_size));
control->drawImage(*s, icon->w, icon->h, icon->data);
+ if (!icon->data) {
+ Pixmap p = _client->pixmapIcon(), m = _client->pixmapIconMask();
+ if (p != None)
+ control->drawImage(*s, p, m);
+ }
XSetWindowBackgroundPixmap(**otk::display, _icon, s->pixmap());
XClearWindow(**otk::display, _icon);
geom.icon_x = x;
XMapWindow(**otk::display, _icon);
XMoveWindow(**otk::display, _icon, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 'd':
case 'D':
if (!d) break;
+ geom.desktop_x = x;
XMapWindow(**otk::display, _desk);
XMoveWindow(**otk::display, _desk, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 'i':
case 'I':
if (!i) break;
+ geom.iconify_x = x;
XMapWindow(**otk::display, _iconify);
XMoveWindow(**otk::display, _iconify, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 't':
case 'T':
if (!t) break;
+ geom.title_x = x;
XMapWindow(**otk::display, _label);
XMoveWindow(**otk::display, _label, x, geom.bevel);
- x += geom.label_width;
+ x += geom.label_width + geom.bevel;
break;
case 'm':
case 'M':
if (!m) break;
+ geom.max_x = x;
XMapWindow(**otk::display, _max);
XMoveWindow(**otk::display, _max, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
case 'c':
case 'C':
if (!c) break;
+ geom.close_x = x;
XMapWindow(**otk::display, _close);
XMoveWindow(**otk::display, _close, x, geom.bevel + 1);
- x += geom.button_size;
+ x += geom.button_size + geom.bevel;
break;
}
- x += geom.bevel;
}
}
_client->ignore_unmaps += 2;
// select the event mask on the client's parent (to receive config/map req's)
- XSelectInput(**otk::display, _plate, SubstructureRedirectMask);
+ // the ButtonPress is to catch clicks on the client border
+ XSelectInput(**otk::display, _plate, (SubstructureRedirectMask |
+ ButtonPressMask));
// map the client so it maps when the frame does
XMapWindow(**otk::display, _client->window());
projects / chaz / openbox / blobdiff