#include "mainloop.h"
#include "focus_cycle.h"
#include "focus_cycle_indicator.h"
-#include "composite.h"
#include "moveresize.h"
#include "screen.h"
#include "render/theme.h"
static void set_theme_statics(ObFrame *self);
static void free_theme_statics(ObFrame *self);
static gboolean frame_animate_iconify(gpointer self);
-static void frame_adjust_shape(ObFrame *self);
static void frame_adjust_cursors(ObFrame *self);
-static void frame_get_offscreen_buffer(ObFrame *self);
-static void frame_free_offscreen_buffer(ObFrame *self);
static Window createWindow(Window parent, Visual *visual,
gulong mask, XSetWindowAttributes *attrib)
}
+static Visual *check_32bit_client(ObClient *c)
+{
+ XWindowAttributes wattrib;
+ Status ret;
+
+ /* we're already running at 32 bit depth, yay. we don't need to use their
+ visual */
+ if (RrDepth(ob_rr_inst) == 32)
+ return NULL;
+
+ ret = XGetWindowAttributes(ob_display, c->window, &wattrib);
+ g_assert(ret != BadDrawable);
+ g_assert(ret != BadWindow);
+
+ if (wattrib.depth == 32)
+ return wattrib.visual;
+ return NULL;
+}
+
ObFrame *frame_new(ObClient *client)
{
XSetWindowAttributes attrib;
gulong mask;
ObFrame *self;
- XWindowAttributes wattrib;
- Status ret;
+ Visual *visual;
self = g_new0(ObFrame, 1);
self->client = client;
- ret = XGetWindowAttributes(ob_display, client->window, &wattrib);
- g_assert(ret != BadDrawable);
- g_assert(ret != BadWindow);
- self->has_alpha = composite_window_has_alpha(wattrib.visual);
+ visual = check_32bit_client(client);
/* create the non-visible decor windows */
mask = 0;
- if (self->has_alpha) {
- /* the colormap/backpixel/borderpixel are required for supporting
- windows with 32bit visuals */
- mask = CWColormap | CWBackPixel | CWBorderPixel;
+ if (visual) {
+ /* client has a 32-bit visual */
+ mask |= CWColormap | CWBackPixel | CWBorderPixel;
/* create a colormap with the visual */
self->colormap = attrib.colormap =
XCreateColormap(ob_display,
RootWindow(ob_display, ob_screen),
- wattrib.visual, AllocNone);
+ visual, AllocNone);
attrib.background_pixel = BlackPixel(ob_display, ob_screen);
attrib.border_pixel = BlackPixel(ob_display, ob_screen);
}
-
- self->window = createWindow(RootWindow(ob_display, ob_screen),
- (self->has_alpha ? wattrib.visual : NULL),
+ self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
mask, &attrib);
/* create the visible decor windows */
mask = 0;
- if (self->has_alpha) {
+ if (visual) {
/* client has a 32-bit visual */
mask |= CWColormap | CWBackPixel | CWBorderPixel;
attrib.colormap = RrColormap(ob_rr_inst);
XDestroyWindow(ob_display, self->window);
if (self->colormap)
XFreeColormap(ob_display, self->colormap);
- frame_free_offscreen_buffer(self);
g_free(self);
}
framerender_frame(self);
XMapWindow(ob_display, self->client->window);
XMapWindow(ob_display, self->window);
-
- frame_get_offscreen_buffer(self);
}
}
self->visible = FALSE;
if (!frame_iconify_animating(self))
XUnmapWindow(ob_display, self->window);
-
/* we unmap the client itself so that we can get MapRequest
events, and because the ICCCM tells us to! */
XUnmapWindow(ob_display, self->client->window);
self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
self->cbwidth_t + self->bwidth,
self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
- self->cbwidth_b + (!self->max_horz || !self->max_vert ?
- self->bwidth : 0));
+ self->cbwidth_b + (!self->max_horz || !self->max_vert ? self->bwidth : 0));
if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
self->size.top += ob_rr_theme->title_height + self->bwidth;
self->need_render = TRUE;
framerender_frame(self);
frame_adjust_shape(self);
-
- /* the offscreen buffer's shape needs to match */
- frame_get_offscreen_buffer(self);
}
if (!STRUT_EQUAL(self->size, oldsize)) {
/* reparent the client to the frame */
XReparentWindow(ob_display, self->client->window, self->window, 0, 0);
- /* enable the offscreen composite buffer for the client window */
- composite_enable_for_window(self->client->window);
-
/*
When reparenting the client window, it is usually not mapped yet, since
this occurs from a MapRequest. However, in the case where Openbox is
need to send the synthetic configurenotify, since apps may have
read the position when the client mapped, apparently. */
client_reconfigure(self->client, TRUE);
-
- /* the offscreen buffer is invalid when the window is resized */
- frame_get_offscreen_buffer(self);
}
/* we're not animating any more ! */
XMapWindow(ob_display, self->window);
}
}
-
-static void frame_get_offscreen_buffer(ObFrame *self)
-{
- frame_free_offscreen_buffer(self);
-
- if (self->visible || frame_iconify_animating(self)) {
- self->pixmap = composite_get_window_pixmap(self->client->window);
-
-#ifdef SHAPE
- /* shape the offscreen buffer to match the window */
- XShapeCombineShape(ob_display, self->pixmap, ShapeBounding,
- 0, 0, self->client->window,
- ShapeBounding, ShapeSet);
-#endif
-
- /*
- self->picture = composite_create_picture(self->window,
- wattrib.visual,
- &self->has_alpha);
- */
- }
-
-}
-
-static void frame_free_offscreen_buffer(ObFrame *self)
-{
- if (self->pixmap) {
- XFreePixmap(ob_display, self->pixmap);
- self->pixmap = None;
- }
-}
projects / chaz / openbox / blobdiff