Merge branch 'backport' into work

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index a3d50b0e83d5610fd6edd529eec13e2b75e65d05..09c93e63770096592bca90b0b47b2ea843c5120d 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -321,15 +321,13 @@ typedef void (*ObClientCallback)(ObClient *client, gpointer data);
 void client_add_destroy_notify(ObClientCallback func, gpointer data);
 void client_remove_destroy_notify(ObClientCallback func);
 
-/*! Manages all existing windows */
-void client_manage_all();
 /*! Manages a given window
   @param prompt This specifies an ObPrompt which is being managed.  It is
                 possible to manage Openbox-owned windows through this.
 */
 void client_manage(Window win, struct _ObPrompt *prompt);
 /*! Unmanages all managed windows */
-void client_unmanage_all();
+void client_unmanage_all(void);
 /*! Unmanages a given client */
 void client_unmanage(ObClient *client);
 
@@ -342,7 +340,7 @@ ObClient *client_fake_manage(Window win);
 void client_fake_unmanage(ObClient *self);
 
 /*! Sets the client list on the root window from the client_list */
-void client_set_list();
+void client_set_list(void);
 
 /*! Determines if the client should be shown or hidden currently.
   @return TRUE if it should be visible; otherwise, FALSE.
@@ -398,10 +396,13 @@ void client_convert_gravity_resize(ObClient *self, gint gravity,
   client_configure(self, self->area.x, self->area.y, w, h, TRUE, TRUE, FALSE)
 #define client_move_resize(self, x, y, w, h) \
   client_configure(self, x, y, w, h, TRUE, TRUE, FALSE)
-#define client_reconfigure(self, force) \
-  client_configure(self, ((ObClient*)self)->area.x, ((ObClient*)self)->area.y, \
-                   ((ObClient*)self)->area.width, \
-                   ((ObClient*)self)->area.height, FALSE, TRUE, force)
+
+/*! Make a client reconfigure so that it will honour its current max/min sizes
+  and other bounds.
+  @param force If TRUE, then a ConfigureNotify event will be sent to the client
+               even if nothing has changed.
+*/
+void client_reconfigure(ObClient *self, gboolean force);
 
 /*! Figure out where a window will end up and what size it will be if you
   told it to move/resize to these coordinates.
@@ -723,7 +724,7 @@ void client_set_layer(ObClient *self, gint layer);
 
 guint client_monitor(ObClient *self);
 
-ObClient* client_under_pointer();
+ObClient* client_under_pointer(void);
 
 gboolean client_has_group_siblings(ObClient *self);