X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.h;h=572d18b6353198affc06456724878ba243d6633c;hb=5d4cbbc67444c3955f705b3aeddf29be1c731866;hp=f36522fefcc3bac16935bbf0aca8f95a5d58963a;hpb=4736c257a54409bf3b0ef0d803da650c71684dee;p=chaz%2Fopenbox

diff --git a/openbox/frame.h b/openbox/frame.h
index f36522fe..572d18b6 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -2,34 +2,51 @@
 #define __frame_h
 
 #include "geom.h"
-#include "client.h"
 #include "render/render.h"
 
+typedef struct _ObFrame ObFrame;
+
+struct _ObClient;
+
 typedef enum {
-    Context_None,
-    Context_Root,
-    Context_Client,
-    Context_Titlebar,
-    Context_Handle,
-    Context_Frame,
-    Context_BLCorner,
-    Context_BRCorner,
-    Context_TLCorner,
-    Context_TRCorner,
-    Context_Maximize,
-    Context_AllDesktops,
-    Context_Shade,
-    Context_Iconify,
-    Context_Icon,
-    Context_Close,
-    NUM_CONTEXTS
-} Context;
-
-#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
-		           f->cbwidth)
-
-typedef struct Frame {
-    ObClient *client;
+    OB_FRAME_CONTEXT_NONE,
+    OB_FRAME_CONTEXT_DESKTOP,
+    OB_FRAME_CONTEXT_CLIENT,
+    OB_FRAME_CONTEXT_TITLEBAR,
+    OB_FRAME_CONTEXT_HANDLE,
+    OB_FRAME_CONTEXT_FRAME,
+    OB_FRAME_CONTEXT_BLCORNER,
+    OB_FRAME_CONTEXT_BRCORNER,
+    OB_FRAME_CONTEXT_TLCORNER,
+    OB_FRAME_CONTEXT_TRCORNER,
+    OB_FRAME_CONTEXT_MAXIMIZE,
+    OB_FRAME_CONTEXT_ALLDESKTOPS,
+    OB_FRAME_CONTEXT_SHADE,
+    OB_FRAME_CONTEXT_ICONIFY,
+    OB_FRAME_CONTEXT_ICON,
+    OB_FRAME_CONTEXT_CLOSE,
+    OB_FRAME_NUM_CONTEXTS
+} ObFrameContext;
+
+/*! The decorations the client window wants to be displayed on it */
+typedef enum {
+    OB_FRAME_DECOR_TITLEBAR    = 1 << 0, /*!< Display a titlebar */
+    OB_FRAME_DECOR_HANDLE      = 1 << 1, /*!< Display a handle (bottom) */
+    OB_FRAME_DECOR_GRIPS       = 1 << 2, /*!< Display grips in the handle */
+    OB_FRAME_DECOR_BORDER      = 1 << 3, /*!< Display a border */
+    OB_FRAME_DECOR_ICON        = 1 << 4, /*!< Display the window's icon */
+    OB_FRAME_DECOR_ICONIFY     = 1 << 5, /*!< Display an iconify button */
+    OB_FRAME_DECOR_MAXIMIZE    = 1 << 6, /*!< Display a maximize button */
+    /*! Display a button to toggle the window's placement on
+      all desktops */
+    OB_FRAME_DECOR_ALLDESKTOPS = 1 << 7,
+    OB_FRAME_DECOR_SHADE       = 1 << 8, /*!< Displays a shade button */
+    OB_FRAME_DECOR_CLOSE       = 1 << 9  /*!< Display a close button */
+} ObFrameDecorations;
+
+struct _ObFrame
+{
+    struct _ObClient *client;
 
     Window    window;
     Window    plate;
@@ -37,7 +54,12 @@ typedef struct Frame {
     Strut     size;
     Rect      area;
     gboolean  visible;
+
+    /*! Whether the window is obscured at all or fully visible. */
+    gboolean obscured;
+
     guint     decorations;
+    gboolean  max_horz;
 
     Window    title;
     Window    label;
@@ -51,6 +73,9 @@ typedef struct Frame {
     Window    lgrip;
     Window    rgrip;
 
+    Window    tlresize;
+    Window    trresize;
+
     RrAppearance *a_unfocused_title;
     RrAppearance *a_focused_title;
     RrAppearance *a_unfocused_label;
@@ -73,47 +98,52 @@ typedef struct Frame {
     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      cbwidth;       /* client border width */
+    gint      rbwidth;       /* title border width */
+    gint      cbwidth_x;     /* client border width */
+    gint      cbwidth_y;     /* client border width */
 
     gboolean  max_press;
     gboolean  close_press;
     gboolean  desk_press;
     gboolean  shade_press;
     gboolean  iconify_press;
+    gboolean  max_hover;
+    gboolean  close_hover;
+    gboolean  desk_hover;
+    gboolean  shade_hover;
+    gboolean  iconify_hover;
 
     gboolean  focused;
-} Frame;
-
-void frame_startup();
-void frame_shutdown();
+};
 
-Frame *frame_new();
-void frame_show(Frame *self);
-void frame_hide(Frame *self);
-void frame_adjust_shape(Frame *self);
-void frame_adjust_area(Frame *self, gboolean moved, gboolean resized);
-void frame_adjust_state(Frame *self);
-void frame_adjust_focus(Frame *self, gboolean hilite);
-void frame_adjust_title(Frame *self);
-void frame_adjust_icon(Frame *self);
-void frame_grab_client(Frame *self, ObClient *client);
-void frame_release_client(Frame *self, ObClient *client);
+ObFrame *frame_new();
+void frame_show(ObFrame *self);
+void frame_hide(ObFrame *self);
+void frame_adjust_shape(ObFrame *self);
+void frame_adjust_area(ObFrame *self, gboolean moved,
+                       gboolean resized, gboolean fake);
+void frame_adjust_state(ObFrame *self);
+void frame_adjust_focus(ObFrame *self, gboolean hilite);
+void frame_adjust_title(ObFrame *self);
+void frame_adjust_icon(ObFrame *self);
+void frame_grab_client(ObFrame *self, struct _ObClient *client);
+void frame_release_client(ObFrame *self, struct _ObClient *client);
 
-Context frame_context_from_string(char *name);
+ObFrameContext frame_context_from_string(char *name);
 
-Context frame_context(ObClient *self, Window win);
+ObFrameContext frame_context(struct _ObClient *self, Window win);
 
 /*! Applies gravity to the client's position to find where the frame should
   be positioned.
   @return The proper coordinates for the frame, based on the client.
 */
-void frame_client_gravity(Frame *self, int *x, int *y);
+void frame_client_gravity(ObFrame *self, int *x, int *y);
 
 /*! Reversly applies gravity to the frame's position to find where the client
   should be positioned.
     @return The proper coordinates for the client, based on the frame.
 */
-void frame_frame_gravity(Frame *self, int *x, int *y);
+void frame_frame_gravity(ObFrame *self, int *x, int *y);
 
 
 #endif