X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=3e90c3e2ccffd46768fda18d281fda541767fa4e;hb=81af5a8b0caadc0a82ff2304c315f816c9576e93;hp=eee01e48a75b917b3e92add5a9682503b1cc2629;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index eee01e48..3e90c3e2 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1,6 +1,606 @@
 #include "frame.h"
+#include "client.h"
+#include "openbox.h"
+#include "extensions.h"
+#include "framerender.h"
+#include "render/theme.h"
 
-void frame_client_gravity(Frame *self, int *x, int *y)
+#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
+#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
+                         ButtonPressMask | ButtonReleaseMask)
+#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
+                           ButtonMotionMask | ExposureMask)
+
+#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
+		           f->cbwidth)
+
+static void layout_title(ObFrame *self);
+
+static Window createWindow(Window parent, unsigned long mask,
+			   XSetWindowAttributes *attrib)
+{
+    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
+			 RrDepth(ob_rr_inst), InputOutput,
+                         RrVisual(ob_rr_inst), mask, attrib);
+                       
+}
+
+ObFrame *frame_new()
+{
+    XSetWindowAttributes attrib;
+    unsigned long mask;
+    ObFrame *self;
+
+    self = g_new(ObFrame, 1);
+
+    self->visible = FALSE;
+    self->decorations = 0;
+
+    /* create all of the decor windows */
+    mask = CWOverrideRedirect | CWEventMask;
+    attrib.event_mask = FRAME_EVENTMASK;
+    attrib.override_redirect = TRUE;
+    self->window = createWindow(RootWindow(ob_display, ob_screen),
+                                mask, &attrib);
+
+    mask = 0;
+    self->plate = createWindow(self->window, mask, &attrib);
+
+    mask = CWEventMask;
+    attrib.event_mask = ELEMENT_EVENTMASK;
+    self->title = createWindow(self->window, mask, &attrib);
+    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);
+    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->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);
+
+    /* 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->rgrip, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel);
+
+    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);
+    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);
+
+    /* 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);
+
+    self->max_press = self->close_press = self->desk_press = 
+	self->iconify_press = self->shade_press = FALSE;
+
+    return (ObFrame*)self;
+}
+
+static void frame_free(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);
+
+    XDestroyWindow(ob_display, self->window);
+
+    g_free(self);
+}
+
+void frame_show(ObFrame *self)
+{
+    if (!self->visible) {
+	self->visible = TRUE;
+	XMapWindow(ob_display, self->window);
+    }
+}
+
+void frame_hide(ObFrame *self)
+{
+    if (self->visible) {
+	self->visible = FALSE;
+	self->client->ignore_unmaps++;
+	XUnmapWindow(ob_display, self->window);
+    }
+}
+
+void frame_adjust_shape(ObFrame *self)
+{
+#ifdef SHAPE
+    int 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->bevel;
+	    xrect[0].y = -ob_rr_theme->bevel;
+	    xrect[0].width = self->width + self->bwidth * 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->bevel;
+	    xrect[1].y = FRAME_HANDLE_Y(self);
+	    xrect[1].width = self->width + self->bwidth * 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)
+{
+    if (resized) {
+        self->decorations = self->client->decorations;
+        if (self->decorations & OB_FRAME_DECOR_BORDER) {
+            self->bwidth = ob_rr_theme->bwidth;
+            self->cbwidth = ob_rr_theme->cbwidth;
+        } else {
+            self->bwidth = self->cbwidth = 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);
+
+        /* 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 */
+
+        /* 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;
+
+        if (self->decorations & OB_FRAME_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);
+
+            /* layout the title bar elements */
+            layout_title(self);
+        } else
+            XUnmapWindow(ob_display, self->title);
+
+        if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+            XMoveResizeWindow(ob_display, self->handle,
+                              -self->bwidth, FRAME_HANDLE_Y(self),
+                              self->width, ob_rr_theme->handle_height);
+            self->innersize.bottom += ob_rr_theme->handle_height +
+                self->bwidth;
+            XMapWindow(ob_display, self->handle);
+
+            if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+                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);
+                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);
+    }
+
+    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 (resized) {
+        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->bwidth*2:
+                   self->client->area.height +
+                   self->size.top + self->size.bottom));
+
+    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((ObFrame*)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 (resized) {
+        framerender_frame(self);
+
+        frame_adjust_shape(self);
+    }
+}
+
+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);
+
+    /* map the client so it maps when the frame does */
+    XMapWindow(ob_display, client->window);
+
+    frame_adjust_area(self, TRUE, TRUE);
+
+    /* 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);
+}
+
+void frame_release_client(ObFrame *self, ObClient *client)
+{
+    XEvent ev;
+
+    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 */
+
+        /* 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,
+                        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);
+
+    frame_free(self);
+}
+
+static void layout_title(ObFrame *self)
+{
+    char *lc;
+    int 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;
+    for (lc = ob_rr_theme->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->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;
+	}
+    }
+    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);
+    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->bevel + 1;
+    for (lc = ob_rr_theme->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;
+	}
+    }
+}
+
+ObFrameContext frame_context_from_string(char *name)
+{
+    if (!g_ascii_strcasecmp("root", name))
+        return OB_FRAME_CONTEXT_ROOT;
+    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("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;
+    return OB_FRAME_CONTEXT_NONE;
+}
+
+ObFrameContext frame_context(ObClient *client, Window win)
+{
+    ObFrame *self;
+
+    if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
+    if (client == NULL) return OB_FRAME_CONTEXT_NONE;
+    if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
+
+    self = client->frame;
+    if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
+    if (win == self->plate)  return OB_FRAME_CONTEXT_CLIENT;
+    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->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, int *x, int *y)
 {
     /* horizontal */
     switch (self->client->gravity) {
@@ -55,7 +655,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) {
@@ -76,7 +676,7 @@ void frame_frame_gravity(Frame *self, int *x, int *y)
 	break;
     case StaticGravity:
     case ForgetGravity:
-	x += self->size.left;
+	*x += self->size.left;
 	break;
     }