X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.h;h=a4e5c2eaa1558781efc58016229a623c4e41cd3f;hb=bf32b376b595eab16a300f63937cad1042361eec;hp=0f9eaa4b2c4df9da37855d41b989e01baf6ab68a;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox

diff --git a/openbox/client.h b/openbox/client.h
index 0f9eaa4b..a4e5c2ea 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -6,13 +6,12 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-struct ClientWrap;
 struct Frame;
 
 
 /*! Holds an icon in ARGB format */
 typedef struct Icon {
-    unsigned long w, h;
+    unsigned long width, height;
     unsigned long *data;
 } Icon;
      
@@ -133,9 +132,9 @@ typedef struct Client {
     gchar *icon_title;
 
     /*! The application that created the window */
-    gchar *res_name;
+    gchar *name;
     /*! The class of the window, can used for grouping */
-    gchar *res_class;
+    gchar *class;
     /*! The specified role of the window, used for identification */
     gchar *role;
 
@@ -218,8 +217,6 @@ typedef struct Client {
     gboolean urgent;
     /*! Notify the window when it receives focus? */
     gboolean focus_notify;
-    /*! Does the client window have the input focus? */
-    gboolean focused;
 
     /*! The window uses shape extension to be non-rectangular? */
     gboolean shaped;
@@ -270,6 +267,12 @@ 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 */
@@ -279,9 +282,6 @@ typedef struct Client {
     Pixmap pixmap_icon;
     /*! The mask for the pixmap_icon, or None if its not masked */
     Pixmap pixmap_icon_mask;
-
-    /* The instance of the wrapper class if one exists */
-    struct ClientWrap *wrap;
 } Client;
 
 extern GSList *client_list;
@@ -307,15 +307,19 @@ void client_set_list();
   surroundings (struts, etc). */
 void client_remaximize(Client *self);
 
-/*! Shows the window if it should be shown, or hides it
-  Used when changing desktops, the window's state, etc. */
-void client_showhide(Client *self, gboolean firehook);
+/*! Determines if the client should be shown or hidden currently.
+  @return TRUE if it should be visible; otherwise, FALSE.
+*/
+gboolean client_should_show(Client *self);
 
 /*! Returns if the window should be treated as a normal window.
   Some windows (desktops, docks, splash screens) have special rules applied
   to them in a number of places regarding focus or user interaction. */
 gboolean client_normal(Client *self);
 
+/* Returns if the window is focused */
+gboolean client_focused(Client *self);
+
 /*! 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.
@@ -371,11 +375,14 @@ void client_maximize(Client *self, gboolean max, int dir,
 */
 void client_shade(Client *self, gboolean shade);
 
-/*! Request the client to close its window. */
+/*! Request the client to close its window */
 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, unsigned int target);
+void client_set_desktop(Client *self, guint target);
 
 /*! Return a modal child of the client window
     @return A modal child of the client window, or 0 if none was found.
@@ -445,4 +452,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