#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 free_theme_statics(ObFrame *self);
static gboolean frame_animate_iconify(gpointer 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)
(visual ? 32 : RrDepth(ob_rr_inst)), InputOutput,
(visual ? visual : RrVisual(ob_rr_inst)),
mask, 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);
self->handle = createWindow(self->window, NULL, mask, &attrib);
self->lgrip = createWindow(self->handle, NULL, mask, &attrib);
- self->rgrip = createWindow(self->handle, NULL, mask, &attrib);
+ self->rgrip = createWindow(self->handle, NULL, mask, &attrib);
self->handleleft = createWindow(self->handle, NULL, mask, &attrib);
self->handleright = createWindow(self->handle, NULL, mask, &attrib);
XMapWindow(ob_display, self->backback);
XMapWindow(ob_display, self->backfront);
- self->max_press = self->close_press = self->desk_press =
+ self->max_press = self->close_press = self->desk_press =
self->iconify_press = self->shade_press = FALSE;
- self->max_hover = self->close_hover = self->desk_hover =
+ self->max_hover = self->close_hover = self->desk_hover =
self->iconify_hover = self->shade_hover = FALSE;
set_theme_statics(self);
static void free_theme_statics(ObFrame *self)
{
- RrAppearanceFree(self->a_unfocused_title);
+ RrAppearanceFree(self->a_unfocused_title);
RrAppearanceFree(self->a_focused_title);
RrAppearanceFree(self->a_unfocused_label);
RrAppearanceFree(self->a_focused_label);
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);
ShapeBounding, 0, 0, xrect, num,
ShapeUnion, Unsorted);
}
-
- if (self->pixmap)
- XShapeCombineShape(ob_display, self->pixmap, ShapeBounding,
- 0, 0, self->window, ShapeBounding, ShapeSet);
-
#endif
}
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->size.bottom += ob_rr_theme->handle_height + self->bwidth;
}
-
+
/* position/size and map/unmap all the windows */
if (!fake) {
sidebwidth) * 2,
self->bwidth);
-
+
if (sidebwidth) {
XMoveResizeWindow(ob_display, self->lgripleft,
0,
if (self->bwidth && !self->max_horz) {
XMoveResizeWindow(ob_display, self->right,
- self->client->area.width +
- self->cbwidth_l + self->cbwidth_r + self->bwidth,
+ self->client->area.width + self->cbwidth_l +
+ self->cbwidth_r + self->bwidth,
self->bwidth + ob_rr_theme->grip_width,
self->bwidth,
self->client->area.height +
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) {
if (!frame_iconify_animating(self))
/* move and resize the top level frame.
shading can change without being moved or resized.
-
+
but don't do this during an iconify animation. it will be
reflected afterwards.
*/
self->need_render = TRUE;
framerender_frame(self);
frame_adjust_shape(self);
-
- /* the offscreen buffer is invalid when the window is resized */
- if (self->visible)
- frame_get_offscreen_buffer(self);
}
if (!STRUT_EQUAL(self->size, oldsize)) {
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)
flash_done);
g_get_current_time(&self->flash_end);
g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
-
+
self->flashing = TRUE;
}
/* how far do we have left to go ? */
g_get_current_time(&now);
time = frame_animate_iconify_time_left(self, &now);
-
+
if (time == 0 || iconifying) {
/* start where the frame is supposed to be */
x = self->area.x;
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. */
+ 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->window);
- /*
- 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