merge r7664 from 3.4

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index ed6779264454bdca6e9c82ea5d662ae21f0bba3b..bb783458cee5ea2eaf9a32ad24ba3933d0040ad0 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -550,10 +550,13 @@ gboolean client_focus(ObClient *self);
   when the user deliberately selects a window for use.
   @param here If true, then the client is brought to the current desktop;
               otherwise, the desktop is changed to where the client lives.
+  @param raise If true, the client is brought to the front.
+  @param unshade If true, the client is unshaded (if it is shaded)
   @param user If true, then a user action is what requested the activation;
               otherwise, it means an application requested it on its own
 */
-void client_activate(ObClient *self, gboolean here, gboolean user);
+void client_activate(ObClient *self, gboolean here, gboolean raise,
+                     gboolean unshade, gboolean user);
 
 /*! Bring all of its helper windows to its desktop. These are the utility and
   stuff windows. */
@@ -611,6 +614,8 @@ void client_get_type_and_transientness(ObClient *self);
 
 const ObClientIcon *client_icon(ObClient *self, gint w, gint h);
 
+ObClientIcon *client_thumbnail(ObClient *self, gint w, gint h);
+
 /*! Return TRUE if the client is transient for some other window. Return
   FALSE if it's not transient or there is no window for it to be
   transient for */
@@ -695,4 +700,6 @@ ObClient* client_under_pointer();
 
 gboolean client_has_group_siblings(ObClient *self);
 
+void clienticon_free(ObClientIcon *ci);
+
 #endif