X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.h;h=ca41055859570fb467ad9c510a8f53d9fcfc50ae;hb=9f501638b55f023a6dff7c557f208083df74e4c9;hp=faa04e63c2d2346ebe89b286da88ca5736fb1c12;hpb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;p=chaz%2Fopenbox

diff --git a/openbox/client.h b/openbox/client.h
index faa04e63..ca410558 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();
@@ -427,6 +436,10 @@ 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);
 
@@ -452,8 +465,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).
@@ -483,4 +494,7 @@ Client *client_search_focus_tree_full(Client *self);
 */
 Client *client_search_modal_child(Client *self);
 
+/*! Return the "closest" client in the given direction */
+Client *client_find_directional(Client *c, Direction dir);
+
 #endif