X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=c1bacb67a6254815d06763f4016beed3c24abb7c;hb=c8983c42a7c27321d18825f2a130c15e29046f7b;hp=991e9adc71872a38900362c81bcdc6daecb42b77;hpb=7d1226c57cbe2c83d87174b637bcf923897f8033;p=chaz%2Fopenbox diff --git a/openbox/frame.c b/openbox/frame.c index 991e9adc..c1bacb67 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -29,14 +29,17 @@ #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) @@ -81,8 +84,6 @@ ObFrame *frame_new(ObClient *client) self = g_new0(ObFrame, 1); - self->obscured = TRUE; - visual = check_32bit_client(client); /* create the non-visible decor windows */ @@ -102,8 +103,12 @@ ObFrame *frame_new(ObClient *client) attrib.event_mask = FRAME_EVENTMASK; 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->window, visual, mask, &attrib); + self->plate = createWindow(self->inner, visual, mask, &attrib); /* create the visible decor windows */ @@ -144,6 +149,7 @@ ObFrame *frame_new(ObClient *client) /* the other stuff is shown based on decor settings */ XMapWindow(ob_display, self->plate); + XMapWindow(ob_display, self->inner); XMapWindow(ob_display, self->lgrip); XMapWindow(ob_display, self->rgrip); XMapWindow(ob_display, self->label); @@ -163,6 +169,8 @@ static void set_theme_statics(ObFrame *self) /* 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, @@ -340,6 +348,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, /* 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); @@ -421,15 +430,24 @@ void frame_adjust_area(ObFrame *self, gboolean moved, } else XUnmapWindow(ob_display, self->handle); - /* move and resize the plate */ - XMoveResizeWindow(ob_display, self->plate, - self->innersize.left - self->cbwidth_x, - self->innersize.top - self->cbwidth_y, - self->client->area.width + self->cbwidth_x * 2, - self->client->area.height + self->cbwidth_y * 2); - /* when the client has StaticGravity, it likes to move around. */ - XMoveWindow(ob_display, self->client->window, + /* move and resize the inner border window which contains the plate + */ + XMoveResizeWindow(ob_display, self->inner, + 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 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); } STRUT_SET(self->size, @@ -501,6 +519,13 @@ void frame_adjust_focus(ObFrame *self, gboolean hilite) 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); @@ -540,6 +565,7 @@ void frame_grab_client(ObFrame *self, ObClient *client) /* set all the windows for the frame in the window_map */ g_hash_table_insert(window_map, &self->window, client); g_hash_table_insert(window_map, &self->plate, client); + g_hash_table_insert(window_map, &self->inner, client); g_hash_table_insert(window_map, &self->title, client); g_hash_table_insert(window_map, &self->label, client); g_hash_table_insert(window_map, &self->max, client); @@ -594,6 +620,7 @@ void frame_release_client(ObFrame *self, ObClient *client) /* remove all the windows for the frame from the window_map */ g_hash_table_remove(window_map, &self->window); g_hash_table_remove(window_map, &self->plate); + g_hash_table_remove(window_map, &self->inner); g_hash_table_remove(window_map, &self->title); g_hash_table_remove(window_map, &self->label); g_hash_table_remove(window_map, &self->max); @@ -806,7 +833,7 @@ ObFrameContext frame_context(ObClient *client, Window win) } 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) @@ -814,22 +841,22 @@ ObFrameContext frame_context(ObClient *client, Window win) return OB_FRAME_CONTEXT_CLIENT; } - if (win == self->window) 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; - if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER; - if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER; + if (win == self->window) 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; + if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER; + if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER; if (win == self->tltresize) return OB_FRAME_CONTEXT_TLCORNER; if (win == self->tllresize) return OB_FRAME_CONTEXT_TLCORNER; if (win == self->trtresize) return OB_FRAME_CONTEXT_TRCORNER; if (win == self->trrresize) return OB_FRAME_CONTEXT_TRCORNER; - if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE; - if (win == self->iconify) return OB_FRAME_CONTEXT_ICONIFY; - if (win == self->close) return OB_FRAME_CONTEXT_CLOSE; - if (win == self->icon) return OB_FRAME_CONTEXT_ICON; - if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS; - if (win == self->shade) return OB_FRAME_CONTEXT_SHADE; + if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE; + if (win == self->iconify) return OB_FRAME_CONTEXT_ICONIFY; + if (win == self->close) return OB_FRAME_CONTEXT_CLOSE; + if (win == self->icon) return OB_FRAME_CONTEXT_ICON; + if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS; + if (win == self->shade) return OB_FRAME_CONTEXT_SHADE; return OB_FRAME_CONTEXT_NONE; }