put the actions back so they don't have to be smart.

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index 28ad2755e5d5a7cd3c5ac28494b6415e9f671819..0d3cf0e71a78f4aa818a83fe9bb49778f860cb89 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -32,6 +32,7 @@ typedef void (*ObFrameIconifyAnimateFunc)(gpointer data);
 typedef enum {
     OB_FRAME_CONTEXT_NONE,
     OB_FRAME_CONTEXT_DESKTOP,
+    OB_FRAME_CONTEXT_ROOT,
     OB_FRAME_CONTEXT_CLIENT,
     OB_FRAME_CONTEXT_TITLEBAR,
     OB_FRAME_CONTEXT_FRAME,
@@ -82,8 +83,8 @@ struct _ObFrame
     Rect      area;
     gboolean  visible;
 
+    guint     functions;
     guint     decorations;
-    gboolean  max_horz;
 
     Window    inner;  /*!< The window for drawing the inner client border */
     Window    title;
@@ -98,13 +99,32 @@ 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;
+
+    /* These are resize handles inside the titlebar */
     Window    topresize;
     Window    tltresize;
     Window    tllresize;
     Window    trtresize;
     Window    trrresize;
-    Window    leftresize;
-    Window    rightresize;
 
     Colormap  colormap;
 
@@ -116,8 +136,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 */
@@ -138,9 +156,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;