X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=880ab1b552cc20952166a685ef491871b73e8825;hb=eb2a0feb0154e86a1c6c117fd0f6d1a18959b694;hp=7c26d7068eefca58a51c5fbc398031609906365c;hpb=0621e22932b40ada705abbeb67b67c0e37ef7654;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 7c26d706..880ab1b5 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1,13 +1,36 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   frame.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "frame.h"
 #include "client.h"
 #include "openbox.h"
 #include "extensions.h"
+#include "prop.h"
 #include "config.h"
 #include "framerender.h"
 #include "mainloop.h"
+#include "focus.h"
+#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)
@@ -16,67 +39,106 @@
                            EnterWindowMask | LeaveWindowMask)
 
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
-		           f->cbwidth_y)
+                           f->cbwidth_y)
 
 static void layout_title(ObFrame *self);
+static void flash_done(gpointer data);
+static gboolean flash_timeout(gpointer data);
 
-static Window createWindow(Window parent, unsigned long mask,
-			   XSetWindowAttributes *attrib)
+static void set_theme_statics(ObFrame *self);
+static void free_theme_statics(ObFrame *self);
+
+static Window createWindow(Window parent, Visual *visual,
+                           gulong mask, XSetWindowAttributes *attrib)
 {
     return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-			 RrDepth(ob_rr_inst), InputOutput,
-                         RrVisual(ob_rr_inst), mask, attrib);
+                         (visual ? 32 : RrDepth(ob_rr_inst)), InputOutput,
+                         (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;
-    unsigned long mask;
+    gulong mask;
     ObFrame *self;
+    Visual *visual;
 
-    self = g_new(ObFrame, 1);
+    self = g_new0(ObFrame, 1);
 
-    self->visible = FALSE;
     self->obscured = TRUE;
-    self->decorations = 0;
-    self->flashing = FALSE;
 
-    /* create all of the decor windows */
-    mask = CWOverrideRedirect | CWEventMask;
+    visual = check_32bit_client(client);
+
+    /* create the non-visible decor windows */
+
+    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.override_redirect = TRUE;
-    self->window = createWindow(RootWindow(ob_display, ob_screen),
+    self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
                                 mask, &attrib);
+    mask &= ~CWEventMask;
+    self->plate = createWindow(self->window, visual, mask, &attrib);
 
-    mask = 0;
-    self->plate = createWindow(self->window, 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->title = createWindow(self->window, mask, &attrib);
+    self->title = createWindow(self->window, NULL, mask, &attrib);
 
     mask |= CWCursor;
     attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
-    self->tlresize = createWindow(self->title, 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, 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, mask, &attrib);
-    self->max = createWindow(self->title, mask, &attrib);
-    self->close = createWindow(self->title, mask, &attrib);
-    self->desk = createWindow(self->title, mask, &attrib);
-    self->shade = createWindow(self->title, mask, &attrib);
-    self->icon = createWindow(self->title, mask, &attrib);
-    self->iconify = createWindow(self->title, mask, &attrib);
-    self->handle = createWindow(self->window, mask, &attrib);
+    self->label = createWindow(self->title, NULL, mask, &attrib);
+    self->max = createWindow(self->title, NULL, mask, &attrib);
+    self->close = createWindow(self->title, NULL, mask, &attrib);
+    self->desk = createWindow(self->title, NULL, mask, &attrib);
+    self->shade = createWindow(self->title, NULL, mask, &attrib);
+    self->icon = createWindow(self->title, NULL, mask, &attrib);
+    self->iconify = createWindow(self->title, NULL, mask, &attrib);
+    self->handle = createWindow(self->window, NULL, mask, &attrib);
 
     mask |= CWCursor;
     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);
-    self->rgrip = createWindow(self->handle, mask, &attrib); 
+    self->rgrip = createWindow(self->handle, NULL, mask, &attrib); 
 
     self->focused = FALSE;
 
@@ -86,12 +148,29 @@ ObFrame *frame_new()
     XMapWindow(ob_display, self->rgrip);
     XMapWindow(ob_display, self->label);
 
+    self->max_press = self->close_press = self->desk_press = 
+        self->iconify_press = self->shade_press = FALSE;
+    self->max_hover = self->close_hover = self->desk_hover = 
+        self->iconify_hover = self->shade_hover = FALSE;
+
+    set_theme_statics(self);
+
+    return (ObFrame*)self;
+}
+
+static void set_theme_statics(ObFrame *self)
+{
     /* set colors/appearance/sizes for stuff that doesn't change */
-    XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->handle, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->rgrip, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->window,
+                     RrColorPixel(ob_rr_theme->frame_b_color));
+    XSetWindowBorder(ob_display, self->title,
+                     RrColorPixel(ob_rr_theme->frame_b_color));
+    XSetWindowBorder(ob_display, self->handle,
+                     RrColorPixel(ob_rr_theme->frame_b_color));
+    XSetWindowBorder(ob_display, self->rgrip,
+                     RrColorPixel(ob_rr_theme->frame_b_color));
+    XSetWindowBorder(ob_display, self->lgrip,
+                     RrColorPixel(ob_rr_theme->frame_b_color));
 
     XResizeWindow(ob_display, self->max,
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
@@ -105,14 +184,20 @@ ObFrame *frame_new()
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->shade,
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
-    XResizeWindow(ob_display, self->lgrip,
-                  ob_rr_theme->grip_width, ob_rr_theme->handle_height);
-    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->handle_height);
-    XResizeWindow(ob_display, self->trresize,
-                  ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+    if (ob_rr_theme->handle_height > 0) {
+        XResizeWindow(ob_display, self->lgrip,
+                      ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+        XResizeWindow(ob_display, self->rgrip,
+                      ob_rr_theme->grip_width, ob_rr_theme->handle_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);
@@ -123,16 +208,9 @@ ObFrame *frame_new()
         RrAppearanceCopy(ob_rr_theme->a_unfocused_handle);
     self->a_focused_handle = RrAppearanceCopy(ob_rr_theme->a_focused_handle);
     self->a_icon = RrAppearanceCopy(ob_rr_theme->a_icon);
-
-    self->max_press = self->close_press = self->desk_press = 
-	self->iconify_press = self->shade_press = FALSE;
-    self->max_hover = self->close_hover = self->desk_hover = 
-	self->iconify_hover = self->shade_hover = FALSE;
-
-    return (ObFrame*)self;
 }
 
-static void frame_free(ObFrame *self)
+static void free_theme_statics(ObFrame *self)
 {
     RrAppearanceFree(self->a_unfocused_title); 
     RrAppearanceFree(self->a_focused_title);
@@ -141,71 +219,92 @@ static void frame_free(ObFrame *self)
     RrAppearanceFree(self->a_unfocused_handle);
     RrAppearanceFree(self->a_focused_handle);
     RrAppearanceFree(self->a_icon);
+}
+
+static void frame_free(ObFrame *self)
+{
+    free_theme_statics(self);
 
     XDestroyWindow(ob_display, self->window);
+    if (self->colormap)
+        XFreeColormap(ob_display, self->colormap);
 
     g_free(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->window);
+        self->visible = TRUE;
+        XMapWindow(ob_display, self->client->window);
+        XMapWindow(ob_display, self->window);
     }
 }
 
 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++;
-	XUnmapWindow(ob_display, self->window);
+        self->visible = FALSE;
+        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);
+        XUnmapWindow(ob_display, self->client->window);
     }
 }
 
+void frame_adjust_theme(ObFrame *self)
+{
+    free_theme_statics(self);
+    set_theme_statics(self);
+}
+
 void frame_adjust_shape(ObFrame *self)
 {
 #ifdef SHAPE
-    int num;
+    gint num;
     XRectangle xrect[2];
 
     if (!self->client->shaped) {
-	/* clear the shape on the frame window */
-	XShapeCombineMask(ob_display, self->window, ShapeBounding,
-			  self->innersize.left,
-			  self->innersize.top,
-			  None, ShapeSet);
+        /* clear the shape on the frame window */
+        XShapeCombineMask(ob_display, self->window, ShapeBounding,
+                          self->innersize.left,
+                          self->innersize.top,
+                          None, ShapeSet);
     } else {
-	/* make the frame's shape match the clients */
-	XShapeCombineShape(ob_display, self->window, ShapeBounding,
-			   self->innersize.left,
-			   self->innersize.top,
-			   self->client->window,
-			   ShapeBounding, ShapeSet);
-
-	num = 0;
-	if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
-	    xrect[0].x = -ob_rr_theme->bwidth;
-	    xrect[0].y = -ob_rr_theme->bwidth;
-	    xrect[0].width = self->width + self->rbwidth * 2;
-	    xrect[0].height = ob_rr_theme->title_height +
-		self->bwidth * 2;
-	    ++num;
-	}
-
-	if (self->decorations & OB_FRAME_DECOR_HANDLE) {
-	    xrect[1].x = -ob_rr_theme->bwidth;
-	    xrect[1].y = FRAME_HANDLE_Y(self);
-	    xrect[1].width = self->width + self->rbwidth * 2;
-	    xrect[1].height = ob_rr_theme->handle_height +
-		self->bwidth * 2;
-	    ++num;
-	}
-
-	XShapeCombineRectangles(ob_display, self->window,
-				ShapeBounding, 0, 0, xrect, num,
-				ShapeUnion, Unsorted);
+        /* make the frame's shape match the clients */
+        XShapeCombineShape(ob_display, self->window, ShapeBounding,
+                           self->innersize.left,
+                           self->innersize.top,
+                           self->client->window,
+                           ShapeBounding, ShapeSet);
+
+        num = 0;
+        if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
+            xrect[0].x = -ob_rr_theme->fbwidth;
+            xrect[0].y = -ob_rr_theme->fbwidth;
+            xrect[0].width = self->width + self->rbwidth * 2;
+            xrect[0].height = ob_rr_theme->title_height +
+                self->bwidth * 2;
+            ++num;
+        }
+
+        if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+            xrect[1].x = -ob_rr_theme->fbwidth;
+            xrect[1].y = FRAME_HANDLE_Y(self);
+            xrect[1].width = self->width + self->rbwidth * 2;
+            xrect[1].height = ob_rr_theme->handle_height +
+                self->bwidth * 2;
+            ++num;
+        }
+
+        XShapeCombineRectangles(ob_display, self->window,
+                                ShapeBounding, 0, 0, xrect, num,
+                                ShapeUnion, Unsorted);
     }
 #endif
 }
@@ -213,13 +312,18 @@ void frame_adjust_shape(ObFrame *self)
 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake)
 {
+    Strut oldsize;
+
+    oldsize = self->size;
+
     if (resized) {
         self->decorations = self->client->decorations;
         self->max_horz = self->client->max_horz;
 
         if (self->decorations & OB_FRAME_DECOR_BORDER) {
-            self->bwidth = ob_rr_theme->bwidth;
-            self->cbwidth_x = self->cbwidth_y = ob_rr_theme->cbwidth;
+            self->bwidth = ob_rr_theme->fbwidth;
+            self->cbwidth_x = ob_rr_theme->cbwidthx;
+            self->cbwidth_y = ob_rr_theme->cbwidthy;
         } else {
             self->bwidth = self->cbwidth_x = self->cbwidth_y = 0;
         }
@@ -249,7 +353,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->innersize.top += ob_rr_theme->title_height + self->rbwidth +
                 (self->rbwidth - self->bwidth);
-        if (self->decorations & OB_FRAME_DECOR_HANDLE)
+        if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+            ob_rr_theme->handle_height > 0)
             self->innersize.bottom += ob_rr_theme->handle_height +
                 self->rbwidth + (self->rbwidth - self->bwidth);
   
@@ -272,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);
@@ -290,7 +402,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             layout_title(self);
 
         if (!fake) {
-            if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+            if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+                ob_rr_theme->handle_height > 0)
+            {
                 XMoveResizeWindow(ob_display, self->handle,
                                   -self->bwidth, FRAME_HANDLE_Y(self),
                                   self->width, ob_rr_theme->handle_height);
@@ -308,12 +422,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                     XUnmapWindow(ob_display, self->lgrip);
                     XUnmapWindow(ob_display, self->rgrip);
                 }
-
-                /* XXX make a subwindow with these dimentions?
-                   ob_rr_theme->grip_width + self->bwidth, 0,
-                   self->width - (ob_rr_theme->grip_width + self->bwidth) * 2,
-                   ob_rr_theme->handle_height);
-                */
             } else
                 XUnmapWindow(ob_display, self->handle);
 
@@ -337,9 +445,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
     /* shading can change without being moved or resized */
     RECT_SET_SIZE(self->area,
-		  self->client->area.width +
-		  self->size.left + self->size.right,
-		  (self->client->shaded ?
+                  self->client->area.width +
+                  self->size.left + self->size.right,
+                  (self->client->shaded ?
                    ob_rr_theme->title_height + self->rbwidth * 2:
                    self->client->area.height +
                    self->size.top + self->size.bottom));
@@ -362,10 +470,27 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
         if (resized) {
             framerender_frame(self);
-
             frame_adjust_shape(self);
         }
+
+        if (!STRUT_EQUAL(self->size, oldsize)) {
+            gulong vals[4];
+            vals[0] = self->size.left;
+            vals[1] = self->size.right;
+            vals[2] = self->size.top;
+            vals[3] = self->size.bottom;
+            PROP_SETA32(self->client->window, net_frame_extents,
+                        cardinal, vals, 4);
+        }
+
+        /* if this occurs while we are focus cycling, the indicator needs to
+           match the changes */
+        if (focus_cycle_target == self->client)
+            focus_cycle_draw_indicator();
     }
+    if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
+        XResizeWindow(ob_display, self->label, self->label_width,
+                      ob_rr_theme->label_height);
 }
 
 void frame_adjust_state(ObFrame *self)
@@ -404,17 +529,17 @@ void frame_grab_client(ObFrame *self, ObClient *client)
       handled and need to be ignored.
     */
     if (ob_state() == OB_STATE_STARTING)
-	client->ignore_unmaps += 2;
+        client->ignore_unmaps += 2;
 
     /* select the event mask on the client's parent (to receive config/map
        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);
@@ -429,33 +554,44 @@ 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)
 {
     XEvent ev;
+    gboolean reparent = TRUE;
 
     g_assert(self->client == client);
 
     /* check if the app has already reparented its window away */
-    if (XCheckTypedWindowEvent(ob_display, client->window,
-			       ReparentNotify, &ev)) {
-	XPutBackEvent(ob_display, &ev);
-
-	/* re-map the window since the unmanaging process unmaps it */
+    while (XCheckTypedWindowEvent(ob_display, client->window,
+                                  ReparentNotify, &ev))
+    {
+        /* This check makes sure we don't catch our own reparent action to
+           our frame window. This doesn't count as the app reparenting itself
+           away of course.
+
+           Reparent events that are generated by us are just discarded here.
+           They are of no consequence to us anyhow.
+        */
+        if (ev.xreparent.parent != self->plate) {
+            reparent = FALSE;
+            XPutBackEvent(ob_display, &ev);
+            break;
+        }
+    }
 
-        /* XXX ... um no it doesnt it unmaps its parent, the window itself
-           retains its mapped state, no?! XXX
-           XMapWindow(ob_display, client->window); */
-    } else {
-	/* according to the ICCCM - if the client doesn't reparent itself,
-	   then we will reparent the window to root for them */
-	XReparentWindow(ob_display, client->window,
+    if (reparent) {
+        /* according to the ICCCM - if the client doesn't reparent itself,
+           then we will reparent the window to root for them */
+        XReparentWindow(ob_display, client->window,
                         RootWindow(ob_display, ob_screen),
-			client->area.x,
-			client->area.y);
+                        client->area.x,
+                        client->area.y);
     }
 
     /* remove all the windows for the frame from the window_map */
@@ -472,71 +608,87 @@ 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);
 
     frame_free(self);
 }
 
 static void layout_title(ObFrame *self)
 {
-    char *lc;
-    int x;
+    gchar *lc;
+    gint x;
     gboolean n, d, i, l, m, c, s;
 
     n = d = i = l = m = c = s = FALSE;
 
     /* figure out whats being shown, and the width of the label */
-    self->label_width = self->width - (ob_rr_theme->bevel + 1) * 2;
+    self->label_width = self->width - (ob_rr_theme->paddingx + 1) * 2;
     for (lc = config_title_layout; *lc != '\0'; ++lc) {
-	switch (*lc) {
-	case 'N':
+        switch (*lc) {
+        case 'N':
             if (n) { *lc = ' '; break; } /* rm duplicates */
-	    n = TRUE;
-	    self->label_width -= (ob_rr_theme->button_size + 2 +
-                                  ob_rr_theme->bevel + 1);
-	    break;
-	case 'D':
-            if (d) { *lc = ' '; break; } /* rm duplicates */
-	    d = TRUE;
-	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
-	    break;
-	case 'S':
-            if (s) { *lc = ' '; break; } /* rm duplicates */
-	    s = TRUE;
-	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
-	    break;
-	case 'I':
-            if (i) { *lc = ' '; break; } /* rm duplicates */
-	    i = TRUE;
-	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
-	    break;
-	case 'L':
-            if (l) { *lc = ' '; break; } /* rm duplicates */
-	    l = TRUE;
-	    break;
-	case 'M':
-            if (m) { *lc = ' '; break; } /* rm duplicates */
-	    m = TRUE;
-	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
-	    break;
-	case 'C':
-            if (c) { *lc = ' '; break; } /* rm duplicates */
-	    c = TRUE;
-	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
-	    break;
-	}
+            n = TRUE;
+            self->label_width -= (ob_rr_theme->button_size + 2 +
+                                  ob_rr_theme->paddingx + 1);
+            break;
+        case 'D':
+            if (d) { *lc = ' '; break; }
+            if (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS)
+                && config_theme_hidedisabled)
+                break;
+            d = TRUE;
+            self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->paddingx + 1);
+            break;
+        case 'S':
+            if (s) { *lc = ' '; break; }
+            if (!(self->decorations & OB_FRAME_DECOR_SHADE)
+                && config_theme_hidedisabled)
+                break;
+            s = TRUE;
+            self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->paddingx + 1);
+            break;
+        case 'I':
+            if (i) { *lc = ' '; break; }
+            if (!(self->decorations & OB_FRAME_DECOR_ICONIFY)
+                && config_theme_hidedisabled)
+                break;
+            i = TRUE;
+            self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->paddingx + 1);
+            break;
+        case 'L':
+            if (l) { *lc = ' '; break; }
+            l = TRUE;
+            break;
+        case 'M':
+            if (m) { *lc = ' '; break; }
+            if (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE)
+                && config_theme_hidedisabled)
+                break;
+            m = TRUE;
+            self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->paddingx + 1);
+            break;
+        case 'C':
+            if (c) { *lc = ' '; break; }
+            if (!(self->decorations & OB_FRAME_DECOR_CLOSE)
+                && config_theme_hidedisabled)
+                break;
+            c = TRUE;
+            self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->paddingx + 1);
+            break;
+        }
     }
     if (self->label_width < 1) self->label_width = 1;
 
-    XResizeWindow(ob_display, self->label, self->label_width,
-                  ob_rr_theme->label_height);
-  
     if (!n) XUnmapWindow(ob_display, self->icon);
     if (!d) XUnmapWindow(ob_display, self->desk);
     if (!s) XUnmapWindow(ob_display, self->shade);
@@ -545,94 +697,96 @@ static void layout_title(ObFrame *self)
     if (!m) XUnmapWindow(ob_display, self->max);
     if (!c) XUnmapWindow(ob_display, self->close);
 
-    x = ob_rr_theme->bevel + 1;
+    x = ob_rr_theme->paddingx + 1;
     for (lc = config_title_layout; *lc != '\0'; ++lc) {
-	switch (*lc) {
-	case 'N':
-	    if (!n) break;
-	    self->icon_x = x;
-	    XMapWindow(ob_display, self->icon);
-	    XMoveWindow(ob_display, self->icon, x, ob_rr_theme->bevel);
-	    x += ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 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->bevel + 1);
-	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 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->bevel + 1);
-	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 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->bevel + 1);
-	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 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->bevel);
-	    x += self->label_width + ob_rr_theme->bevel + 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->bevel + 1);
-	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 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->bevel + 1);
-	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
-	    break;
-	}
+        switch (*lc) {
+        case 'N':
+            if (!n) break;
+            self->icon_x = x;
+            XMapWindow(ob_display, self->icon);
+            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->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->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->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->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->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->paddingy + 1);
+            x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
+            break;
+        }
     }
 }
 
-ObFrameContext frame_context_from_string(char *name)
+ObFrameContext frame_context_from_string(const gchar *name)
 {
-    if (!g_ascii_strcasecmp("desktop", name))
+    if (!g_ascii_strcasecmp("Desktop", name))
         return OB_FRAME_CONTEXT_DESKTOP;
-    else if (!g_ascii_strcasecmp("client", name))
+    else if (!g_ascii_strcasecmp("Client", name))
         return OB_FRAME_CONTEXT_CLIENT;
-    else if (!g_ascii_strcasecmp("titlebar", name))
+    else if (!g_ascii_strcasecmp("Titlebar", name))
         return OB_FRAME_CONTEXT_TITLEBAR;
-    else if (!g_ascii_strcasecmp("handle", name))
+    else if (!g_ascii_strcasecmp("Handle", name))
         return OB_FRAME_CONTEXT_HANDLE;
-    else if (!g_ascii_strcasecmp("frame", name))
+    else if (!g_ascii_strcasecmp("Frame", name))
         return OB_FRAME_CONTEXT_FRAME;
-    else if (!g_ascii_strcasecmp("tlcorner", name))
+    else if (!g_ascii_strcasecmp("TLCorner", name))
         return OB_FRAME_CONTEXT_TLCORNER;
-    else if (!g_ascii_strcasecmp("trcorner", name))
+    else if (!g_ascii_strcasecmp("TRCorner", name))
         return OB_FRAME_CONTEXT_TRCORNER;
-    else if (!g_ascii_strcasecmp("blcorner", name))
+    else if (!g_ascii_strcasecmp("BLCorner", name))
         return OB_FRAME_CONTEXT_BLCORNER;
-    else if (!g_ascii_strcasecmp("brcorner", name))
+    else if (!g_ascii_strcasecmp("BRCorner", name))
         return OB_FRAME_CONTEXT_BRCORNER;
-    else if (!g_ascii_strcasecmp("maximize", name))
+    else if (!g_ascii_strcasecmp("Maximize", name))
         return OB_FRAME_CONTEXT_MAXIMIZE;
-    else if (!g_ascii_strcasecmp("alldesktops", name))
+    else if (!g_ascii_strcasecmp("AllDesktops", name))
         return OB_FRAME_CONTEXT_ALLDESKTOPS;
-    else if (!g_ascii_strcasecmp("shade", name))
+    else if (!g_ascii_strcasecmp("Shade", name))
         return OB_FRAME_CONTEXT_SHADE;
-    else if (!g_ascii_strcasecmp("iconify", name))
+    else if (!g_ascii_strcasecmp("Iconify", name))
         return OB_FRAME_CONTEXT_ICONIFY;
-    else if (!g_ascii_strcasecmp("icon", name))
+    else if (!g_ascii_strcasecmp("Icon", name))
         return OB_FRAME_CONTEXT_ICON;
-    else if (!g_ascii_strcasecmp("close", name))
+    else if (!g_ascii_strcasecmp("Close", name))
         return OB_FRAME_CONTEXT_CLOSE;
+    else if (!g_ascii_strcasecmp("MoveResize", name))
+        return OB_FRAME_CONTEXT_MOVE_RESIZE;
     return OB_FRAME_CONTEXT_NONE;
 }
 
@@ -640,6 +794,9 @@ ObFrameContext frame_context(ObClient *client, Window win)
 {
     ObFrame *self;
 
+    if (moveresize_in_progress)
+        return OB_FRAME_CONTEXT_MOVE_RESIZE;
+
     if (win == RootWindow(ob_display, ob_screen))
         return OB_FRAME_CONTEXT_DESKTOP;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
@@ -666,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;
@@ -678,7 +837,7 @@ ObFrameContext frame_context(ObClient *client, Window win)
     return OB_FRAME_CONTEXT_NONE;
 }
 
-void frame_client_gravity(ObFrame *self, int *x, int *y)
+void frame_client_gravity(ObFrame *self, gint *x, gint *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -686,24 +845,24 @@ void frame_client_gravity(ObFrame *self, int *x, int *y)
     case NorthWestGravity:
     case SouthWestGravity:
     case WestGravity:
-	break;
+        break;
 
     case NorthGravity:
     case SouthGravity:
     case CenterGravity:
-	*x -= (self->size.left + self->size.right) / 2;
-	break;
+        *x -= (self->size.left + self->size.right) / 2;
+        break;
 
     case NorthEastGravity:
     case SouthEastGravity:
     case EastGravity:
-	*x -= self->size.left + self->size.right;
-	break;
+        *x -= self->size.left + self->size.right;
+        break;
 
     case ForgetGravity:
     case StaticGravity:
-	*x -= self->size.left;
-	break;
+        *x -= self->size.left;
+        break;
     }
 
     /* vertical */
@@ -712,28 +871,28 @@ void frame_client_gravity(ObFrame *self, int *x, int *y)
     case NorthWestGravity:
     case NorthEastGravity:
     case NorthGravity:
-	break;
+        break;
 
     case CenterGravity:
     case EastGravity:
     case WestGravity:
-	*y -= (self->size.top + self->size.bottom) / 2;
-	break;
+        *y -= (self->size.top + self->size.bottom) / 2;
+        break;
 
     case SouthWestGravity:
     case SouthEastGravity:
     case SouthGravity:
-	*y -= self->size.top + self->size.bottom;
-	break;
+        *y -= self->size.top + self->size.bottom;
+        break;
 
     case ForgetGravity:
     case StaticGravity:
-	*y -= self->size.top;
-	break;
+        *y -= self->size.top;
+        break;
     }
 }
 
-void frame_frame_gravity(ObFrame *self, int *x, int *y)
+void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -741,21 +900,21 @@ void frame_frame_gravity(ObFrame *self, int *x, int *y)
     case NorthWestGravity:
     case WestGravity:
     case SouthWestGravity:
-	break;
+        break;
     case NorthGravity:
     case CenterGravity:
     case SouthGravity:
-	*x += (self->size.left + self->size.right) / 2;
-	break;
+        *x += (self->size.left + self->size.right) / 2;
+        break;
     case NorthEastGravity:
     case EastGravity:
     case SouthEastGravity:
-	*x += self->size.left + self->size.right;
-	break;
+        *x += self->size.left + self->size.right;
+        break;
     case StaticGravity:
     case ForgetGravity:
-	*x += self->size.left;
-	break;
+        *x += self->size.left;
+        break;
     }
 
     /* vertical */
@@ -764,28 +923,27 @@ void frame_frame_gravity(ObFrame *self, int *x, int *y)
     case NorthWestGravity:
     case NorthGravity:
     case NorthEastGravity:
-	break;
+        break;
     case WestGravity:
     case CenterGravity:
     case EastGravity:
-	*y += (self->size.top + self->size.bottom) / 2;
-	break;
+        *y += (self->size.top + self->size.bottom) / 2;
+        break;
     case SouthWestGravity:
     case SouthGravity:
     case SouthEastGravity:
-	*y += self->size.top + self->size.bottom;
-	break;
+        *y += self->size.top + self->size.bottom;
+        break;
     case StaticGravity:
     case ForgetGravity:
-	*y += self->size.top;
-	break;
+        *y += self->size.top;
+        break;
     }
 }
 
 static void flash_done(gpointer data)
 {
     ObFrame *self = data;
-    self->flashing = FALSE;
 
     if (self->focused != self->flash_on)
         frame_adjust_focus(self, self->focused);
@@ -795,41 +953,42 @@ static gboolean flash_timeout(gpointer data)
 {
     ObFrame *self = data;
     GTimeVal now;
-    gboolean focused;
-
-    g_message("flash");
 
     g_get_current_time(&now);
     if (now.tv_sec > self->flash_end.tv_sec ||
         (now.tv_sec == self->flash_end.tv_sec &&
-         now.tv_usec >= self->flash_end.tv_usec)) {
-        g_message("done flashing");
+         now.tv_usec >= self->flash_end.tv_usec))
+        self->flashing = FALSE;
+
+    if (!self->flashing)
         return FALSE; /* we are done */
-    }
 
     self->flash_on = !self->flash_on;
-    g_message("on %d", self->flash_on);
-    {
-        focused = self->focused; /* save the focused flag */
+    if (!self->focused) {
         frame_adjust_focus(self, self->flash_on);
-        self->focused = focused;
+        self->focused = FALSE;
     }
 
     return TRUE; /* go again */
 }
 
-void frame_flash(ObFrame *self)
+void frame_flash_start(ObFrame *self)
 {
     self->flash_on = self->focused;
 
     if (!self->flashing)
         ob_main_loop_timeout_add(ob_main_loop,
-                                 G_USEC_PER_SEC / 2,
+                                 G_USEC_PER_SEC * 0.6,
                                  flash_timeout,
                                  self,
                                  flash_done);
     g_get_current_time(&self->flash_end);
-    g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 4);
+    g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
     
     self->flashing = TRUE;
 }
+
+void frame_flash_stop(ObFrame *self)
+{
+    self->flashing = FALSE;
+}