X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=d18a7aa4adb09ab32d711292dbeefb89945bac96;hb=5316bc6c3e3329dc620cfd15d472ed5d376100f8;hp=b92c3f12b9213882016d5e39b83b6146acb73ef0;hpb=ec304c9e433e4b1cedf924ca64d783f05db7d42d;p=chaz%2Fopenbox diff --git a/openbox/frame.c b/openbox/frame.c index b92c3f12..d18a7aa4 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -2,7 +2,7 @@ frame.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,12 +29,12 @@ #include "moveresize.h" #include "render/theme.h" -#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask) +#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask | \ + FocusChangeMask) #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ - ButtonPressMask | ButtonReleaseMask | \ - VisibilityChangeMask) + ButtonPressMask | ButtonReleaseMask) #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ - ButtonMotionMask | ExposureMask | \ + ButtonMotionMask | \ EnterWindowMask | LeaveWindowMask) #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \ @@ -80,8 +80,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 */ @@ -101,12 +99,15 @@ ObFrame *frame_new(ObClient *client) attrib.event_mask = FRAME_EVENTMASK; self->window = createWindow(RootWindow(ob_display, ob_screen), visual, mask, &attrib); + + attrib.event_mask = ELEMENT_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 */ - mask = CWEventMask; if (visual) { /* client has a 32-bit visual */ mask |= CWColormap | CWBackPixel | CWBorderPixel; @@ -117,9 +118,11 @@ ObFrame *frame_new(ObClient *client) mask |= CWCursor; attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST); - self->tlresize = createWindow(self->title, NULL, mask, &attrib); + self->tltresize = createWindow(self->title, NULL, mask, &attrib); + self->tllresize = createWindow(self->title, NULL, mask, &attrib); attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST); - self->trresize = createWindow(self->title, NULL, mask, &attrib); + self->trtresize = createWindow(self->title, NULL, mask, &attrib); + self->trrresize = createWindow(self->title, NULL, mask, &attrib); mask &= ~CWCursor; self->label = createWindow(self->title, NULL, mask, &attrib); @@ -141,6 +144,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); @@ -187,10 +191,14 @@ static void set_theme_statics(ObFrame *self) XResizeWindow(ob_display, self->rgrip, ob_rr_theme->grip_width, ob_rr_theme->handle_height); } - XResizeWindow(ob_display, self->tlresize, - ob_rr_theme->grip_width, ob_rr_theme->top_grip_height); - XResizeWindow(ob_display, self->trresize, - ob_rr_theme->grip_width, ob_rr_theme->top_grip_height); + XResizeWindow(ob_display, self->tltresize, + ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); + XResizeWindow(ob_display, self->trtresize, + ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1); + XResizeWindow(ob_display, self->tllresize, + ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); + XResizeWindow(ob_display, self->trrresize, + ob_rr_theme->paddingx + 1, ob_rr_theme->title_height); /* set up the dynamic appearances */ self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); @@ -238,7 +246,7 @@ void frame_hide(ObFrame *self) { if (self->visible) { self->visible = FALSE; - self->client->ignore_unmaps += 2; + self->client->ignore_unmaps += 1; /* we unmap the client itself so that we can get MapRequest events, and because the ICCCM tells us to! */ XUnmapWindow(ob_display, self->window); @@ -366,14 +374,21 @@ void frame_adjust_area(ObFrame *self, gboolean moved, XMapWindow(ob_display, self->title); if (self->decorations & OB_FRAME_DECOR_GRIPS) { - XMoveWindow(ob_display, self->tlresize, 0, 0); - XMoveWindow(ob_display, self->trresize, + XMoveWindow(ob_display, self->tltresize, 0, 0); + XMoveWindow(ob_display, self->tllresize, 0, 0); + XMoveWindow(ob_display, self->trtresize, self->width - ob_rr_theme->grip_width, 0); - XMapWindow(ob_display, self->tlresize); - XMapWindow(ob_display, self->trresize); + XMoveWindow(ob_display, self->trrresize, + self->width - ob_rr_theme->paddingx - 1, 0); + XMapWindow(ob_display, self->tltresize); + XMapWindow(ob_display, self->tllresize); + XMapWindow(ob_display, self->trtresize); + XMapWindow(ob_display, self->trrresize); } else { - XUnmapWindow(ob_display, self->tlresize); - XUnmapWindow(ob_display, self->trresize); + XUnmapWindow(ob_display, self->tltresize); + XUnmapWindow(ob_display, self->tllresize); + XUnmapWindow(ob_display, self->trtresize); + XUnmapWindow(ob_display, self->trrresize); } } else XUnmapWindow(ob_display, self->title); @@ -407,15 +422,22 @@ void frame_adjust_area(ObFrame *self, gboolean moved, } else XUnmapWindow(ob_display, self->handle); - /* move and resize the plate */ - XMoveResizeWindow(ob_display, self->plate, + /* 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->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, + 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, @@ -461,7 +483,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, vals[1] = self->size.right; vals[2] = self->size.top; vals[3] = self->size.bottom; - PROP_SETA32(self->client->window, kde_net_wm_frame_strut, + PROP_SETA32(self->client->window, net_frame_extents, cardinal, vals, 4); } @@ -484,6 +506,14 @@ void frame_adjust_focus(ObFrame *self, gboolean hilite) { self->focused = hilite; framerender_frame(self); + 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) @@ -517,14 +547,15 @@ void frame_grab_client(ObFrame *self, ObClient *client) req's) the ButtonPress is to catch clicks on the client border */ XSelectInput(ob_display, self->plate, PLATE_EVENTMASK); + frame_adjust_area(self, TRUE, TRUE, FALSE); + /* map the client so it maps when the frame does */ XMapWindow(ob_display, client->window); - frame_adjust_area(self, TRUE, TRUE, FALSE); - /* 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); @@ -536,8 +567,10 @@ void frame_grab_client(ObFrame *self, ObClient *client) g_hash_table_insert(window_map, &self->handle, client); g_hash_table_insert(window_map, &self->lgrip, client); g_hash_table_insert(window_map, &self->rgrip, client); - g_hash_table_insert(window_map, &self->tlresize, client); - g_hash_table_insert(window_map, &self->trresize, client); + g_hash_table_insert(window_map, &self->tltresize, client); + g_hash_table_insert(window_map, &self->tllresize, client); + g_hash_table_insert(window_map, &self->trtresize, client); + g_hash_table_insert(window_map, &self->trrresize, client); } void frame_release_client(ObFrame *self, ObClient *client) @@ -577,6 +610,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); @@ -588,8 +622,10 @@ void frame_release_client(ObFrame *self, ObClient *client) g_hash_table_remove(window_map, &self->handle); g_hash_table_remove(window_map, &self->lgrip); g_hash_table_remove(window_map, &self->rgrip); - g_hash_table_remove(window_map, &self->tlresize); - g_hash_table_remove(window_map, &self->trresize); + g_hash_table_remove(window_map, &self->tltresize); + g_hash_table_remove(window_map, &self->tllresize); + g_hash_table_remove(window_map, &self->trtresize); + g_hash_table_remove(window_map, &self->trrresize); ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE); @@ -682,49 +718,49 @@ static void layout_title(ObFrame *self) if (!n) break; self->icon_x = x; XMapWindow(ob_display, self->icon); - XMoveWindow(ob_display, self->icon, x, ob_rr_theme->paddingx); + XMoveWindow(ob_display, self->icon, x, ob_rr_theme->paddingy); x += ob_rr_theme->button_size + 2 + ob_rr_theme->paddingx + 1; break; case 'D': if (!d) break; self->desk_x = x; XMapWindow(ob_display, self->desk); - XMoveWindow(ob_display, self->desk, x, ob_rr_theme->paddingx + 1); + XMoveWindow(ob_display, self->desk, x, ob_rr_theme->paddingy + 1); x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1; break; case 'S': if (!s) break; self->shade_x = x; XMapWindow(ob_display, self->shade); - XMoveWindow(ob_display, self->shade, x, ob_rr_theme->paddingx + 1); + XMoveWindow(ob_display, self->shade, x, ob_rr_theme->paddingy + 1); x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1; break; case 'I': if (!i) break; self->iconify_x = x; XMapWindow(ob_display, self->iconify); - XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->paddingx + 1); + XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->paddingy + 1); x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1; break; case 'L': if (!l) break; self->label_x = x; XMapWindow(ob_display, self->label); - XMoveWindow(ob_display, self->label, x, ob_rr_theme->paddingx); + XMoveWindow(ob_display, self->label, x, ob_rr_theme->paddingy); x += self->label_width + ob_rr_theme->paddingx + 1; break; case 'M': if (!m) break; self->max_x = x; XMapWindow(ob_display, self->max); - XMoveWindow(ob_display, self->max, x, ob_rr_theme->paddingx + 1); + XMoveWindow(ob_display, self->max, x, ob_rr_theme->paddingy + 1); x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1; break; case 'C': if (!c) break; self->close_x = x; XMapWindow(ob_display, self->close); - XMoveWindow(ob_display, self->close, x, ob_rr_theme->paddingx + 1); + XMoveWindow(ob_display, self->close, x, ob_rr_theme->paddingy + 1); x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1; break; } @@ -795,20 +831,23 @@ 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->tlresize) return OB_FRAME_CONTEXT_TLCORNER; - if (win == self->trresize) 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->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; + 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; return OB_FRAME_CONTEXT_NONE; } @@ -957,6 +996,7 @@ void frame_flash_start(ObFrame *self) G_USEC_PER_SEC * 0.6, flash_timeout, self, + g_direct_equal, flash_done); g_get_current_time(&self->flash_end); g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);