Merge branch 'backport' into work

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index 6a396cf426835f1f78eaf817a2d43de24004dd02..09c93e63770096592bca90b0b47b2ea843c5120d 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -396,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.
@@ -641,12 +644,18 @@ RrImage* client_icon(ObClient *self);
   transient for */
 gboolean client_has_parent(ObClient *self);
 
-/*! Searches a client's direct parents for a focused window. The function does
-  not check for the passed client, only for *ONE LEVEL* of its parents.
-  If no focused parentt is found, NULL is returned.
+/*! Searches a client's immediate parents for a focused window. The function
+  does not check for the passed client, only for *ONE LEVEL* of its parents.
+  If no focused parent is found, NULL is returned.
 */
 ObClient *client_search_focus_parent(ObClient *self);
 
+/*! Searches a client's parents for a focused window. The function
+  does not check for the passed client, but searches through all of its
+  parents. If no focused parent is found, NULL is returned.
+*/
+ObClient *client_search_focus_parent_full(ObClient *self);
+
 /*! 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.