X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.h;h=08a3a887361d4fe6bbb4201b395acd7a86acdbc8;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=3ab555b00097706f63e7f7044ac5ebb96055a75d;hpb=64dac07d07f37ec965ccc0b5bc8c8c789247cff0;p=chaz%2Fopenbox

diff --git a/openbox/client.h b/openbox/client.h
index 3ab555b0..08a3a887 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -110,8 +110,11 @@ typedef enum {
 
 
 typedef struct Client {
+    ObWindow obwin;
+
     Window  window;
 
+    /*! The window's decorations. NULL while the window is being managed! */
     struct Frame *frame;
 
     /*! The number of unmap events to ignore on the window */
@@ -133,10 +136,13 @@ typedef struct Client {
     GSList *transients;
     /*! The desktop on which the window resides (0xffffffff for all
       desktops) */
-    unsigned int desktop;
+    guint desktop;
 
     /*! Normal window title */
     gchar *title;
+    /*! The count for the title. When another window with the same title
+      exists, a count will be appended to it. */
+    guint title_count;
     /*! Window title when iconified */
     gchar *icon_title;
 
@@ -276,12 +282,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 */
@@ -294,7 +294,6 @@ typedef struct Client {
 } Client;
 
 extern GList *client_list;
-extern GHashTable *client_map;
 
 void client_startup();
 void client_shutdown();
@@ -347,6 +346,11 @@ gboolean client_focused(Client *self);
 void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
 		      gboolean user, gboolean final);
 
+/*! Moves a client so that it is on screen if it is entirely out of the
+  viewable screen.
+*/
+void client_move_onscreen(Client *self);
+
 /*! Fullscreen's or unfullscreen's the client window
   @param fs true if the window should be made fullscreen; false if it should
             be returned to normal state.
@@ -395,11 +399,6 @@ void client_kill(Client *self);
          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.
-*/
-Client *client_find_modal_child(Client *self);
-
 /*! Validate client, by making sure no Destroy or Unmap events exist in
   the event queue for the window.
   @return true if the client is valid; false if the client has already
@@ -423,15 +422,16 @@ void client_set_state(Client *self, Atom action, long data1, long data2);
    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);
 
 /*! Remove focus from the client window */
 void client_unfocus(Client *self);
 
+/*! Activates the client for use, focusing, uniconifying it, etc. To be used
+  when the user deliberately selects a window for use. */
+void client_activate(Client *self);
+
 /*! Calculates the stacking layer for the client window */
 void client_calc_layer(Client *self);
 
@@ -449,10 +449,8 @@ void client_update_normal_hints(Client *self);
 		   process.
 */
 void client_update_wmhints(Client *self);
-/*! Updates the window's title */
+/*! Updates the window's title and icon title */
 void client_update_title(Client *self);
-/*! Updates the window's icon title */
-void client_update_icon_title(Client *self);
 /*! Updates the window's application name and class */
 void client_update_class(Client *self);
 /*! Updates the strut for the client */
@@ -473,4 +471,21 @@ void client_get_type(Client *self);
 
 Icon *client_icon(Client *self, int w, int h);
 
+/*! Searches a client's transients for a focused window. The function does not
+  check for the passed client, only for its transients.
+  If no focused transient is found, NULL is returned.
+*/
+Client *client_search_focus_tree(Client *self);
+
+/*! Searches a client's transient tree for a focused window. The function
+  searches up the tree and down other branches as well as the passed client's.
+  If no focused client is found, NULL is returned.
+*/
+Client *client_search_focus_tree_full(Client *self);
+
+/*! Return a modal child of the client window
+    @return A modal child of the client window, or 0 if none was found.
+*/
+Client *client_search_modal_child(Client *self);
+
 #endif