X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.h;h=70fc5a9711fd0972d461d219018d63095ff84ba0;hb=795d90c3bc57eaf2c98c447f3af5c1c9e7a52fa3;hp=9fe9c9d35e421027cc7e9a6950a8810fb4d86168;hpb=d5eacc5642ad8f5611f7c946d734863bc8898513;p=chaz%2Fopenbox

diff --git a/openbox/client.h b/openbox/client.h
index 9fe9c9d3..70fc5a97 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -3,6 +3,8 @@
 
 #include "geom.h"
 #include "stacking.h"
+#include "render/color.h"
+
 #include <glib.h>
 #include <X11/Xlib.h>
 
@@ -15,8 +17,8 @@ struct Group;
 
 /*! Holds an icon in ARGB format */
 typedef struct Icon {
-    unsigned long width, height;
-    unsigned long *data;
+    int width, height;
+    pixel32 *data;
 } Icon;
      
 /*! The MWM Hints as retrieved from the window property
@@ -108,8 +110,21 @@ typedef enum {
     Decor_Close       = 1 << 8  /*!< Display a close button */
 } Decoration;
 
+/*! The directions used by client_find_directional */
+typedef enum {
+    Direction_North,
+    Direction_East,
+    Direction_South,
+    Direction_West,
+    Direction_NorthEast,
+    Direction_SouthEast,
+    Direction_SouthWest,
+    Direction_NorthWest
+} Direction;
 
 typedef struct Client {
+    ObWindow obwin;
+
     Window  window;
 
     /*! The window's decorations. NULL while the window is being managed! */
@@ -284,15 +299,9 @@ typedef struct Client {
     Icon *icons;
     /*! The number of icons in icons */
     int nicons;
-
-    /*! The icon for the client specified in the WMHints or the KWM hints */
-    Pixmap pixmap_icon;
-    /*! The mask for the pixmap_icon, or None if its not masked */
-    Pixmap pixmap_icon_mask;
 } Client;
 
 extern GList *client_list;
-extern GHashTable *client_map;
 
 void client_startup();
 void client_shutdown();
@@ -421,6 +430,10 @@ 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 what client_focus would return if passed the same client, but
+  without focusing it or modifying the focus order lists. */
+gboolean client_can_focus(Client *self);
+
 /*! Attempt to focus the client window */
 gboolean client_focus(Client *self);
 
@@ -456,8 +469,6 @@ void client_update_class(Client *self);
 void client_update_strut(Client *self);
 /*! Updates the window's icons */
 void client_update_icons(Client *self);
-/*! Updates the window's kwm icon */
-void client_update_kwm_icon(Client *self);
 
 /*! Set up what decor should be shown on the window and what functions should
   be allowed (Client::decorations and Client::functions).
@@ -482,9 +493,20 @@ Client *client_search_focus_tree(Client *self);
 */
 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.
+/*! Return a modal child of the client window that can be focused.
+    @return A modal child of the client window that can be focused, or 0 if
+            none was found.
 */
 Client *client_search_modal_child(Client *self);
 
+/*! Return the "closest" client in the given direction */
+Client *client_find_directional(Client *c, Direction dir);
+
+/*! Set a client window to be above/below other clients.
+  @layer < 0 indicates the client should be placed below other clients.<br>
+         = 0 indicates the client should be placed with other clients.<br>
+         > 0 indicates the client should be placed above other clients.
+*/
+void client_set_layer(Client *self, int layer);
+
 #endif