prefix and capitalize some more constants/enums in client.h (Function -> ObFunctions...

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index c36e783312b865d71293d1b3859f68cab5271b5b..f36522fefcc3bac16935bbf0aca8f95a5d58963a 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -29,56 +29,59 @@ typedef enum {
                           f->cbwidth)
 
 typedef struct Frame {
-    Client *client;
-
-    Window window;
-    Window plate;
-
-    Strut  size;
-    Rect   area;
-    gboolean visible;
-
-    Window title;
-    Window label;
-    Window max;
-    Window close;
-    Window desk;
-    Window shade;
-    Window icon;
-    Window iconify;
-    Window handle;
-    Window lgrip;
-    Window rgrip;
-
-    Appearance *a_unfocused_title;
-    Appearance *a_focused_title;
-    Appearance *a_unfocused_label;
-    Appearance *a_focused_label;
-    Appearance *a_icon;
-    Appearance *a_unfocused_handle;
-    Appearance *a_focused_handle;
-
-    Strut  innersize;
-
-    GSList *clients;
-
-    int width;         /* title and handle */
-    int label_width;
-    int icon_x;        /* x-position of the window icon button */
-    int label_x;       /* x-position of the window title */
-    int iconify_x;     /* x-position of the window iconify button */
-    int desk_x;        /* x-position of the window all-desktops button */
-    int shade_x;       /* x-position of the window shade button */
-    int max_x;         /* x-position of the window maximize button */
-    int close_x;       /* x-position of the window close button */
-    int bwidth;        /* border width */
-    int cbwidth;       /* client border width */
-
-    gboolean max_press;
-    gboolean close_press;
-    gboolean desk_press;
-    gboolean shade_press;
-    gboolean iconify_press;
+    ObClient *client;
+
+    Window    window;
+    Window    plate;
+
+    Strut     size;
+    Rect      area;
+    gboolean  visible;
+    guint     decorations;
+
+    Window    title;
+    Window    label;
+    Window    max;
+    Window    close;
+    Window    desk;
+    Window    shade;
+    Window    icon;
+    Window    iconify;
+    Window    handle;
+    Window    lgrip;
+    Window    rgrip;
+
+    RrAppearance *a_unfocused_title;
+    RrAppearance *a_focused_title;
+    RrAppearance *a_unfocused_label;
+    RrAppearance *a_focused_label;
+    RrAppearance *a_icon;
+    RrAppearance *a_unfocused_handle;
+    RrAppearance *a_focused_handle;
+
+    Strut     innersize;
+
+    GSList   *clients;
+
+    gint      width;         /* title and handle */
+    gint      label_width;
+    gint      icon_x;        /* x-position of the window icon button */
+    gint      label_x;       /* x-position of the window title */
+    gint      iconify_x;     /* x-position of the window iconify button */
+    gint      desk_x;        /* x-position of the window all-desktops button */
+    gint      shade_x;       /* x-position of the window shade button */
+    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 */
+
+    gboolean  max_press;
+    gboolean  close_press;
+    gboolean  desk_press;
+    gboolean  shade_press;
+    gboolean  iconify_press;
+
+    gboolean  focused;
 } Frame;
 
 void frame_startup();
@@ -90,15 +93,15 @@ 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);
+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, Client *client);
-void frame_release_client(Frame *self, Client *client);
+void frame_grab_client(Frame *self, ObClient *client);
+void frame_release_client(Frame *self, ObClient *client);
 
 Context frame_context_from_string(char *name);
 
-Context frame_context(Frame *self, Window win);
+Context frame_context(ObClient *self, Window win);
 
 /*! Applies gravity to the client's position to find where the frame should
   be positioned.