yay for simplifying code. if we check for errors we dont need the "focus_tried" stuff

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index aa7f41a578db3cf92ec6d641b2d11fa32a3f51b0..aaebceaa66855b32d03af90701a591927649b7ed 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -71,7 +71,9 @@ typedef enum
     OB_CLIENT_FUNC_MAXIMIZE   = 1 << 3, /*!< Allow to be maximized */
     OB_CLIENT_FUNC_SHADE      = 1 << 4, /*!< Allow to be shaded */
     OB_CLIENT_FUNC_FULLSCREEN = 1 << 5, /*!< Allow to be made fullscreen */
-    OB_CLIENT_FUNC_CLOSE      = 1 << 6  /*!< Allow to be closed */
+    OB_CLIENT_FUNC_CLOSE      = 1 << 6, /*!< Allow to be closed */
+    OB_CLIENT_FUNC_ABOVE      = 1 << 7, /*!< Allow to be put in lower layer */
+    OB_CLIENT_FUNC_BELOW      = 1 << 8  /*!< Allow to be put in higher layer */
 } ObFunctions;
 
 struct _ObClient
@@ -166,7 +168,7 @@ struct _ObClient
       The window manager will set this to 0 while the window is being managed,
       but needs to restore it afterwards, so it is saved here.
     */
-    guint border_width;
+    gint border_width;
 
     /*! The minimum aspect ratio the client window can be sized to.
       A value of 0 means this is ignored.
@@ -309,8 +311,8 @@ typedef void (*ObClientCallback)(ObClient *client, gpointer data);
 /* Callback functions */
 
 /*! Get notified when the client is unmanaged */
-void client_add_destructor(ObClientCallback func, gpointer data);
-void client_remove_destructor(ObClientCallback func);
+void client_add_destroy_notify(ObClientCallback func, gpointer data);
+void client_remove_destroy_notify(ObClientCallback func);
 
 /*! Manages all existing windows */
 void client_manage_all();
@@ -375,7 +377,7 @@ void client_convert_gravity(ObClient *self, gint gravity, gint *x, gint *y,
   client_configure(self, x, y, w, h, TRUE, TRUE)
 
 #define client_configure(self, x, y, w, h, user, final) \
-  client_configure_full(self, x, y, w, h, user, final, FALSE)
+  client_configure_full(self, x, y, w, h, user, final)
 
 /*! Figure out where a window will end up and what size it will be if you
   told it to move/resize to these coordinates.
@@ -417,8 +419,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
                      the position changed.
 */
 void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h,
-                           gboolean user, gboolean final,
-                           gboolean force_reply);
+                           gboolean user, gboolean final);
 
 void client_reconfigure(ObClient *self);