frame pointer in framedecor instead of client pointer

diff --git a/openbox/frame.c b/openbox/frame.c
index 19ff7464ca9cc8a1efafb8800ceed9b4e06f647c..dd13c5be5930659b6d1d9f5797db4408c8475ef4 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -59,7 +59,7 @@ XSetWindowBorderWidth(ob_display, self->window, 3);
     RECT_SET(self->framedecor[0].position, 0, 0, 150, 10);
     self->framedecor[0].type = Decor_Titlebar;
     self->framedecor[0].context = Context_Titlebar;
-    self->framedecor[0].client = self->client;
+    self->framedecor[0].frame = self;
 XSetWindowBorderWidth(ob_display, self->framedecor[0].window, 3);
     XMapWindow(ob_display, self->framedecor[0].window);
 
@@ -69,7 +69,7 @@ XSetWindowBorderWidth(ob_display, self->framedecor[0].window, 3);
     RECT_SET(self->framedecor[1].position, 0, 0, 10, 30);
     self->framedecor[1].type = Decor_Titlebar;
     self->framedecor[1].context = Context_Titlebar;
-    self->framedecor[1].client = self->client;
+    self->framedecor[1].frame = self;
 XSetWindowBorderWidth(ob_display, self->framedecor[1].window, 3);
     XMapWindow(ob_display, self->framedecor[1].window);
 

diff --git a/openbox/frame.h b/openbox/frame.h
index 47ed0d9bc538ed11b80bad88927e3cfa15a6e0df..5a97ab53529519127adec99bc3607cfc281691f9 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -40,6 +40,8 @@ typedef enum {
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
                           f->cbwidth)
 
+struct Frame;
+
 typedef struct FrameDecor {
     ObWindow obwin;
     Window window;
@@ -48,7 +50,7 @@ typedef struct FrameDecor {
     Anchor anchor;
     Rect position;
     Decoration type;
-    Client *client;
+    struct Frame *frame;
 } FrameDecor;
 
 typedef struct Frame {
@@ -62,7 +64,7 @@ typedef struct Frame {
     gboolean visible;
 
     int framedecors;
-    FrameDecor *framedecor;
+    struct FrameDecor *framedecor;
 
     int width;         /* width of client + borders */
     int height;         /* height of client + borders */