choke on invalid options on the cmd line

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index 4df3893e08cc1eb0d11a1f573d7a45459c5f58bb..c7acf7b882596bffe2ab766edc6288ee2a7440c1 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -6,7 +6,6 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-struct ClientWrap;
 struct Frame;
 
 
@@ -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,10 +307,6 @@ 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);
-
 /*! Determines if the client should be shown or hidden currently.
   @return TRUE if it should be visible; otherwise, FALSE.
 */
@@ -321,6 +317,14 @@ gboolean client_should_show(Client *self);
   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);
+
+/*! 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.
@@ -380,7 +384,7 @@ void client_shade(Client *self, gboolean shade);
 void client_close(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.