X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.h;h=36e1b23820bab9a382235b624c115dd3c21c5484;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=808f4e5f8a6f2aee151483bce96400d0ba2370a7;hpb=3b14b587ef8131cbeb2afb2c11240f50c5f5d02b;p=chaz%2Fopenbox

diff --git a/openbox/client.h b/openbox/client.h
index 808f4e5f..36e1b238 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -7,11 +7,15 @@
 #include <X11/Xlib.h>
 
 struct Frame;
+struct Group;
 
+/* The value in client.transient_for indicating it is a transient for its
+   group instead of for a single window */
+#define TRAN_GROUP ((void*)~0l)
 
 /*! Holds an icon in ARGB format */
 typedef struct Icon {
-    unsigned long w, h;
+    unsigned long width, height;
     unsigned long *data;
 } Icon;
      
@@ -100,7 +104,8 @@ typedef enum {
     /*! Display a button to toggle the window's placement on
       all desktops */
     Decor_AllDesktops = 1 << 6,
-    Decor_Close       = 1 << 7  /*!< Display a close button */
+    Decor_Shade       = 1 << 7, /*!< Displays a shade button */
+    Decor_Close       = 1 << 8  /*!< Display a close button */
 } Decoration;
 
 
@@ -113,12 +118,16 @@ typedef struct Client {
     int ignore_unmaps;
 
     /*! The id of the group the window belongs to */
-    Window  group;
+    struct Group *group;
     /*! Whether or not the client is a transient window. This is guaranteed to 
       be TRUE if transient_for != NULL, but not guaranteed to be FALSE if
       transient_for == NULL. */
     gboolean transient;
-    /*! The client which this client is a transient (child) for */
+    /*! The client which this client is a transient (child) for.
+      A value of TRAN_GROUP signifies that the window is a transient for all
+      members of its Group, and is not a valid pointer to be followed in this
+      case.
+     */
     struct Client *transient_for;
     /*! The clients which are transients (children) of this client */
     GSList *transients;
@@ -267,12 +276,6 @@ typedef struct Client {
     */
     int functions;
 
-    /*! Saved decorations from before becoming fullscreen */
-    int pre_fs_decor;
-
-    /*! Saved functions from before becoming fullscreen */
-    int pre_fs_func;
-
     /*! Icons for the client as specified on the client window */
     Icon *icons;
     /*! The number of icons in icons */
@@ -284,7 +287,7 @@ typedef struct Client {
     Pixmap pixmap_icon_mask;
 } Client;
 
-extern GSList *client_list;
+extern GList *client_list;
 extern GHashTable *client_map;
 
 void client_startup();
@@ -320,11 +323,6 @@ gboolean client_normal(Client *self);
 /* Returns if the window is focused */
 gboolean client_focused(Client *self);
 
-/*! Sets the client to a focused or unfocused state. This does not actually
-  change the input focus, but rather is used once focus has been moved to tell
-  the client that it is so. */
-void client_set_focused(Client *self, gboolean focused);
-
 /*! Move and/or resize the window.
   This also maintains things like the client's minsize, and size increments.
   @param anchor The corner to keep in the same position when resizing.
@@ -386,8 +384,10 @@ void client_close(Client *self);
 /*! Kill the client off violently */
 void client_kill(Client *self);
 
-/*! Sends the window to the specified desktop */
-void client_set_desktop(Client *self, guint target);
+/*! Sends the window to the specified desktop
+  @param donthide If TRUE, the window will not be shown/hidden after its
+         desktop has been changed. Generally this should be FALSE. */
+void client_set_desktop(Client *self, guint target, gboolean donthide);
 
 /*! Return a modal child of the client window
     @return A modal child of the client window, or 0 if none was found.
@@ -412,6 +412,14 @@ void client_set_wm_state(Client *self, long state);
 */
 void client_set_state(Client *self, Atom action, long data1, long data2);
 
+/* Given a Client, find the client that focus would actually be sent to if
+   you wanted to give focus to the specified Client. Will return the same
+   Client passed to it or another Client if appropriate. */
+Client *client_focus_target(Client *self);
+
+/* Returns if a client can be focused or not */
+gboolean client_focusable(Client *self);
+
 /*! Attempt to focus the client window */
 gboolean client_focus(Client *self);
 
@@ -457,4 +465,6 @@ void client_setup_decor_and_functions(Client *self);
 /*! Retrieves the window's type and sets Client->type */
 void client_get_type(Client *self);
 
+Icon *client_icon(Client *self, int w, int h);
+
 #endif