#include "moveresize.h"
#include "render/theme.h"
-#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask | \
- FocusChangeMask)
+#define PLATE_EVENTMASK (SubstructureRedirectMask | FocusChangeMask)
#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
- ButtonPressMask | ButtonReleaseMask | \
- VisibilityChangeMask)
+ ButtonPressMask | ButtonReleaseMask)
#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
- ButtonMotionMask | ExposureMask | \
+ ButtonMotionMask | \
EnterWindowMask | LeaveWindowMask)
+/* The inner window does not need enter/leave events.
+ If it does get them, then it needs its own context for enter events
+ because sloppy focus will focus the window when you enter the inner window
+ from the frame. */
+#define INNER_EVENTMASK (ButtonPressMask)
#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
f->cbwidth_y)
self = g_new0(ObFrame, 1);
- self->obscured = TRUE;
-
visual = check_32bit_client(client);
/* create the non-visible decor windows */
self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
mask, &attrib);
+ attrib.event_mask = INNER_EVENTMASK;
+ self->inner = createWindow(self->window, visual, mask, &attrib);
+
+ mask &= ~CWEventMask;
+ self->plate = createWindow(self->inner, visual, mask, &attrib);
+
/* create the visible decor windows */
+ 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;
- self->inner = createWindow(self->window, NULL, mask, &attrib);
self->title = createWindow(self->window, NULL, mask, &attrib);
mask |= CWCursor;
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
self->rgrip = createWindow(self->handle, NULL, mask, &attrib);
- /* create the plate window which holds the client */
-
- mask &= ~(CWEventMask | CWCursor);
- self->plate = createWindow(self->inner, visual, mask, &attrib);
-
self->focused = FALSE;
/* the other stuff is shown based on decor settings */
/* set colors/appearance/sizes for stuff that doesn't change */
XSetWindowBorder(ob_display, self->window,
RrColorPixel(ob_rr_theme->frame_b_color));
+ XSetWindowBorder(ob_display, self->inner,
+ RrColorPixel(ob_rr_theme->frame_b_color));
XSetWindowBorder(ob_display, self->title,
RrColorPixel(ob_rr_theme->frame_b_color));
XSetWindowBorder(ob_display, self->handle,
/* set border widths */
if (!fake) {
XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
+ XSetWindowBorderWidth(ob_display, self->inner, self->bwidth);
XSetWindowBorderWidth(ob_display, self->title, self->rbwidth);
XSetWindowBorderWidth(ob_display, self->handle, self->rbwidth);
XSetWindowBorderWidth(ob_display, self->lgrip, self->rbwidth);
/* move and resize the inner border window which contains the plate
*/
XMoveResizeWindow(ob_display, self->inner,
- self->innersize.left - self->cbwidth_x,
- self->innersize.top - self->cbwidth_y,
+ self->innersize.left - self->cbwidth_x -
+ self->bwidth,
+ self->innersize.top - self->cbwidth_y -
+ self->bwidth,
self->client->area.width +
self->cbwidth_x * 2,
self->client->area.height +
self->cbwidth_y * 2);
- /* move and resize the plate */
- XMoveResizeWindow(ob_display, self->plate,
- self->cbwidth_x,
- self->cbwidth_y,
- self->client->area.width,
- self->client->area.height);
+ /* move the plate */
+ XMoveWindow(ob_display, self->plate,
+ self->cbwidth_x, self->cbwidth_y);
+
/* when the client has StaticGravity, it likes to move around. */
XMoveWindow(ob_display, self->client->window, 0, 0);
}
XFlush(ob_display);
}
+void frame_adjust_client_area(ObFrame *self)
+{
+ /* resize the plate */
+ XResizeWindow(ob_display, self->plate,
+ self->client->area.width, self->client->area.height);
+}
+
void frame_adjust_title(ObFrame *self)
{
framerender_frame(self);
}
self = client->frame;
- if (win == self->plate) {
+ if (win == self->inner || win == self->plate) {
/* conceptually, this is the desktop, as far as users are
concerned */
if (client->type == OB_CLIENT_TYPE_DESKTOP)
}
if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
- if (win == self->inner) return OB_FRAME_CONTEXT_FRAME;
if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE;