#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;
- Visual *visual;
+ XWindowAttributes wattrib;
+ Status ret;
self = g_new0(ObFrame, 1);
self->client = client;
- visual = check_32bit_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);
/* create the non-visible decor windows */
mask = 0;
- if (visual) {
- /* client has a 32-bit visual */
- mask |= CWColormap | CWBackPixel | CWBorderPixel;
+ if (self->has_alpha) {
+ /* the colormap/backpixel/borderpixel are required for supporting
+ windows with 32bit visuals */
+ mask = CWColormap | CWBackPixel | CWBorderPixel;
/* create a colormap with the visual */
self->colormap = attrib.colormap =
XCreateColormap(ob_display,
RootWindow(ob_display, ob_screen),
- visual, AllocNone);
+ wattrib.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), visual,
+
+ self->window = createWindow(RootWindow(ob_display, ob_screen),
+ (self->has_alpha ? wattrib.visual : NULL),
mask, &attrib);
/* create the visible decor windows */
mask = 0;
- if (visual) {
+ if (self->has_alpha) {
/* client has a 32-bit visual */
mask |= CWColormap | CWBackPixel | CWBorderPixel;
attrib.colormap = RrColormap(ob_rr_inst);
mask |= CWEventMask;
attrib.event_mask = ELEMENT_EVENTMASK;
+ self->innerleft = createWindow(self->window, NULL, mask, &attrib);
+ self->innertop = createWindow(self->window, NULL, mask, &attrib);
+ self->innerright = createWindow(self->window, NULL, mask, &attrib);
+ self->innerbottom = createWindow(self->window, NULL, mask, &attrib);
+
self->title = createWindow(self->window, NULL, mask, &attrib);
self->titleleft = createWindow(self->window, NULL, mask, &attrib);
self->titletop = createWindow(self->window, NULL, mask, &attrib);
self->left = createWindow(self->window, NULL, mask, &attrib);
self->right = createWindow(self->window, NULL, mask, &attrib);
- self->innerleft = createWindow(self->window, NULL, mask, &attrib);
- self->innertop = createWindow(self->window, NULL, mask, &attrib);
- self->innerright = createWindow(self->window, NULL, mask, &attrib);
- self->innerbottom = createWindow(self->window, NULL, mask, &attrib);
-
self->label = createWindow(self->title, NULL, mask, &attrib);
self->max = createWindow(self->title, NULL, mask, &attrib);
self->close = createWindow(self->title, NULL, mask, &attrib);
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);
if (self->max_horz) {
self->cbwidth_l = self->cbwidth_r = 0;
- self->width = self->client->area.width - self->bwidth * 2;
+ self->width = self->client->area.width;
if (self->max_vert)
self->cbwidth_b = 0;
} else
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;
gint titlesides;
/* height of titleleft and titleright */
- titlesides = (!self->max_horz ?
- ob_rr_theme->grip_width :
- self->size.top - self->bwidth);
+ titlesides = (!self->max_horz ? ob_rr_theme->grip_width : 0);
XMoveResizeWindow(ob_display, self->titletop,
ob_rr_theme->grip_width + self->bwidth, 0,
if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
XMoveResizeWindow(ob_display, self->titlebottom,
- self->bwidth,
+ (self->max_horz ? 0 : self->bwidth),
ob_rr_theme->title_height + self->bwidth,
self->width,
self->bwidth);
if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
XMoveResizeWindow(ob_display, self->title,
- self->bwidth, self->bwidth,
+ (self->max_horz ? 0 : self->bwidth),
+ self->bwidth,
self->width, ob_rr_theme->title_height);
XMapWindow(ob_display, self->title);
layout_title(self);
if (!fake) {
+ gint sidebwidth = self->max_horz ? 0 : self->bwidth;
+
if (self->bwidth && self->size.bottom) {
XMoveResizeWindow(ob_display, self->handlebottom,
ob_rr_theme->grip_width +
- self->bwidth * 2,
+ self->bwidth + sidebwidth,
self->size.top + self->client->area.height +
self->size.bottom - self->bwidth,
self->width - (ob_rr_theme->grip_width +
- self->bwidth) * 2,
+ sidebwidth) * 2,
self->bwidth);
- XMoveResizeWindow(ob_display, self->lgripleft,
- 0,
- self->size.top + self->client->area.height +
- self->size.bottom -
- (!self->max_horz ?
- ob_rr_theme->grip_width :
- self->size.bottom - self->cbwidth_b),
- self->bwidth,
- (!self->max_horz ?
- ob_rr_theme->grip_width :
- self->size.bottom - self->cbwidth_b));
- XMoveResizeWindow(ob_display, self->rgripright,
- self->size.left + self->client->area.width +
- self->size.right - self->bwidth,
- self->size.top + self->client->area.height +
- self->size.bottom -
- (!self->max_horz ?
- ob_rr_theme->grip_width :
- self->size.bottom - self->cbwidth_b),
- self->bwidth,
- (!self->max_horz ?
- ob_rr_theme->grip_width :
- self->size.bottom - self->cbwidth_b));
+
+ if (sidebwidth) {
+ XMoveResizeWindow(ob_display, self->lgripleft,
+ 0,
+ self->size.top +
+ self->client->area.height +
+ self->size.bottom -
+ (!self->max_horz ?
+ ob_rr_theme->grip_width :
+ self->size.bottom - self->cbwidth_b),
+ self->bwidth,
+ (!self->max_horz ?
+ ob_rr_theme->grip_width :
+ self->size.bottom - self->cbwidth_b));
+ XMoveResizeWindow(ob_display, self->rgripright,
+ self->size.left +
+ self->client->area.width +
+ self->size.right - self->bwidth,
+ self->size.top +
+ self->client->area.height +
+ self->size.bottom -
+ (!self->max_horz ?
+ ob_rr_theme->grip_width :
+ self->size.bottom - self->cbwidth_b),
+ self->bwidth,
+ (!self->max_horz ?
+ ob_rr_theme->grip_width :
+ self->size.bottom - self->cbwidth_b));
+
+ XMapWindow(ob_display, self->lgripleft);
+ XMapWindow(ob_display, self->rgripright);
+ } else {
+ XUnmapWindow(ob_display, self->lgripleft);
+ XUnmapWindow(ob_display, self->rgripright);
+ }
XMoveResizeWindow(ob_display, self->lgripbottom,
- self->bwidth,
+ sidebwidth,
self->size.top + self->client->area.height +
self->size.bottom - self->bwidth,
ob_rr_theme->grip_width + self->bwidth,
self->bwidth);
XMoveResizeWindow(ob_display, self->rgripbottom,
self->size.left + self->client->area.width +
- self->size.right - self->bwidth * 2 -
+ self->size.right - self->bwidth - sidebwidth -
ob_rr_theme->grip_width,
self->size.top + self->client->area.height +
self->size.bottom - self->bwidth,
self->bwidth);
XMapWindow(ob_display, self->handlebottom);
- XMapWindow(ob_display, self->lgripleft);
- XMapWindow(ob_display, self->rgripright);
XMapWindow(ob_display, self->lgripbottom);
XMapWindow(ob_display, self->rgripbottom);
{
XMoveResizeWindow(ob_display, self->handletop,
ob_rr_theme->grip_width +
- self->bwidth * 2,
+ self->bwidth + sidebwidth,
FRAME_HANDLE_Y(self),
self->width - (ob_rr_theme->grip_width +
- self->bwidth) * 2,
+ sidebwidth) * 2,
self->bwidth);
XMapWindow(ob_display, self->handletop);
ob_rr_theme->handle_height);
XMoveResizeWindow(ob_display, self->lgriptop,
- self->bwidth,
+ sidebwidth,
FRAME_HANDLE_Y(self),
ob_rr_theme->grip_width +
self->bwidth,
XMoveResizeWindow(ob_display, self->rgriptop,
self->size.left +
self->client->area.width +
- self->size.right - self->bwidth * 2 -
- ob_rr_theme->grip_width,
+ self->size.right - self->bwidth -
+ sidebwidth - ob_rr_theme->grip_width,
FRAME_HANDLE_Y(self),
ob_rr_theme->grip_width +
self->bwidth,
ob_rr_theme->handle_height > 0)
{
XMoveResizeWindow(ob_display, self->handle,
- self->bwidth,
+ sidebwidth,
FRAME_HANDLE_Y(self) + self->bwidth,
self->width, ob_rr_theme->handle_height);
XMapWindow(ob_display, self->handle);
frame_client_gravity. */
self->area.x = self->client->area.x;
self->area.y = self->client->area.y;
- frame_client_gravity(self, &self->area.x, &self->area.y,
- self->client->area.width,
- self->client->area.height);
+ frame_client_gravity(self, &self->area.x, &self->area.y);
}
if (!fake) {
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
return OB_FRAME_CONTEXT_NONE;
}
-void frame_client_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h)
+void frame_client_gravity(ObFrame *self, gint *x, gint *y)
{
/* horizontal */
switch (self->client->gravity) {
}
}
-void frame_frame_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h)
+void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
{
/* horizontal */
switch (self->client->gravity) {
{
r->width += self->size.left + self->size.right;
r->height += self->size.top + self->size.bottom;
- frame_client_gravity(self, &r->x, &r->y, r->width, r->height);
+ frame_client_gravity(self, &r->x, &r->y);
}
static void flash_done(gpointer data)
XUnmapWindow(ob_display, self->window);
else {
/* Send a ConfigureNotify when the animation is done, this fixes
- KDE's pager showing the window in the wrong place. */
- client_reconfigure(self->client);
+ KDE's pager showing the window in the wrong place. since the
+ window is mapped at a different location and is then moved, we
+ 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;
+ }
+}