X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.h;h=af0da97582da0a5f8a80eca1e59250d5c14c9658;hb=39d94f0db04dc62bf44a24e152550e504cb6649d;hp=13e49564eabe8da9c8f0a5180b797c3003f79649;hpb=813d5c2ec963b3a108b2cbe8efcb9572934d8f59;p=chaz%2Fopenbox

diff --git a/openbox/frame.h b/openbox/frame.h
index 13e49564..af0da975 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -77,16 +77,14 @@ struct _ObFrame
     struct _ObClient *client;
 
     Window    window;
-    Window    plate;
 
     Strut     size;
     Rect      area;
     gboolean  visible;
 
+    guint     functions;
     guint     decorations;
-    gboolean  max_horz;
 
-    Window    inner;  /*!< The window for drawing the inner client border */
     Window    title;
     Window    label;
     Window    max;
@@ -99,13 +97,39 @@ struct _ObFrame
     Window    lgrip;
     Window    rgrip;
 
+    /* These are borders of the frame and its elements */
+    Window    titleleft;
+    Window    titletop;
+    Window    titletopleft;
+    Window    titletopright;
+    Window    titleright;
+    Window    titlebottom;
+    Window    left;
+    Window    right;
+    Window    handleleft;
+    Window    handletop;
+    Window    handleright;
+    Window    handlebottom;
+    Window    lgriptop;
+    Window    lgripleft;
+    Window    lgripbottom;
+    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;
     Window    tltresize;
     Window    tllresize;
     Window    trtresize;
     Window    trrresize;
-    Window    leftresize;
-    Window    rightresize;
 
     Colormap  colormap;
 
@@ -117,8 +141,6 @@ struct _ObFrame
     RrAppearance *a_unfocused_handle;
     RrAppearance *a_focused_handle;
 
-    Strut     innersize;
-
     GSList   *clients;
 
     gint      icon_on;    /* if the window icon button is on */
@@ -139,9 +161,11 @@ struct _ObFrame
     gint      max_x;         /* x-position of the window maximize button */
     gint      close_x;       /* x-position of the window close button */
     gint      bwidth;        /* border width */
-    gint      rbwidth;       /* title border width */
+    gint      rbwidth;       /* border width between the title and client */
     gint      cbwidth_x;     /* client border width */
     gint      cbwidth_y;     /* 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;