prefixing and capitalization for the Frame->ObFrame struct and the Context->ObFrameCo...

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index f36522fefcc3bac16935bbf0aca8f95a5d58963a..4f117fae89607b83f9174cc5a98b7a9e86f3fd01 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -2,34 +2,33 @@
 #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_ROOT,
+    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_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;
+
+struct _ObFrame
+{
+    struct _ObClient *client;
 
     Window    window;
     Window    plate;
@@ -82,38 +81,38 @@ typedef struct Frame {
     gboolean  iconify_press;
 
     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);
+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