rename the Client struct to ObClient

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index c36e783312b865d71293d1b3859f68cab5271b5b..c402001cdc11ecae42bc1ddaf32d45f9027454eb 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -29,7 +29,7 @@ typedef enum {
                           f->cbwidth)
 
 typedef struct Frame {
-    Client *client;
+    ObClient *client;
 
     Window window;
     Window plate;
@@ -37,6 +37,7 @@ typedef struct Frame {
     Strut  size;
     Rect   area;
     gboolean visible;
+    int    decorations;
 
     Window title;
     Window label;
@@ -50,13 +51,13 @@ typedef struct Frame {
     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;
+    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;
 
@@ -79,6 +80,8 @@ typedef struct Frame {
     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.