further work to r6205. make the disabled titlebar buttons hide if they won't move...

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index 5f31b8c9ac47390f8a4a0a6d83c3d564e059fcec..3a5dfdb25642895d15f01c5bb53f759a5f2986dd 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -77,9 +77,6 @@ struct _ObFrame
 
     Strut     size;
     Rect      area;
-    /*! Is the frame visible? Don't read this directly ! Use frame_visible()
-      instead, because that takes into account if the frame is visible but
-      animating to the iconic (invisible) state. */
     gboolean  visible;
 
     guint     decorations;
@@ -117,8 +114,16 @@ struct _ObFrame
 
     GSList   *clients;
 
-    gint      width;         /* title and handle */
-    gint      label_width;
+    gint      icon_on;    /* if the window icon button is on */
+    gint      label_on;   /* if the window title is on */
+    gint      iconify_on; /* if the window iconify button is on */
+    gint      desk_on;    /* if the window all-desktops button is on */
+    gint      shade_on;   /* if the window shade button is on */
+    gint      max_on;     /* if the window maximize button is on */
+    gint      close_on;   /* if the window close button is on */
+
+    gint      width;         /* width of the titlebar and handle */
+    gint      label_width;   /* width of the label in the titlebar */
     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 */
@@ -154,8 +159,6 @@ struct _ObFrame
     */
     gint iconify_animation_going;
     GTimeVal  iconify_animation_end;
-    ObFrameIconifyAnimateFunc iconify_animation_cb;
-    gpointer iconify_animation_data;
 };
 
 ObFrame *frame_new(struct _ObClient *c);
@@ -195,15 +198,9 @@ void frame_flash_stop(ObFrame *self);
 /*! Start an animation for iconifying or restoring a frame. The callback
   will be called when the animation finishes. But if another animation is
   started in the meantime, the callback will never get called. */
-void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying,
-                                   ObFrameIconifyAnimateFunc callback,
-                                   gpointer data);
+void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying);
 void frame_end_iconify_animation(ObFrame *self);
 
-/* Returns true if the frame is visible (but false if it is only visible
-   because it is animating */
-gboolean frame_visible(ObFrame *self);
-
 #define frame_iconify_animating(f) (f->iconify_animation_going != 0)
 
 #endif