revert 7246 and simplify action_raiselower a bit, turns out 7246 wasn't needed for...

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index 956c0258c59e71044bf9377ba84758b8ca4dd950..0691821c7dc54b3b6787d876b893671dbe3075ea 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -77,7 +77,6 @@ struct _ObFrame
     struct _ObClient *client;
 
     Window    window;
-    Window    plate;
 
     Strut     size;
     Rect      area;
@@ -85,9 +84,7 @@ struct _ObFrame
 
     guint     functions;
     guint     decorations;
-    gboolean  max_horz;
 
-    Window    inner;  /*!< The window for drawing the inner client border */
     Window    title;
     Window    label;
     Window    max;
@@ -119,6 +116,13 @@ struct _ObFrame
     Window    rgriptop;
     Window    rgripright;
     Window    rgripbottom;
+    Window    innerleft;    /*!< For drawing the inner client border */
+    Window    innertop;     /*!< For drawing the inner client border */
+    Window    innerright;   /*!< For drawing the inner client border */
+    Window    innerbottom;  /*!< For drawing the inner client border */
+    Window    backback;     /*!< A colored window shown while resizing */
+    Window    backfront;    /*!< An undrawn-in window, to prevent flashing on
+                                 unmap */
 
     /* These are resize handles inside the titlebar */
     Window    topresize;
@@ -158,8 +162,12 @@ struct _ObFrame
     gint      close_x;       /* x-position of the window close button */
     gint      bwidth;        /* border width */
     gint      rbwidth;       /* border width between the title and client */
-    gint      cbwidth_x;     /* client border width */
-    gint      cbwidth_y;     /* client border width */
+    gint      cbwidth_l;     /* client border width */
+    gint      cbwidth_t;     /* client border width */
+    gint      cbwidth_r;     /* client border width */
+    gint      cbwidth_b;     /* client border width */
+    gboolean  max_horz;      /* when maxed some decorations are hidden */
+    gboolean  max_vert;      /* when maxed some decorations are hidden */
 
     /* the leftmost and rightmost elements in the titlebar */
     ObFrameContext leftmost;