X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=50534823b44edf5a7d3dc979c709a899a9e087a6;hb=ebe3091560a859996a9904c342c62b512b39bee0;hp=a2335e9f04a91c2b4507c348b51071745d56927e;hpb=2477a38d2f3063b697e44bf3690cf280fb26ca8a;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index a2335e9f..50534823 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1,24 +1,48 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   frame.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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 "config.h"
 #include "framerender.h"
+#include "mainloop.h"
+#include "moveresize.h"
 #include "render/theme.h"
 
 #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+                         ButtonPressMask | ButtonReleaseMask | \
+                         VisibilityChangeMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
-                           ButtonMotionMask | ExposureMask)
+                           ButtonMotionMask | ExposureMask | \
+                           EnterWindowMask | LeaveWindowMask)
 
-static void layout_title(Frame *self);
+#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
+		           f->cbwidth_y)
 
-void frame_startup()
-{
-}
+static void layout_title(ObFrame *self);
+static void flash_done(gpointer data);
+static gboolean flash_timeout(gpointer data);
 
-void frame_shutdown()
-{
-}
+static void set_theme_statics(ObFrame *self);
+static void free_theme_statics(ObFrame *self);
 
 static Window createWindow(Window parent, unsigned long mask,
 			   XSetWindowAttributes *attrib)
@@ -29,22 +53,25 @@ static Window createWindow(Window parent, unsigned long mask,
                        
 }
 
-Frame *frame_new()
+ObFrame *frame_new()
 {
     XSetWindowAttributes attrib;
     unsigned long mask;
-    Frame *self;
+    ObFrame *self;
 
-    self = g_new(Frame, 1);
+    self = g_new(ObFrame, 1);
 
     self->visible = FALSE;
+    self->obscured = TRUE;
     self->decorations = 0;
+    self->flashing = FALSE;
 
     /* create all of the decor windows */
     mask = CWOverrideRedirect | CWEventMask;
     attrib.event_mask = FRAME_EVENTMASK;
     attrib.override_redirect = TRUE;
-    self->window = createWindow(ob_root, mask, &attrib);
+    self->window = createWindow(RootWindow(ob_display, ob_screen),
+                                mask, &attrib);
 
     mask = 0;
     self->plate = createWindow(self->window, mask, &attrib);
@@ -52,6 +79,14 @@ Frame *frame_new()
     mask = CWEventMask;
     attrib.event_mask = ELEMENT_EVENTMASK;
     self->title = createWindow(self->window, mask, &attrib);
+
+    mask |= CWCursor;
+    attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
+    self->tlresize = createWindow(self->title, mask, &attrib);
+    attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
+    self->trresize = createWindow(self->title, 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);
@@ -60,11 +95,12 @@ Frame *frame_new()
     self->icon = createWindow(self->title, mask, &attrib);
     self->iconify = createWindow(self->title, mask, &attrib);
     self->handle = createWindow(self->window, mask, &attrib);
+
     mask |= CWCursor;
     attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST);
     self->lgrip = createWindow(self->handle, mask, &attrib);
     attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
-    self->rgrip = createWindow(self->handle, mask, &attrib);
+    self->rgrip = createWindow(self->handle, mask, &attrib); 
 
     self->focused = FALSE;
 
@@ -74,9 +110,22 @@ Frame *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->label, 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);
 
@@ -96,6 +145,10 @@ Frame *frame_new()
                   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);
 
     /* set up the dynamic appearances */
     self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
@@ -106,14 +159,9 @@ Frame *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;
-
-    return (Frame*)self;
 }
 
-static void frame_free(Frame *self)
+static void free_theme_statics(ObFrame *self)
 {
     RrAppearanceFree(self->a_unfocused_title); 
     RrAppearanceFree(self->a_focused_title);
@@ -122,13 +170,18 @@ static void frame_free(Frame *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);
 
     g_free(self);
 }
 
-void frame_show(Frame *self)
+void frame_show(ObFrame *self)
 {
     if (!self->visible) {
 	self->visible = TRUE;
@@ -136,7 +189,7 @@ void frame_show(Frame *self)
     }
 }
 
-void frame_hide(Frame *self)
+void frame_hide(ObFrame *self)
 {
     if (self->visible) {
 	self->visible = FALSE;
@@ -145,7 +198,13 @@ void frame_hide(Frame *self)
     }
 }
 
-void frame_adjust_shape(Frame *self)
+void frame_adjust_theme(ObFrame *self)
+{
+    free_theme_statics(self);
+    set_theme_statics(self);
+}
+
+void frame_adjust_shape(ObFrame *self)
 {
 #ifdef SHAPE
     int num;
@@ -166,19 +225,19 @@ void frame_adjust_shape(Frame *self)
 			   ShapeBounding, ShapeSet);
 
 	num = 0;
-	if (self->decorations & Decor_Titlebar) {
-	    xrect[0].x = -ob_rr_theme->bevel;
-	    xrect[0].y = -ob_rr_theme->bevel;
-	    xrect[0].width = self->width + self->bwidth * 2;
+	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 & Decor_Handle) {
-	    xrect[1].x = -ob_rr_theme->bevel;
+	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->bwidth * 2;
+	    xrect[1].width = self->width + self->rbwidth * 2;
 	    xrect[1].height = ob_rr_theme->handle_height +
 		self->bwidth * 2;
 	    ++num;
@@ -191,31 +250,50 @@ void frame_adjust_shape(Frame *self)
 #endif
 }
 
-void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
+void frame_adjust_area(ObFrame *self, gboolean moved,
+                       gboolean resized, gboolean fake)
 {
     if (resized) {
         self->decorations = self->client->decorations;
-        if (self->decorations & Decor_Border) {
+        self->max_horz = self->client->max_horz;
+
+        if (self->decorations & OB_FRAME_DECOR_BORDER) {
             self->bwidth = ob_rr_theme->bwidth;
-            self->cbwidth = ob_rr_theme->cbwidth;
+            self->cbwidth_x = self->cbwidth_y = ob_rr_theme->cbwidth;
         } else {
-            self->bwidth = self->cbwidth = 0;
+            self->bwidth = self->cbwidth_x = self->cbwidth_y = 0;
         }
-        STRUT_SET(self->innersize, self->cbwidth, self->cbwidth,
-                  self->cbwidth, self->cbwidth);
-        self->width = self->client->area.width + self->cbwidth * 2;
-        g_assert(self->width > 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 */
-        XSetWindowBorderWidth(ob_display, self->plate,  self->cbwidth);
-        XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->title,  self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->handle, self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->lgrip,  self->bwidth);
-        XSetWindowBorderWidth(ob_display, self->rgrip,  self->bwidth);
-  
-        /* position/size and map/unmap all the windows */
+        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->show_handle)
+            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;
@@ -225,52 +303,74 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
         self->max_x = -1;
         self->close_x = -1;
 
-        if (self->decorations & Decor_Titlebar) {
-            XMoveResizeWindow(ob_display, self->title,
-                              -self->bwidth, -self->bwidth,
-                              self->width, ob_rr_theme->title_height);
-            self->innersize.top += ob_rr_theme->title_height + self->bwidth;
-            XMapWindow(ob_display, self->title);
+        /* 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->tlresize, 0, 0);
+                    XMoveWindow(ob_display, self->trresize,
+                                self->width - ob_rr_theme->grip_width, 0);
+                    XMapWindow(ob_display, self->tlresize);
+                    XMapWindow(ob_display, self->trresize);
+                } else {
+                    XUnmapWindow(ob_display, self->tlresize);
+                    XUnmapWindow(ob_display, self->trresize);
+                }
+            } else
+                XUnmapWindow(ob_display, self->title);
+        }
+
+        if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             /* layout the title bar elements */
             layout_title(self);
-        } else
-            XUnmapWindow(ob_display, self->title);
-
-        if (self->decorations & Decor_Handle) {
-            XMoveResizeWindow(ob_display, self->handle,
-                              -self->bwidth, FRAME_HANDLE_Y(self),
-                              self->width, ob_rr_theme->handle_height);
-            XMoveWindow(ob_display, self->lgrip,
-                        -self->bwidth, -self->bwidth);
-            XMoveWindow(ob_display, self->rgrip,
-                        -self->bwidth + self->width -
-                        ob_rr_theme->grip_width, -self->bwidth);
-            self->innersize.bottom += ob_rr_theme->handle_height +
-                self->bwidth;
-            XMapWindow(ob_display, self->handle);
-
-            /* 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);
-    }
 
-    if (resized) {
-        /* move and resize the plate */
-        XMoveResizeWindow(ob_display, self->plate,
-                          self->innersize.left - self->cbwidth,
-                          self->innersize.top - self->cbwidth,
-                          self->client->area.width,
-                          self->client->area.height);
-        /* when the client has StaticGravity, it likes to move around. */
-        XMoveWindow(ob_display, self->client->window, 0, 0);
-    }
+        if (!fake) {
+            if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+                ob_rr_theme->show_handle)
+            {
+                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);
+                }
+
+                /* 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);
+
+            /* 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);
+        }
 
-    if (resized) {
         STRUT_SET(self->size,
                   self->innersize.left + self->bwidth,
                   self->innersize.top + self->bwidth,
@@ -282,7 +382,8 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean 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->bwidth*2:
+		  (self->client->shaded ?
+                   ob_rr_theme->title_height + self->rbwidth * 2:
                    self->client->area.height +
                    self->size.top + self->size.bottom));
 
@@ -291,46 +392,47 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
            frame_client_gravity. */
         self->area.x = self->client->area.x;
         self->area.y = self->client->area.y;
-        frame_client_gravity((Frame*)self,
-                             &self->area.x, &self->area.y);
+        frame_client_gravity(self, &self->area.x, &self->area.y);
     }
 
-    /* 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->width,
-                      self->area.height - self->bwidth * 2);
+    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);
+        if (resized) {
+            framerender_frame(self);
 
-        frame_adjust_shape(self);
+            frame_adjust_shape(self);
+        }
     }
 }
 
-void frame_adjust_state(Frame *self)
+void frame_adjust_state(ObFrame *self)
 {
     framerender_frame(self);
 }
 
-void frame_adjust_focus(Frame *self, gboolean hilite)
+void frame_adjust_focus(ObFrame *self, gboolean hilite)
 {
     self->focused = hilite;
     framerender_frame(self);
 }
 
-void frame_adjust_title(Frame *self)
+void frame_adjust_title(ObFrame *self)
 {
     framerender_frame(self);
 }
 
-void frame_adjust_icon(Frame *self)
+void frame_adjust_icon(ObFrame *self)
 {
     framerender_frame(self);
 }
 
-void frame_grab_client(Frame *self, ObClient *client)
+void frame_grab_client(ObFrame *self, ObClient *client)
 {
     self->client = client;
 
@@ -344,7 +446,7 @@ void frame_grab_client(Frame *self, ObClient *client)
       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)
+    if (ob_state() == OB_STATE_STARTING)
 	client->ignore_unmaps += 2;
 
     /* select the event mask on the client's parent (to receive config/map
@@ -354,7 +456,7 @@ void frame_grab_client(Frame *self, ObClient *client)
     /* map the client so it maps when the frame does */
     XMapWindow(ob_display, client->window);
 
-    frame_adjust_area(self, TRUE, TRUE);
+    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);
@@ -370,9 +472,11 @@ void frame_grab_client(Frame *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);
 }
 
-void frame_release_client(Frame *self, ObClient *client)
+void frame_release_client(ObFrame *self, ObClient *client)
 {
     XEvent ev;
 
@@ -391,7 +495,8 @@ void frame_release_client(Frame *self, ObClient *client)
     } 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, ob_root,
+	XReparentWindow(ob_display, client->window,
+                        RootWindow(ob_display, ob_screen),
 			client->area.x,
 			client->area.y);
     }
@@ -410,11 +515,15 @@ void frame_release_client(Frame *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);
+
+    ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self);
 
     frame_free(self);
 }
 
-static void layout_title(Frame *self)
+static void layout_title(ObFrame *self)
 {
     char *lc;
     int x;
@@ -423,54 +532,48 @@ static void layout_title(Frame *self)
     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;
-    for (lc = ob_rr_theme->title_layout; *lc != '\0'; ++lc) {
+    self->label_width = self->width - (ob_rr_theme->padding + 1) * 2;
+    for (lc = config_title_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
-	    if (!(self->decorations & Decor_Icon)) break;
             if (n) { *lc = ' '; break; } /* rm duplicates */
 	    n = TRUE;
 	    self->label_width -= (ob_rr_theme->button_size + 2 +
-                                  ob_rr_theme->bevel + 1);
+                                  ob_rr_theme->padding + 1);
 	    break;
 	case 'D':
-	    if (!(self->decorations & Decor_AllDesktops)) break;
             if (d) { *lc = ' '; break; } /* rm duplicates */
 	    d = TRUE;
 	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
+                                  ob_rr_theme->padding + 1);
 	    break;
 	case 'S':
-	    if (!(self->decorations & Decor_Shade)) break;
             if (s) { *lc = ' '; break; } /* rm duplicates */
 	    s = TRUE;
 	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
+                                  ob_rr_theme->padding + 1);
 	    break;
 	case 'I':
-	    if (!(self->decorations & Decor_Iconify)) break;
             if (i) { *lc = ' '; break; } /* rm duplicates */
 	    i = TRUE;
 	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
+                                  ob_rr_theme->padding + 1);
 	    break;
 	case 'L':
             if (l) { *lc = ' '; break; } /* rm duplicates */
 	    l = TRUE;
 	    break;
 	case 'M':
-	    if (!(self->decorations & Decor_Maximize)) break;
             if (m) { *lc = ' '; break; } /* rm duplicates */
 	    m = TRUE;
 	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
+                                  ob_rr_theme->padding + 1);
 	    break;
 	case 'C':
-	    if (!(self->decorations & Decor_Close)) break;
             if (c) { *lc = ' '; break; } /* rm duplicates */
 	    c = TRUE;
 	    self->label_width -= (ob_rr_theme->button_size +
-                                  ob_rr_theme->bevel + 1);
+                                  ob_rr_theme->padding + 1);
 	    break;
 	}
     }
@@ -487,124 +590,145 @@ static void layout_title(Frame *self)
     if (!m) XUnmapWindow(ob_display, self->max);
     if (!c) XUnmapWindow(ob_display, self->close);
 
-    x = ob_rr_theme->bevel + 1;
-    for (lc = ob_rr_theme->title_layout; *lc != '\0'; ++lc) {
+    x = ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display, self->icon, x, ob_rr_theme->padding);
+	    x += ob_rr_theme->button_size + 2 + ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display, self->desk, x, ob_rr_theme->padding + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display, self->shade, x, ob_rr_theme->padding + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->padding + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display, self->label, x, ob_rr_theme->padding);
+	    x += self->label_width + ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display, self->max, x, ob_rr_theme->padding + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->padding + 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;
+	    XMoveWindow(ob_display, self->close, x, ob_rr_theme->padding + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
 	    break;
 	}
     }
 }
 
-Context frame_context_from_string(char *name)
+ObFrameContext frame_context_from_string(const gchar *name)
 {
-    if (!g_ascii_strcasecmp("root", name))
-        return Context_Root;
-    else if (!g_ascii_strcasecmp("client", name))
-        return Context_Client;
-    else if (!g_ascii_strcasecmp("titlebar", name))
-        return Context_Titlebar;
-    else if (!g_ascii_strcasecmp("handle", name))
-        return Context_Handle;
-    else if (!g_ascii_strcasecmp("frame", name))
-        return Context_Frame;
-    else if (!g_ascii_strcasecmp("blcorner", name))
-        return Context_BLCorner;
-    else if (!g_ascii_strcasecmp("tlcorner", name))
-        return Context_TLCorner;
-    else if (!g_ascii_strcasecmp("brcorner", name))
-        return Context_BRCorner;
-    else if (!g_ascii_strcasecmp("trcorner", name))
-        return Context_TRCorner;
-    else if (!g_ascii_strcasecmp("maximize", name))
-        return Context_Maximize;
-    else if (!g_ascii_strcasecmp("alldesktops", name))
-        return Context_AllDesktops;
-    else if (!g_ascii_strcasecmp("shade", name))
-        return Context_Shade;
-    else if (!g_ascii_strcasecmp("iconify", name))
-        return Context_Iconify;
-    else if (!g_ascii_strcasecmp("icon", name))
-        return Context_Icon;
-    else if (!g_ascii_strcasecmp("close", name))
-        return Context_Close;
-    return Context_None;
+    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;
 }
 
-Context frame_context(ObClient *client, Window win)
+ObFrameContext frame_context(ObClient *client, Window win)
 {
-    Frame *self;
-
-    if (win == ob_root) return Context_Root;
-    if (client == NULL) return Context_None;
-    if (win == client->window) return Context_Client;
+    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->window) return Context_Frame;
-    if (win == self->plate)  return Context_Client;
-    if (win == self->title)  return Context_Titlebar;
-    if (win == self->label)  return Context_Titlebar;
-    if (win == self->handle) return Context_Handle;
-    if (win == self->lgrip)  return Context_BLCorner;
-    if (win == self->rgrip)  return Context_BRCorner;
-    if (win == self->max)    return Context_Maximize;
-    if (win == self->iconify)return Context_Iconify;
-    if (win == self->close)  return Context_Close;
-    if (win == self->icon)   return Context_Icon;
-    if (win == self->desk)   return Context_AllDesktops;
-    if (win == self->shade)  return Context_Shade;
-
-    return Context_None;
+    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->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;
+
+    return OB_FRAME_CONTEXT_NONE;
 }
 
-void frame_client_gravity(Frame *self, int *x, int *y)
+void frame_client_gravity(ObFrame *self, int *x, int *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -659,7 +783,7 @@ void frame_client_gravity(Frame *self, int *x, int *y)
     }
 }
 
-void frame_frame_gravity(Frame *self, int *x, int *y)
+void frame_frame_gravity(ObFrame *self, int *x, int *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -688,16 +812,16 @@ void frame_frame_gravity(Frame *self, int *x, int *y)
     switch (self->client->gravity) {
     default:
     case NorthWestGravity:
-    case WestGravity:
-    case SouthWestGravity:
-	break;
     case NorthGravity:
+    case NorthEastGravity:
+	break;
+    case WestGravity:
     case CenterGravity:
-    case SouthGravity:
+    case EastGravity:
 	*y += (self->size.top + self->size.bottom) / 2;
 	break;
-    case NorthEastGravity:
-    case EastGravity:
+    case SouthWestGravity:
+    case SouthGravity:
     case SouthEastGravity:
 	*y += self->size.top + self->size.bottom;
 	break;
@@ -707,3 +831,58 @@ void frame_frame_gravity(Frame *self, int *x, int *y)
 	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;
+    {
+        gboolean focused;
+        
+        focused = self->focused; /* save the focused flag */
+        frame_adjust_focus(self, self->flash_on);
+        self->focused = focused;
+    }
+
+    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.75,
+                                 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;
+}