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

diff --git a/openbox/frame.c b/openbox/frame.c
index 2976ca2f..880ab1b5 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1,6 +1,843 @@
+/* -*- 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 | \
+                         FocusChangeMask)
+#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
+                         ButtonPressMask | ButtonReleaseMask | \
+                         VisibilityChangeMask)
+#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
+                           ButtonMotionMask | ExposureMask | \
+                           EnterWindowMask | LeaveWindowMask)
+
+#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
+                           f->cbwidth_y)
+
+static void layout_title(ObFrame *self);
+static void flash_done(gpointer data);
+static gboolean flash_timeout(gpointer data);
+
+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,
+                         (visual ? 32 : RrDepth(ob_rr_inst)), InputOutput,
+                         (visual ? visual : RrVisual(ob_rr_inst)),
+                         mask, attrib);
+                       
+}
+
+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;
+    gulong mask;
+    ObFrame *self;
+    Visual *visual;
+
+    self = g_new0(ObFrame, 1);
+
+    self->obscured = TRUE;
+
+    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;
+    self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
+                                mask, &attrib);
+    mask &= ~CWEventMask;
+    self->plate = createWindow(self->window, 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->title = createWindow(self->window, NULL, mask, &attrib);
+
+    mask |= CWCursor;
+    attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
+    self->tltresize = createWindow(self->title, NULL, mask, &attrib);
+    self->tllresize = createWindow(self->title, NULL, mask, &attrib);
+    attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
+    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);
+    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, NULL, mask, &attrib);
+    attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
+    self->rgrip = createWindow(self->handle, NULL, mask, &attrib); 
+
+    self->focused = FALSE;
+
+    /* the other stuff is shown based on decor settings */
+    XMapWindow(ob_display, self->plate);
+    XMapWindow(ob_display, self->lgrip);
+    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,
+                     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);
+    XResizeWindow(ob_display, self->iconify,
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
+    XResizeWindow(ob_display, self->icon,
+                  ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
+    XResizeWindow(ob_display, self->close,
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
+    XResizeWindow(ob_display, self->desk,
+                  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);
+    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);
+    self->a_focused_title = RrAppearanceCopy(ob_rr_theme->a_focused_title);
+    self->a_unfocused_label = RrAppearanceCopy(ob_rr_theme->a_unfocused_label);
+    self->a_focused_label = RrAppearanceCopy(ob_rr_theme->a_focused_label);
+    self->a_unfocused_handle =
+        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);
+}
+
+static void free_theme_statics(ObFrame *self)
+{
+    RrAppearanceFree(self->a_unfocused_title); 
+    RrAppearanceFree(self->a_focused_title);
+    RrAppearanceFree(self->a_unfocused_label);
+    RrAppearanceFree(self->a_focused_label);
+    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->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 += 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
+    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);
+    } 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->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
+}
+
+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->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;
+        }
+        self->rbwidth = self->bwidth;
+
+        if (self->max_horz)
+            self->bwidth = self->cbwidth_x = 0;
+
+        STRUT_SET(self->innersize,
+                  self->cbwidth_x,
+                  self->cbwidth_y,
+                  self->cbwidth_x,
+                  self->cbwidth_y);
+        self->width = self->client->area.width + self->cbwidth_x * 2 -
+            (self->max_horz ? self->rbwidth * 2 : 0);
+        self->width = MAX(self->width, 1); /* no lower than 1 */
+
+        /* set border widths */
+        if (!fake) {
+            XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
+            XSetWindowBorderWidth(ob_display, self->title,  self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->handle, self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->lgrip,  self->rbwidth);
+            XSetWindowBorderWidth(ob_display, self->rgrip,  self->rbwidth);
+        }
+
+        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 &&
+            ob_rr_theme->handle_height > 0)
+            self->innersize.bottom += ob_rr_theme->handle_height +
+                self->rbwidth + (self->rbwidth - self->bwidth);
+  
+        /* they all default off, they're turned on in layout_title */
+        self->icon_x = -1;
+        self->desk_x = -1;
+        self->shade_x = -1;
+        self->iconify_x = -1;
+        self->label_x = -1;
+        self->max_x = -1;
+        self->close_x = -1;
+
+        /* position/size and map/unmap all the windows */
+
+        if (!fake) {
+            if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
+                XMoveResizeWindow(ob_display, self->title,
+                                  -self->bwidth, -self->bwidth,
+                                  self->width, ob_rr_theme->title_height);
+                XMapWindow(ob_display, self->title);
+
+                if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+                    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);
+                    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->tltresize);
+                    XUnmapWindow(ob_display, self->tllresize);
+                    XUnmapWindow(ob_display, self->trtresize);
+                    XUnmapWindow(ob_display, self->trrresize);
+                }
+            } else
+                XUnmapWindow(ob_display, self->title);
+        }
+
+        if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
+            /* layout the title bar elements */
+            layout_title(self);
+
+        if (!fake) {
+            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);
+                XMapWindow(ob_display, self->handle);
+
+                if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+                    XMoveWindow(ob_display, self->lgrip,
+                                -self->rbwidth, -self->rbwidth);
+                    XMoveWindow(ob_display, self->rgrip,
+                                -self->rbwidth + self->width -
+                                ob_rr_theme->grip_width, -self->rbwidth);
+                    XMapWindow(ob_display, self->lgrip);
+                    XMapWindow(ob_display, self->rgrip);
+                } else {
+                    XUnmapWindow(ob_display, self->lgrip);
+                    XUnmapWindow(ob_display, self->rgrip);
+                }
+            } 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,
+                        self->cbwidth_x, self->cbwidth_y);
+        }
+
+        STRUT_SET(self->size,
+                  self->innersize.left + self->bwidth,
+                  self->innersize.top + self->bwidth,
+                  self->innersize.right + self->bwidth,
+                  self->innersize.bottom + self->bwidth);
+    }
+
+    /* 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 ?
+                   ob_rr_theme->title_height + self->rbwidth * 2:
+                   self->client->area.height +
+                   self->size.top + self->size.bottom));
 
-void frame_client_gravity(Frame *self, int *x, int *y)
+    if (moved) {
+        /* find the new coordinates, done after setting the frame.size, for
+           frame_client_gravity. */
+        self->area.x = self->client->area.x;
+        self->area.y = self->client->area.y;
+        frame_client_gravity(self, &self->area.x, &self->area.y);
+    }
+
+    if (!fake) {
+        /* move and resize the top level frame.
+           shading can change without being moved or resized */
+        XMoveResizeWindow(ob_display, self->window,
+                          self->area.x, self->area.y,
+                          self->area.width - self->bwidth * 2,
+                          self->area.height - self->bwidth * 2);
+
+        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)
+{
+    framerender_frame(self);
+}
+
+void frame_adjust_focus(ObFrame *self, gboolean hilite)
+{
+    self->focused = hilite;
+    framerender_frame(self);
+}
+
+void frame_adjust_title(ObFrame *self)
+{
+    framerender_frame(self);
+}
+
+void frame_adjust_icon(ObFrame *self)
+{
+    framerender_frame(self);
+}
+
+void frame_grab_client(ObFrame *self, ObClient *client)
+{
+    self->client = client;
+
+    /* reparent the client to the frame */
+    XReparentWindow(ob_display, client->window, self->plate, 0, 0);
+    /*
+      When reparenting the client window, it is usually not mapped yet, since
+      this occurs from a MapRequest. However, in the case where Openbox is
+      starting up, the window is already mapped, so we'll see unmap events for
+      it. There are 2 unmap events generated that we see, one with the 'event'
+      member set the root window, and one set to the client, but both get
+      handled and need to be ignored.
+    */
+    if (ob_state() == OB_STATE_STARTING)
+        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);
+
+    /* 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->title, client);
+    g_hash_table_insert(window_map, &self->label, client);
+    g_hash_table_insert(window_map, &self->max, client);
+    g_hash_table_insert(window_map, &self->close, client);
+    g_hash_table_insert(window_map, &self->desk, client);
+    g_hash_table_insert(window_map, &self->shade, client);
+    g_hash_table_insert(window_map, &self->icon, client);
+    g_hash_table_insert(window_map, &self->iconify, 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->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 */
+    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;
+        }
+    }
+
+    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);
+    }
+
+    /* 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->title);
+    g_hash_table_remove(window_map, &self->label);
+    g_hash_table_remove(window_map, &self->max);
+    g_hash_table_remove(window_map, &self->close);
+    g_hash_table_remove(window_map, &self->desk);
+    g_hash_table_remove(window_map, &self->shade);
+    g_hash_table_remove(window_map, &self->icon);
+    g_hash_table_remove(window_map, &self->iconify);
+    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->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)
+{
+    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->paddingx + 1) * 2;
+    for (lc = config_title_layout; *lc != '\0'; ++lc) {
+        switch (*lc) {
+        case 'N':
+            if (n) { *lc = ' '; break; } /* rm duplicates */
+            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;
+
+    if (!n) XUnmapWindow(ob_display, self->icon);
+    if (!d) XUnmapWindow(ob_display, self->desk);
+    if (!s) XUnmapWindow(ob_display, self->shade);
+    if (!i) XUnmapWindow(ob_display, self->iconify);
+    if (!l) XUnmapWindow(ob_display, self->label);
+    if (!m) XUnmapWindow(ob_display, self->max);
+    if (!c) XUnmapWindow(ob_display, self->close);
+
+    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->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(const gchar *name)
+{
+    if (!g_ascii_strcasecmp("Desktop", name))
+        return OB_FRAME_CONTEXT_DESKTOP;
+    else if (!g_ascii_strcasecmp("Client", name))
+        return OB_FRAME_CONTEXT_CLIENT;
+    else if (!g_ascii_strcasecmp("Titlebar", name))
+        return OB_FRAME_CONTEXT_TITLEBAR;
+    else if (!g_ascii_strcasecmp("Handle", name))
+        return OB_FRAME_CONTEXT_HANDLE;
+    else if (!g_ascii_strcasecmp("Frame", name))
+        return OB_FRAME_CONTEXT_FRAME;
+    else if (!g_ascii_strcasecmp("TLCorner", name))
+        return OB_FRAME_CONTEXT_TLCORNER;
+    else if (!g_ascii_strcasecmp("TRCorner", name))
+        return OB_FRAME_CONTEXT_TRCORNER;
+    else if (!g_ascii_strcasecmp("BLCorner", name))
+        return OB_FRAME_CONTEXT_BLCORNER;
+    else if (!g_ascii_strcasecmp("BRCorner", name))
+        return OB_FRAME_CONTEXT_BRCORNER;
+    else if (!g_ascii_strcasecmp("Maximize", name))
+        return OB_FRAME_CONTEXT_MAXIMIZE;
+    else if (!g_ascii_strcasecmp("AllDesktops", name))
+        return OB_FRAME_CONTEXT_ALLDESKTOPS;
+    else if (!g_ascii_strcasecmp("Shade", name))
+        return OB_FRAME_CONTEXT_SHADE;
+    else if (!g_ascii_strcasecmp("Iconify", name))
+        return OB_FRAME_CONTEXT_ICONIFY;
+    else if (!g_ascii_strcasecmp("Icon", name))
+        return OB_FRAME_CONTEXT_ICON;
+    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;
+}
+
+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;
+    if (win == client->window) {
+        /* conceptually, this is the desktop, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_DESKTOP;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
+
+    self = client->frame;
+    if (win == self->plate) {
+        /* conceptually, this is the desktop, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_DESKTOP;
+        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->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;
+}
+
+void frame_client_gravity(ObFrame *self, gint *x, gint *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -8,24 +845,24 @@ void frame_client_gravity(Frame *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 */
@@ -34,28 +871,28 @@ void frame_client_gravity(Frame *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(Frame *self, int *x, int *y)
+void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -63,43 +900,95 @@ void frame_frame_gravity(Frame *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 */
     switch (self->client->gravity) {
     default:
     case NorthWestGravity:
-    case WestGravity:
-    case SouthWestGravity:
-	break;
     case NorthGravity:
-    case CenterGravity:
-    case SouthGravity:
-	*y += (self->size.top + self->size.bottom) / 2;
-	break;
     case NorthEastGravity:
+        break;
+    case WestGravity:
+    case CenterGravity:
     case EastGravity:
+        *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;
+
+    if (self->focused != self->flash_on)
+        frame_adjust_focus(self, self->focused);
+}
+
+static gboolean flash_timeout(gpointer data)
+{
+    ObFrame *self = data;
+    GTimeVal now;
+
+    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))
+        self->flashing = FALSE;
+
+    if (!self->flashing)
+        return FALSE; /* we are done */
+
+    self->flash_on = !self->flash_on;
+    if (!self->focused) {
+        frame_adjust_focus(self, self->flash_on);
+        self->focused = FALSE;
     }
+
+    return TRUE; /* go again */
+}
+
+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 * 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 * 5);
+    
+    self->flashing = TRUE;
+}
+
+void frame_flash_stop(ObFrame *self)
+{
+    self->flashing = FALSE;
 }