X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=464e1c6bb71f2440e2df6617f781710eb85ba26d;hb=80a6f06c0a3d6de2c7d94066c5a9764b97a600af;hp=11092333263858fc6791373151b1db88f403337a;hpb=6e93be1d2e07ace0c21bc040cfb2e4890667d033;p=chaz%2Fopenbox diff --git a/openbox/framerender.c b/openbox/framerender.c index 11092333..464e1c6b 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -1,111 +1,189 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + framerender.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003 Ben 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "frame.h" #include "openbox.h" #include "screen.h" +#include "client.h" #include "framerender.h" #include "render/theme.h" -static void framerender_label(Frame *self, Appearance *a); -static void framerender_icon(Frame *self, Appearance *a); -static void framerender_max(Frame *self, Appearance *a); -static void framerender_iconify(Frame *self, Appearance *a); -static void framerender_desk(Frame *self, Appearance *a); -static void framerender_shade(Frame *self, Appearance *a); -static void framerender_close(Frame *self, Appearance *a); +static void framerender_label(ObFrame *self, RrAppearance *a); +static void framerender_icon(ObFrame *self, RrAppearance *a); +static void framerender_max(ObFrame *self, RrAppearance *a); +static void framerender_iconify(ObFrame *self, RrAppearance *a); +static void framerender_desk(ObFrame *self, RrAppearance *a); +static void framerender_shade(ObFrame *self, RrAppearance *a); +static void framerender_close(ObFrame *self, RrAppearance *a); -void framerender_frame(Frame *self) +void framerender_frame(ObFrame *self) { - if (self->focused) - XSetWindowBorder(ob_display, self->plate, - theme_cb_focused_color->pixel); - else - XSetWindowBorder(ob_display, self->plate, - theme_cb_unfocused_color->pixel); - - if (self->client->decorations & Decor_Titlebar) { - Appearance *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->focused ? - (self->client->max_vert || self->client->max_horz ? - theme_a_focused_pressed_set_max : - (self->max_press ? - theme_a_focused_pressed_max : theme_a_focused_unpressed_max)) : - (self->client->max_vert || self->client->max_horz ? - theme_a_unfocused_pressed_set_max : - (self->max_press ? - theme_a_unfocused_pressed_max : - theme_a_unfocused_unpressed_max))); - n = self->a_icon; - i = (self->focused ? - (self->iconify_press ? - theme_a_focused_pressed_iconify : - theme_a_focused_unpressed_iconify) : - (self->iconify_press ? - theme_a_unfocused_pressed_iconify : - theme_a_unfocused_unpressed_iconify)); - d = (self->focused ? - (self->client->desktop == DESKTOP_ALL ? - theme_a_focused_pressed_set_desk : - (self->desk_press ? - theme_a_focused_pressed_desk : - theme_a_focused_unpressed_desk)) : - (self->client->desktop == DESKTOP_ALL ? - theme_a_unfocused_pressed_set_desk : - (self->desk_press ? - theme_a_unfocused_pressed_desk : - theme_a_unfocused_unpressed_desk))); - s = (self->focused ? - (self->client->shaded ? - theme_a_focused_pressed_set_shade : - (self->shade_press ? - theme_a_focused_pressed_shade : - theme_a_focused_unpressed_shade)) : - (self->client->shaded ? - theme_a_unfocused_pressed_set_shade : - (self->shade_press ? - theme_a_unfocused_pressed_shade : - theme_a_unfocused_unpressed_shade))); - c = (self->focused ? - (self->close_press ? - theme_a_focused_pressed_close : - theme_a_focused_unpressed_close) : - (self->close_press ? - theme_a_unfocused_pressed_close : - theme_a_unfocused_unpressed_close)); - - paint(self->title, t); + { + gulong px; + + 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); + } + + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { + RrAppearance *t, *l, *m, *n, *i, *d, *s, *c; + 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 ? + 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)))); + 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 ? + 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)))); + s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? + ob_rr_theme->a_disabled_focused_shade : + (self->client->shaded ? + 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)))); + 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 ? + 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) ? + 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 ? + 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) ? + ob_rr_theme->a_disabled_unfocused_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) ? + 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 = + 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); + /* set parents for any parent relative guys */ l->surface.parent = t; l->surface.parentx = self->label_x; - l->surface.parenty = theme_bevel; + l->surface.parenty = ob_rr_theme->padding; m->surface.parent = t; m->surface.parentx = self->max_x; - m->surface.parenty = theme_bevel + 1; + m->surface.parenty = ob_rr_theme->padding + 1; n->surface.parent = t; n->surface.parentx = self->icon_x; - n->surface.parenty = theme_bevel; + n->surface.parenty = ob_rr_theme->padding; i->surface.parent = t; i->surface.parentx = self->iconify_x; - i->surface.parenty = theme_bevel + 1; + i->surface.parenty = ob_rr_theme->padding + 1; d->surface.parent = t; d->surface.parentx = self->desk_x; - d->surface.parenty = theme_bevel + 1; + d->surface.parenty = ob_rr_theme->padding + 1; s->surface.parent = t; s->surface.parentx = self->shade_x; - s->surface.parenty = theme_bevel + 1; + s->surface.parenty = ob_rr_theme->padding + 1; c->surface.parent = t; c->surface.parentx = self->close_x; - c->surface.parenty = theme_bevel + 1; + c->surface.parenty = ob_rr_theme->padding + 1; framerender_label(self, l); framerender_max(self, m); @@ -116,105 +194,96 @@ void framerender_frame(Frame *self) framerender_close(self, c); } - if (self->client->decorations & Decor_Handle) { - Appearance *h, *g; + if (self->decorations & OB_FRAME_DECOR_HANDLE) { + RrAppearance *h, *g; h = (self->focused ? self->a_focused_handle : self->a_unfocused_handle); - g = (self->focused ? - theme_a_focused_grip : theme_a_unfocused_grip); - if (g->surface.grad == Background_ParentRelative) { - g->surface.parent = h; - paint(self->handle, h); - } else - paint(self->handle, h); + RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height); + + if (self->decorations & OB_FRAME_DECOR_GRIPS) { + g = (self->focused ? + ob_rr_theme->a_focused_grip : ob_rr_theme->a_unfocused_grip); + + if (g->surface.grad == RR_SURFACE_PARENTREL) + g->surface.parent = h; - g->surface.parentx = 0; - g->surface.parenty = 0; + g->surface.parentx = 0; + g->surface.parenty = 0; - paint(self->lgrip, g); + RrPaint(g, self->lgrip, + ob_rr_theme->grip_width, ob_rr_theme->handle_height); - g->surface.parentx = self->width - theme_grip_width; - g->surface.parenty = 0; + g->surface.parentx = self->width - ob_rr_theme->grip_width; + g->surface.parenty = 0; - paint(self->rgrip, g); + RrPaint(g, self->rgrip, + ob_rr_theme->grip_width, ob_rr_theme->handle_height); + } } + + XFlush(ob_display); } -static void framerender_label(Frame *self, Appearance *a) +static void framerender_label(ObFrame *self, RrAppearance *a) { if (self->label_x < 0) return; - - /* set the texture's text! */ a->texture[0].data.text.string = self->client->title; - RECT_SET(a->texture[0].position, 0, 0, - self->label_width, theme_label_height); - - paint(self->label, a); + RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height); } -static void framerender_icon(Frame *self, Appearance *a) +static void framerender_icon(ObFrame *self, RrAppearance *a) { + const ObClientIcon *icon; + if (self->icon_x < 0) return; - if (self->client->nicons) { - Icon *icon = client_icon(self->client, - theme_button_size + 2, theme_button_size + 2); - a->texture[0].type = RGBA; + icon = client_icon(self->client, + ob_rr_theme->button_size + 2, + ob_rr_theme->button_size + 2); + if (icon) { + a->texture[0].type = RR_TEXTURE_RGBA; a->texture[0].data.rgba.width = icon->width; a->texture[0].data.rgba.height = icon->height; a->texture[0].data.rgba.data = icon->data; - RECT_SET(self->a_icon->texture[0].position, 0, 0, - theme_button_size + 2, theme_button_size + 2); } else - a->texture[0].type = NoTexture; + a->texture[0].type = RR_TEXTURE_NONE; - paint(self->icon, a); + RrPaint(a, self->icon, + ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); } -static void framerender_max(Frame *self, Appearance *a) +static void framerender_max(ObFrame *self, RrAppearance *a) { if (self->max_x < 0) return; - - RECT_SET(a->texture[0].position, 0, 0, - theme_button_size, theme_button_size); - paint(self->max, a); + RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size); } -static void framerender_iconify(Frame *self, Appearance *a) +static void framerender_iconify(ObFrame *self, RrAppearance *a) { if (self->iconify_x < 0) return; - - RECT_SET(a->texture[0].position, 0, 0, - theme_button_size, theme_button_size); - paint(self->iconify, a); + RrPaint(a, self->iconify, + ob_rr_theme->button_size, ob_rr_theme->button_size); } -static void framerender_desk(Frame *self, Appearance *a) +static void framerender_desk(ObFrame *self, RrAppearance *a) { if (self->desk_x < 0) return; - - RECT_SET(a->texture[0].position, 0, 0, - theme_button_size, theme_button_size); - paint(self->desk, a); + RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size); } -static void framerender_shade(Frame *self, Appearance *a) +static void framerender_shade(ObFrame *self, RrAppearance *a) { if (self->shade_x < 0) return; - - RECT_SET(a->texture[0].position, 0, 0, - theme_button_size, theme_button_size); - paint(self->shade, a); + RrPaint(a, self->shade, + ob_rr_theme->button_size, ob_rr_theme->button_size); } -static void framerender_close(Frame *self, Appearance *a) +static void framerender_close(ObFrame *self, RrAppearance *a) { if (self->close_x < 0) return; - - RECT_SET(a->texture[0].position, 0, 0, - theme_button_size, theme_button_size); - paint(self->close, a); + RrPaint(a, self->close, + ob_rr_theme->button_size, ob_rr_theme->button_size); }