X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=880ab1b552cc20952166a685ef491871b73e8825;hb=eb2a0feb0154e86a1c6c117fd0f6d1a18959b694;hp=866d9fd925152cfd79b67f5a0a6bc4ca2c38c79a;hpb=b5af5ad3e8f2cd3c23d997970c4f9ec554936960;p=chaz%2Fopenbox diff --git a/openbox/frame.c b/openbox/frame.c index 866d9fd9..880ab1b5 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,7 +29,8 @@ #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) @@ -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); @@ -187,10 +190,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); @@ -227,6 +234,8 @@ static void frame_free(ObFrame *self) void frame_show(ObFrame *self) { + ob_debug("frame_show for window 0x%x : %d\n", self->client->window, + self->visible); if (!self->visible) { self->visible = TRUE; XMapWindow(ob_display, self->client->window); @@ -236,9 +245,11 @@ void frame_show(ObFrame *self) void frame_hide(ObFrame *self) { + ob_debug("frame_hide for window 0x%x : %d\n", self->client->window, + self->visible); 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 +377,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); @@ -461,7 +479,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); } @@ -517,11 +535,11 @@ 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); @@ -536,8 +554,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) @@ -588,8 +608,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); @@ -801,8 +823,10 @@ ObFrameContext frame_context(ObClient *client, Window win) 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->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;