X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=e4f945a0eb60a17ba5cf12c9220e0a1605575799;hb=0353b979c66bc07432296d80acc61b6bbef5f623;hp=9d32d23ade19494057540824396859c0b63a6858;hpb=5c95d2ffeabe45a6aacf37d0a1c1b0dfe83b2ba5;p=chaz%2Fopenbox diff --git a/openbox/framerender.c b/openbox/framerender.c index 9d32d23a..e4f945a0 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -1,7 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- framerender.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,154 +40,217 @@ void framerender_frame(ObFrame *self) px = (self->focused ? RrColorPixel(ob_rr_theme->cb_focused_color) : RrColorPixel(ob_rr_theme->cb_unfocused_color)); - XSetWindowBackground(ob_display, self->plate, px); - XClearWindow(ob_display, self->plate); + XSetWindowBackground(ob_display, self->inner, px); + XClearWindow(ob_display, self->inner); + + px = (self->focused ? + RrColorPixel(ob_rr_theme->frame_focused_border_color) : + RrColorPixel(ob_rr_theme->frame_unfocused_border_color)); + XSetWindowBorder(ob_display, self->handle, px); + XSetWindowBorder(ob_display, self->rgrip, px); + XSetWindowBorder(ob_display, self->lgrip, px); + + XSetWindowBackground(ob_display, self->leftresize, px); + XClearWindow(ob_display, self->leftresize); + XSetWindowBackground(ob_display, self->rightresize, px); + XClearWindow(ob_display, self->rightresize); + + XSetWindowBackground(ob_display, self->titleleft, px); + XClearWindow(ob_display, self->titleleft); + XSetWindowBackground(ob_display, self->titletop, px); + XClearWindow(ob_display, self->titletop); + XSetWindowBackground(ob_display, self->titletopleft, px); + XClearWindow(ob_display, self->titletopleft); + XSetWindowBackground(ob_display, self->titletopright, px); + XClearWindow(ob_display, self->titletopright); + XSetWindowBackground(ob_display, self->titleright, px); + XClearWindow(ob_display, self->titleright); + XSetWindowBackground(ob_display, self->titlebottom, px); + XClearWindow(ob_display, self->titlebottom); } if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { RrAppearance *t, *l, *m, *n, *i, *d, *s, *c; - - t = (self->focused ? - self->a_focused_title : self->a_unfocused_title); - l = (self->focused ? - self->a_focused_label : self->a_unfocused_label); - m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? - (self->focused ? - ob_rr_theme->a_disabled_focused_max : - ob_rr_theme->a_disabled_unfocused_max) : - (self->focused ? - (self->client->max_vert || self->client->max_horz ? - ob_rr_theme->a_toggled_focused_max : - (self->max_press ? - ob_rr_theme->a_focused_pressed_max : - (self->max_hover ? - ob_rr_theme->a_hover_focused_max : - ob_rr_theme->a_focused_unpressed_max))) : - (self->client->max_vert || self->client->max_horz ? - ob_rr_theme->a_toggled_unfocused_max : - (self->max_press ? - ob_rr_theme->a_unfocused_pressed_max : - (self->max_hover ? - ob_rr_theme->a_hover_unfocused_max : - ob_rr_theme->a_unfocused_unpressed_max))))); - n = self->a_icon; - i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? - (self->focused ? - ob_rr_theme->a_disabled_focused_iconify : - ob_rr_theme->a_disabled_unfocused_iconify) : - (self->focused ? - (self->iconify_press ? - ob_rr_theme->a_focused_pressed_iconify : - (self->iconify_hover ? - ob_rr_theme->a_hover_focused_iconify : - ob_rr_theme->a_focused_unpressed_iconify)) : - (self->iconify_press ? - ob_rr_theme->a_unfocused_pressed_iconify : - (self->iconify_hover ? - ob_rr_theme->a_hover_unfocused_iconify : - ob_rr_theme->a_unfocused_unpressed_iconify)))); - d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? - (self->focused ? - ob_rr_theme->a_disabled_focused_desk : - ob_rr_theme->a_disabled_unfocused_desk) : - (self->focused ? - (self->client->desktop == DESKTOP_ALL ? - (self->desk_press ? - ob_rr_theme->a_toggled_focused_pressed_desk : - ob_rr_theme->a_toggled_focused_desk) : - (self->desk_press ? - ob_rr_theme->a_focused_pressed_desk : - (self->desk_hover ? - ob_rr_theme->a_hover_focused_desk : - ob_rr_theme->a_focused_unpressed_desk))) : - (self->client->desktop == DESKTOP_ALL ? - ob_rr_theme->a_toggled_unfocused_desk : - (self->desk_press ? - ob_rr_theme->a_unfocused_pressed_desk : - (self->desk_hover ? - ob_rr_theme->a_hover_unfocused_desk : - ob_rr_theme->a_unfocused_unpressed_desk))))); - s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? - (self->focused ? - ob_rr_theme->a_disabled_focused_shade : - ob_rr_theme->a_disabled_unfocused_shade) : - (self->focused ? - (self->client->shaded ? - (self->shade_press ? - ob_rr_theme->a_toggled_focused_pressed_shade : - ob_rr_theme->a_toggled_focused_shade) : - (self->shade_press ? - ob_rr_theme->a_focused_pressed_shade : - (self->shade_hover ? - ob_rr_theme->a_hover_focused_shade : - ob_rr_theme->a_focused_unpressed_shade))) : - (self->client->shaded ? - ob_rr_theme->a_toggled_unfocused_shade : - (self->shade_press ? - ob_rr_theme->a_unfocused_pressed_shade : - (self->shade_hover ? - ob_rr_theme->a_hover_unfocused_shade : - ob_rr_theme->a_unfocused_unpressed_shade))))); - c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? - (self->focused ? - ob_rr_theme->a_disabled_focused_close : - ob_rr_theme->a_disabled_unfocused_close) : - (self->focused ? - (self->close_press ? - ob_rr_theme->a_focused_pressed_close : - (self->close_hover ? - ob_rr_theme->a_hover_focused_close : - ob_rr_theme->a_focused_unpressed_close)) : - (self->close_press ? - ob_rr_theme->a_unfocused_pressed_close : - (self->close_hover ? - ob_rr_theme->a_hover_unfocused_close : - ob_rr_theme->a_unfocused_unpressed_close)))); + if (self->focused) { + + t = self->a_focused_title; + l = self->a_focused_label; + + m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? + ob_rr_theme->a_disabled_focused_max : + (self->client->max_vert || self->client->max_horz ? + (self->max_press ? + ob_rr_theme->a_toggled_focused_pressed_max : + (self->max_hover ? + ob_rr_theme->a_toggled_hover_focused_max : + ob_rr_theme->a_toggled_focused_unpressed_max)) : + (self->max_press ? + ob_rr_theme->a_focused_pressed_max : + (self->max_hover ? + ob_rr_theme->a_hover_focused_max : + ob_rr_theme->a_focused_unpressed_max)))); + n = self->a_icon; + i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? + ob_rr_theme->a_disabled_focused_iconify : + (self->iconify_press ? + ob_rr_theme->a_focused_pressed_iconify : + (self->iconify_hover ? + ob_rr_theme->a_hover_focused_iconify : + ob_rr_theme->a_focused_unpressed_iconify))); + d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? + ob_rr_theme->a_disabled_focused_desk : + (self->client->desktop == DESKTOP_ALL ? + (self->desk_press ? + ob_rr_theme->a_toggled_focused_pressed_desk : + (self->desk_hover ? + ob_rr_theme->a_toggled_hover_focused_desk : + ob_rr_theme->a_toggled_focused_unpressed_desk)) : + (self->desk_press ? + ob_rr_theme->a_focused_pressed_desk : + (self->desk_hover ? + ob_rr_theme->a_hover_focused_desk : + ob_rr_theme->a_focused_unpressed_desk)))); + s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? + ob_rr_theme->a_disabled_focused_shade : + (self->client->shaded ? + (self->shade_press ? + ob_rr_theme->a_toggled_focused_pressed_shade : + (self->shade_hover ? + ob_rr_theme->a_toggled_hover_focused_shade : + ob_rr_theme->a_toggled_focused_unpressed_shade)) : + (self->shade_press ? + ob_rr_theme->a_focused_pressed_shade : + (self->shade_hover ? + ob_rr_theme->a_hover_focused_shade : + ob_rr_theme->a_focused_unpressed_shade)))); + c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? + ob_rr_theme->a_disabled_focused_close : + (self->close_press ? + ob_rr_theme->a_focused_pressed_close : + (self->close_hover ? + ob_rr_theme->a_hover_focused_close : + ob_rr_theme->a_focused_unpressed_close))); + } else { + t = self->a_unfocused_title; + l = self->a_unfocused_label; + m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? + ob_rr_theme->a_disabled_unfocused_max : + (self->client->max_vert || self->client->max_horz ? + (self->max_press ? + ob_rr_theme->a_toggled_unfocused_pressed_max : + (self->max_hover ? + ob_rr_theme->a_toggled_hover_unfocused_max : + ob_rr_theme->a_toggled_unfocused_unpressed_max)) : + (self->max_press ? + ob_rr_theme->a_unfocused_pressed_max : + (self->max_hover ? + ob_rr_theme->a_hover_unfocused_max : + ob_rr_theme->a_unfocused_unpressed_max)))); + n = self->a_icon; + i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? + ob_rr_theme->a_disabled_unfocused_iconify : + (self->iconify_press ? + ob_rr_theme->a_unfocused_pressed_iconify : + (self->iconify_hover ? + ob_rr_theme->a_hover_unfocused_iconify : + ob_rr_theme->a_unfocused_unpressed_iconify))); + d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? + ob_rr_theme->a_disabled_unfocused_desk : + (self->client->desktop == DESKTOP_ALL ? + (self->desk_press ? + ob_rr_theme->a_toggled_unfocused_pressed_desk : + (self->desk_hover ? + ob_rr_theme->a_toggled_hover_unfocused_desk : + ob_rr_theme->a_toggled_unfocused_unpressed_desk)) : + (self->desk_press ? + ob_rr_theme->a_unfocused_pressed_desk : + (self->desk_hover ? + ob_rr_theme->a_hover_unfocused_desk : + ob_rr_theme->a_unfocused_unpressed_desk)))); + s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? + ob_rr_theme->a_disabled_unfocused_shade : + (self->client->shaded ? + (self->shade_press ? + ob_rr_theme->a_toggled_unfocused_pressed_shade : + (self->shade_hover ? + ob_rr_theme->a_toggled_hover_unfocused_shade : + ob_rr_theme->a_toggled_unfocused_unpressed_shade)) : + (self->shade_press ? + ob_rr_theme->a_unfocused_pressed_shade : + (self->shade_hover ? + ob_rr_theme->a_hover_unfocused_shade : + ob_rr_theme->a_unfocused_unpressed_shade)))); + c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? + ob_rr_theme->a_disabled_unfocused_close : + (self->close_press ? + ob_rr_theme->a_unfocused_pressed_close : + (self->close_hover ? + ob_rr_theme->a_hover_unfocused_close : + ob_rr_theme->a_unfocused_unpressed_close))); + } RrPaint(t, self->title, self->width, ob_rr_theme->title_height); ob_rr_theme->a_clear->surface.parent = t; - ob_rr_theme->a_clear->surface.parentx = 0; ob_rr_theme->a_clear->surface.parenty = 0; - RrPaint(ob_rr_theme->a_clear, self->tlresize, - ob_rr_theme->grip_width, ob_rr_theme->handle_height); + ob_rr_theme->a_clear->surface.parentx = ob_rr_theme->grip_width + + self->bwidth; + RrPaint(ob_rr_theme->a_clear, self->topresize, + self->width - (ob_rr_theme->grip_width + self->bwidth) * 2, + ob_rr_theme->paddingy + 1); + + ob_rr_theme->a_clear->surface.parentx = 0; + + if (ob_rr_theme->grip_width > 0) + RrPaint(ob_rr_theme->a_clear, self->tltresize, + ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); + if (ob_rr_theme->title_height > 0) + RrPaint(ob_rr_theme->a_clear, self->tllresize, + ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); ob_rr_theme->a_clear->surface.parentx = self->width - ob_rr_theme->grip_width; - RrPaint(ob_rr_theme->a_clear, self->trresize, - ob_rr_theme->grip_width, ob_rr_theme->handle_height); + if (ob_rr_theme->grip_width > 0) + RrPaint(ob_rr_theme->a_clear, self->trtresize, + ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); + ob_rr_theme->a_clear->surface.parentx = + self->width - (ob_rr_theme->paddingx + 1); + + if (ob_rr_theme->title_height > 0) + RrPaint(ob_rr_theme->a_clear, self->trrresize, + ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); /* set parents for any parent relative guys */ l->surface.parent = t; l->surface.parentx = self->label_x; - l->surface.parenty = ob_rr_theme->padding; + l->surface.parenty = ob_rr_theme->paddingy; m->surface.parent = t; m->surface.parentx = self->max_x; - m->surface.parenty = ob_rr_theme->padding + 1; + m->surface.parenty = ob_rr_theme->paddingy + 1; n->surface.parent = t; n->surface.parentx = self->icon_x; - n->surface.parenty = ob_rr_theme->padding; + n->surface.parenty = ob_rr_theme->paddingy; i->surface.parent = t; i->surface.parentx = self->iconify_x; - i->surface.parenty = ob_rr_theme->padding + 1; + i->surface.parenty = ob_rr_theme->paddingy + 1; d->surface.parent = t; d->surface.parentx = self->desk_x; - d->surface.parenty = ob_rr_theme->padding + 1; + d->surface.parenty = ob_rr_theme->paddingy + 1; s->surface.parent = t; s->surface.parentx = self->shade_x; - s->surface.parenty = ob_rr_theme->padding + 1; + s->surface.parenty = ob_rr_theme->paddingy + 1; c->surface.parent = t; c->surface.parentx = self->close_x; - c->surface.parenty = ob_rr_theme->padding + 1; + c->surface.parenty = ob_rr_theme->paddingy + 1; framerender_label(self, l); framerender_max(self, m); @@ -197,7 +261,9 @@ void framerender_frame(ObFrame *self) framerender_close(self, c); } - if (self->decorations & OB_FRAME_DECOR_HANDLE) { + if (self->decorations & OB_FRAME_DECOR_HANDLE && + ob_rr_theme->handle_height > 0) + { RrAppearance *h, *g; h = (self->focused ? @@ -231,7 +297,7 @@ void framerender_frame(ObFrame *self) static void framerender_label(ObFrame *self, RrAppearance *a) { - if (self->label_x < 0) return; + if (!self->label_on) return; /* set the texture's text! */ a->texture[0].data.text.string = self->client->title; RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height); @@ -241,7 +307,7 @@ static void framerender_icon(ObFrame *self, RrAppearance *a) { const ObClientIcon *icon; - if (self->icon_x < 0) return; + if (!self->icon_on) return; icon = client_icon(self->client, ob_rr_theme->button_size + 2, @@ -260,33 +326,33 @@ static void framerender_icon(ObFrame *self, RrAppearance *a) static void framerender_max(ObFrame *self, RrAppearance *a) { - if (self->max_x < 0) return; + if (!self->max_on) return; RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_iconify(ObFrame *self, RrAppearance *a) { - if (self->iconify_x < 0) return; + if (!self->iconify_on) return; RrPaint(a, self->iconify, ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_desk(ObFrame *self, RrAppearance *a) { - if (self->desk_x < 0) return; + if (!self->desk_on) return; RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_shade(ObFrame *self, RrAppearance *a) { - if (self->shade_x < 0) return; + if (!self->shade_on) return; RrPaint(a, self->shade, ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_close(ObFrame *self, RrAppearance *a) { - if (self->close_x < 0) return; + if (!self->close_on) return; RrPaint(a, self->close, ob_rr_theme->button_size, ob_rr_theme->button_size); }