X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=041e6d1775c2dbd3e329732ae5256e59f38581a5;hb=HEAD;hp=a9025b302cf04005e65fb83de2f903a256e922b2;hpb=420cbea6cc911296fdee62d0af336f4eda48d303;p=chaz%2Fopenbox diff --git a/openbox/framerender.c b/openbox/framerender.c index a9025b30..041e6d17 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -1,9 +1,28 @@ +/* -*- 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-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 + 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" +#include "obrender/theme.h" static void framerender_label(ObFrame *self, RrAppearance *a); static void framerender_icon(ObFrame *self, RrAppearance *a); @@ -15,156 +34,276 @@ static void framerender_close(ObFrame *self, RrAppearance *a); void framerender_frame(ObFrame *self) { + if (frame_iconify_animating(self)) + return; /* delay redrawing until the animation is done */ + if (!self->need_render) + return; + if (!self->visible) + return; + self->need_render = FALSE; + { - unsigned long px; + 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); + + XSetWindowBackground(obt_display, self->backback, px); + XClearWindow(obt_display, self->backback); + XSetWindowBackground(obt_display, self->innerleft, px); + XClearWindow(obt_display, self->innerleft); + XSetWindowBackground(obt_display, self->innertop, px); + XClearWindow(obt_display, self->innertop); + XSetWindowBackground(obt_display, self->innerright, px); + XClearWindow(obt_display, self->innerright); + XSetWindowBackground(obt_display, self->innerbottom, px); + XClearWindow(obt_display, self->innerbottom); + XSetWindowBackground(obt_display, self->innerbll, px); + XClearWindow(obt_display, self->innerbll); + XSetWindowBackground(obt_display, self->innerbrr, px); + XClearWindow(obt_display, self->innerbrr); + XSetWindowBackground(obt_display, self->innerblb, px); + XClearWindow(obt_display, self->innerblb); + XSetWindowBackground(obt_display, self->innerbrb, px); + XClearWindow(obt_display, self->innerbrb); + + px = RrColorPixel(self->focused ? + (self->client->undecorated ? + ob_rr_theme->frame_undecorated_focused_border_color : + ob_rr_theme->frame_focused_border_color) : + (self->client->undecorated ? + ob_rr_theme->frame_undecorated_unfocused_border_color : + ob_rr_theme->frame_unfocused_border_color)); + + XSetWindowBackground(obt_display, self->left, px); + XClearWindow(obt_display, self->left); + XSetWindowBackground(obt_display, self->right, px); + XClearWindow(obt_display, self->right); + + XSetWindowBackground(obt_display, self->titleleft, px); + XClearWindow(obt_display, self->titleleft); + XSetWindowBackground(obt_display, self->titletop, px); + XClearWindow(obt_display, self->titletop); + XSetWindowBackground(obt_display, self->titletopleft, px); + XClearWindow(obt_display, self->titletopleft); + XSetWindowBackground(obt_display, self->titletopright, px); + XClearWindow(obt_display, self->titletopright); + XSetWindowBackground(obt_display, self->titleright, px); + XClearWindow(obt_display, self->titleright); + + XSetWindowBackground(obt_display, self->handleleft, px); + XClearWindow(obt_display, self->handleleft); + XSetWindowBackground(obt_display, self->handletop, px); + XClearWindow(obt_display, self->handletop); + XSetWindowBackground(obt_display, self->handleright, px); + XClearWindow(obt_display, self->handleright); + XSetWindowBackground(obt_display, self->handlebottom, px); + XClearWindow(obt_display, self->handlebottom); + + XSetWindowBackground(obt_display, self->lgripleft, px); + XClearWindow(obt_display, self->lgripleft); + XSetWindowBackground(obt_display, self->lgriptop, px); + XClearWindow(obt_display, self->lgriptop); + XSetWindowBackground(obt_display, self->lgripbottom, px); + XClearWindow(obt_display, self->lgripbottom); + + XSetWindowBackground(obt_display, self->rgripright, px); + XClearWindow(obt_display, self->rgripright); + XSetWindowBackground(obt_display, self->rgriptop, px); + XClearWindow(obt_display, self->rgriptop); + XSetWindowBackground(obt_display, self->rgripbottom, px); + XClearWindow(obt_display, self->rgripbottom); + + /* don't use the separator color for shaded windows */ + if (!self->client->shaded) + px = (self->focused ? + RrColorPixel(ob_rr_theme->title_separator_focused_color) : + RrColorPixel(ob_rr_theme->title_separator_unfocused_color)); + + XSetWindowBackground(obt_display, self->titlebottom, px); + XClearWindow(obt_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 ? - 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 ? - 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)))); + RrAppearance *t, *l, *m, *n, *i, *d, *s, *c, *clear; + if (self->focused) { + t = ob_rr_theme->a_focused_title; + l = ob_rr_theme->a_focused_label; + m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? + ob_rr_theme->btn_max->a_disabled_focused : + (self->client->max_vert || self->client->max_horz ? + (self->max_press ? + ob_rr_theme->btn_max->a_toggled_focused_pressed : + (self->max_hover ? + ob_rr_theme->btn_max->a_toggled_hover_focused : + ob_rr_theme->btn_max->a_toggled_focused_unpressed)) : + (self->max_press ? + ob_rr_theme->btn_max->a_focused_pressed : + (self->max_hover ? + ob_rr_theme->btn_max->a_hover_focused : + ob_rr_theme->btn_max->a_focused_unpressed)))); + n = ob_rr_theme->a_icon; + i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? + ob_rr_theme->btn_iconify->a_disabled_focused : + (self->iconify_press ? + ob_rr_theme->btn_iconify->a_focused_pressed : + (self->iconify_hover ? + ob_rr_theme->btn_iconify->a_hover_focused : + ob_rr_theme->btn_iconify->a_focused_unpressed))); + d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? + ob_rr_theme->btn_desk->a_disabled_focused : + (self->client->desktop == DESKTOP_ALL ? + (self->desk_press ? + ob_rr_theme->btn_desk->a_toggled_focused_pressed : + (self->desk_hover ? + ob_rr_theme->btn_desk->a_toggled_hover_focused : + ob_rr_theme->btn_desk->a_toggled_focused_unpressed)) : + (self->desk_press ? + ob_rr_theme->btn_desk->a_focused_pressed : + (self->desk_hover ? + ob_rr_theme->btn_desk->a_hover_focused : + ob_rr_theme->btn_desk->a_focused_unpressed)))); + s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? + ob_rr_theme->btn_shade->a_disabled_focused : + (self->client->shaded ? + (self->shade_press ? + ob_rr_theme->btn_shade->a_toggled_focused_pressed : + (self->shade_hover ? + ob_rr_theme->btn_shade->a_toggled_hover_focused : + ob_rr_theme->btn_shade->a_toggled_focused_unpressed)) : + (self->shade_press ? + ob_rr_theme->btn_shade->a_focused_pressed : + (self->shade_hover ? + ob_rr_theme->btn_shade->a_hover_focused : + ob_rr_theme->btn_shade->a_focused_unpressed)))); + c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? + ob_rr_theme->btn_close->a_disabled_focused : + (self->close_press ? + ob_rr_theme->btn_close->a_focused_pressed : + (self->close_hover ? + ob_rr_theme->btn_close->a_hover_focused : + ob_rr_theme->btn_close->a_focused_unpressed))); + } else { + t = ob_rr_theme->a_unfocused_title; + l = ob_rr_theme->a_unfocused_label; + m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? + ob_rr_theme->btn_max->a_disabled_unfocused : + (self->client->max_vert || self->client->max_horz ? + (self->max_press ? + ob_rr_theme->btn_max->a_toggled_unfocused_pressed : + (self->max_hover ? + ob_rr_theme->btn_max->a_toggled_hover_unfocused : + ob_rr_theme->btn_max->a_toggled_unfocused_unpressed)) : + (self->max_press ? + ob_rr_theme->btn_max->a_unfocused_pressed : + (self->max_hover ? + ob_rr_theme->btn_max->a_hover_unfocused : + ob_rr_theme->btn_max->a_unfocused_unpressed)))); + n = ob_rr_theme->a_icon; + i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? + ob_rr_theme->btn_iconify->a_disabled_unfocused : + (self->iconify_press ? + ob_rr_theme->btn_iconify->a_unfocused_pressed : + (self->iconify_hover ? + ob_rr_theme->btn_iconify->a_hover_unfocused : + ob_rr_theme->btn_iconify->a_unfocused_unpressed))); + d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? + ob_rr_theme->btn_desk->a_disabled_unfocused : + (self->client->desktop == DESKTOP_ALL ? + (self->desk_press ? + ob_rr_theme->btn_desk->a_toggled_unfocused_pressed : + (self->desk_hover ? + ob_rr_theme->btn_desk->a_toggled_hover_unfocused : + ob_rr_theme->btn_desk->a_toggled_unfocused_unpressed)) : + (self->desk_press ? + ob_rr_theme->btn_desk->a_unfocused_pressed : + (self->desk_hover ? + ob_rr_theme->btn_desk->a_hover_unfocused : + ob_rr_theme->btn_desk->a_unfocused_unpressed)))); + s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? + ob_rr_theme->btn_shade->a_disabled_unfocused : + (self->client->shaded ? + (self->shade_press ? + ob_rr_theme->btn_shade->a_toggled_unfocused_pressed : + (self->shade_hover ? + ob_rr_theme->btn_shade->a_toggled_hover_unfocused : + ob_rr_theme->btn_shade->a_toggled_unfocused_unpressed)) : + (self->shade_press ? + ob_rr_theme->btn_shade->a_unfocused_pressed : + (self->shade_hover ? + ob_rr_theme->btn_shade->a_hover_unfocused : + ob_rr_theme->btn_shade->a_unfocused_unpressed)))); + c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? + ob_rr_theme->btn_close->a_disabled_unfocused : + (self->close_press ? + ob_rr_theme->btn_close->a_unfocused_pressed : + (self->close_hover ? + ob_rr_theme->btn_close->a_hover_unfocused : + ob_rr_theme->btn_close->a_unfocused_unpressed))); + } + clear = ob_rr_theme->a_clear; 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; + clear->surface.parent = t; + clear->surface.parenty = 0; + + clear->surface.parentx = ob_rr_theme->grip_width; - RrPaint(ob_rr_theme->a_clear, self->tlresize, - ob_rr_theme->grip_width, ob_rr_theme->handle_height); + RrPaint(clear, self->topresize, + self->width - ob_rr_theme->grip_width * 2, + ob_rr_theme->paddingy + 1); - ob_rr_theme->a_clear->surface.parentx = - self->width - ob_rr_theme->grip_width; + clear->surface.parentx = 0; - 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(clear, self->tltresize, + ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); + if (ob_rr_theme->title_height > 0) + RrPaint(clear, self->tllresize, + ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); + clear->surface.parentx = self->width - ob_rr_theme->grip_width; + + if (ob_rr_theme->grip_width > 0) + RrPaint(clear, self->trtresize, + ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); + + clear->surface.parentx = self->width - (ob_rr_theme->paddingx + 1); + + if (ob_rr_theme->title_height > 0) + RrPaint(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->bevel; + l->surface.parenty = ob_rr_theme->paddingy; m->surface.parent = t; m->surface.parentx = self->max_x; - m->surface.parenty = ob_rr_theme->bevel + 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->bevel; + n->surface.parenty = ob_rr_theme->paddingy; i->surface.parent = t; i->surface.parentx = self->iconify_x; - i->surface.parenty = ob_rr_theme->bevel + 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->bevel + 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->bevel + 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->bevel + 1; + c->surface.parenty = ob_rr_theme->paddingy + 1; framerender_label(self, l); framerender_max(self, m); @@ -175,11 +314,13 @@ 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 ? - self->a_focused_handle : self->a_unfocused_handle); + ob_rr_theme->a_focused_handle : ob_rr_theme->a_unfocused_handle); RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height); @@ -204,12 +345,12 @@ void framerender_frame(ObFrame *self) } } - XFlush(ob_display); + XFlush(obt_display); } 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); @@ -217,18 +358,21 @@ static void framerender_label(ObFrame *self, RrAppearance *a) static void framerender_icon(ObFrame *self, RrAppearance *a) { - if (self->icon_x < 0) return; - - if (self->client->nicons) { - ObClientIcon *icon = client_icon(self->client, - ob_rr_theme->button_size + 2, - ob_rr_theme->button_size + 2); - 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; - } else + RrImage *icon; + + if (!self->icon_on) return; + + icon = client_icon(self->client); + + if (icon) { + RrAppearanceClearTextures(a); + a->texture[0].type = RR_TEXTURE_IMAGE; + a->texture[0].data.image.alpha = 0xff; + a->texture[0].data.image.image = icon; + } else { + RrAppearanceClearTextures(a); a->texture[0].type = RR_TEXTURE_NONE; + } RrPaint(a, self->icon, ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); @@ -236,33 +380,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); }