support clients which use true transparency 32-bit visuals.
this requires that when a client is using a 32-bit visual, we have to make the frame windows that sit underneath it to use the same visual (and a colormap which matches it)
This commit is contained in:
parent
78af5d15e9
commit
80a6f06c0a
3 changed files with 64 additions and 24 deletions
|
@ -312,7 +312,7 @@ void client_manage(Window window)
|
||||||
XChangeSaveSet(ob_display, window, SetModeInsert);
|
XChangeSaveSet(ob_display, window, SetModeInsert);
|
||||||
|
|
||||||
/* create the decoration frame for the client window */
|
/* create the decoration frame for the client window */
|
||||||
self->frame = frame_new();
|
self->frame = frame_new(self);
|
||||||
|
|
||||||
frame_grab_client(self->frame, self);
|
frame_grab_client(self->frame, self);
|
||||||
|
|
||||||
|
|
|
@ -47,59 +47,95 @@ static gboolean flash_timeout(gpointer data);
|
||||||
static void set_theme_statics(ObFrame *self);
|
static void set_theme_statics(ObFrame *self);
|
||||||
static void free_theme_statics(ObFrame *self);
|
static void free_theme_statics(ObFrame *self);
|
||||||
|
|
||||||
static Window createWindow(Window parent, gulong mask,
|
static Window createWindow(Window parent, Visual *visual,
|
||||||
XSetWindowAttributes *attrib)
|
gulong mask, XSetWindowAttributes *attrib)
|
||||||
{
|
{
|
||||||
return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
|
return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
|
||||||
RrDepth(ob_rr_inst), InputOutput,
|
(visual ? 32 : RrDepth(ob_rr_inst)), InputOutput,
|
||||||
RrVisual(ob_rr_inst), mask, attrib);
|
(visual ? visual : RrVisual(ob_rr_inst)),
|
||||||
|
mask, attrib);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ObFrame *frame_new()
|
static Visual *check_32bit_client(ObClient *c)
|
||||||
|
{
|
||||||
|
XWindowAttributes wattrib;
|
||||||
|
Status ret;
|
||||||
|
|
||||||
|
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;
|
XSetWindowAttributes attrib;
|
||||||
gulong mask;
|
gulong mask;
|
||||||
ObFrame *self;
|
ObFrame *self;
|
||||||
|
Visual *visual;
|
||||||
|
|
||||||
self = g_new0(ObFrame, 1);
|
self = g_new0(ObFrame, 1);
|
||||||
|
|
||||||
self->obscured = TRUE;
|
self->obscured = TRUE;
|
||||||
|
|
||||||
/* create all of the decor windows */
|
visual = check_32bit_client(client);
|
||||||
|
|
||||||
|
/* create the non-visible decor windows */
|
||||||
|
|
||||||
mask = CWEventMask;
|
mask = CWEventMask;
|
||||||
|
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),
|
||||||
|
visual, AllocNone);
|
||||||
|
attrib.background_pixel = BlackPixel(ob_display, 0);
|
||||||
|
attrib.border_pixel = BlackPixel(ob_display, 0);
|
||||||
|
}
|
||||||
attrib.event_mask = FRAME_EVENTMASK;
|
attrib.event_mask = FRAME_EVENTMASK;
|
||||||
self->window = createWindow(RootWindow(ob_display, ob_screen),
|
self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
|
||||||
mask, &attrib);
|
mask, &attrib);
|
||||||
|
mask &= ~CWEventMask;
|
||||||
|
self->plate = createWindow(self->window, visual, mask, &attrib);
|
||||||
|
|
||||||
mask = 0;
|
/* create the visible decor windows */
|
||||||
self->plate = createWindow(self->window, mask, &attrib);
|
|
||||||
|
|
||||||
mask = CWEventMask;
|
mask = CWEventMask;
|
||||||
|
if (visual) {
|
||||||
|
/* client has a 32-bit visual */
|
||||||
|
mask |= CWColormap | CWBackPixel | CWBorderPixel;
|
||||||
|
attrib.colormap = RrColormap(ob_rr_inst);
|
||||||
|
}
|
||||||
attrib.event_mask = ELEMENT_EVENTMASK;
|
attrib.event_mask = ELEMENT_EVENTMASK;
|
||||||
self->title = createWindow(self->window, mask, &attrib);
|
self->title = createWindow(self->window, NULL, mask, &attrib);
|
||||||
|
|
||||||
mask |= CWCursor;
|
mask |= CWCursor;
|
||||||
attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
|
attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
|
||||||
self->tlresize = createWindow(self->title, mask, &attrib);
|
self->tlresize = createWindow(self->title, NULL, mask, &attrib);
|
||||||
attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
|
attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
|
||||||
self->trresize = createWindow(self->title, mask, &attrib);
|
self->trresize = createWindow(self->title, NULL, mask, &attrib);
|
||||||
|
|
||||||
mask &= ~CWCursor;
|
mask &= ~CWCursor;
|
||||||
self->label = createWindow(self->title, mask, &attrib);
|
self->label = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->max = createWindow(self->title, mask, &attrib);
|
self->max = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->close = createWindow(self->title, mask, &attrib);
|
self->close = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->desk = createWindow(self->title, mask, &attrib);
|
self->desk = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->shade = createWindow(self->title, mask, &attrib);
|
self->shade = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->icon = createWindow(self->title, mask, &attrib);
|
self->icon = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->iconify = createWindow(self->title, mask, &attrib);
|
self->iconify = createWindow(self->title, NULL, mask, &attrib);
|
||||||
self->handle = createWindow(self->window, mask, &attrib);
|
self->handle = createWindow(self->window, NULL, mask, &attrib);
|
||||||
|
|
||||||
mask |= CWCursor;
|
mask |= CWCursor;
|
||||||
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST);
|
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST);
|
||||||
self->lgrip = createWindow(self->handle, mask, &attrib);
|
self->lgrip = createWindow(self->handle, NULL, mask, &attrib);
|
||||||
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
|
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
|
||||||
self->rgrip = createWindow(self->handle, mask, &attrib);
|
self->rgrip = createWindow(self->handle, NULL, mask, &attrib);
|
||||||
|
|
||||||
self->focused = FALSE;
|
self->focused = FALSE;
|
||||||
|
|
||||||
|
@ -181,6 +217,8 @@ static void frame_free(ObFrame *self)
|
||||||
free_theme_statics(self);
|
free_theme_statics(self);
|
||||||
|
|
||||||
XDestroyWindow(ob_display, self->window);
|
XDestroyWindow(ob_display, self->window);
|
||||||
|
if (self->colormap)
|
||||||
|
XFreeColormap(ob_display, self->colormap);
|
||||||
|
|
||||||
g_free(self);
|
g_free(self);
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,6 +98,8 @@ struct _ObFrame
|
||||||
Window tlresize;
|
Window tlresize;
|
||||||
Window trresize;
|
Window trresize;
|
||||||
|
|
||||||
|
Colormap colormap;
|
||||||
|
|
||||||
RrAppearance *a_unfocused_title;
|
RrAppearance *a_unfocused_title;
|
||||||
RrAppearance *a_focused_title;
|
RrAppearance *a_focused_title;
|
||||||
RrAppearance *a_unfocused_label;
|
RrAppearance *a_unfocused_label;
|
||||||
|
@ -142,7 +144,7 @@ struct _ObFrame
|
||||||
GTimeVal flash_end;
|
GTimeVal flash_end;
|
||||||
};
|
};
|
||||||
|
|
||||||
ObFrame *frame_new();
|
ObFrame *frame_new(struct _ObClient *c);
|
||||||
void frame_show(ObFrame *self);
|
void frame_show(ObFrame *self);
|
||||||
void frame_hide(ObFrame *self);
|
void frame_hide(ObFrame *self);
|
||||||
void frame_adjust_theme(ObFrame *self);
|
void frame_adjust_theme(ObFrame *self);
|
||||||
|
|
Loading…
Reference in a new issue