Introducing the icon cache.

[chaz/openbox] / openbox / popup.h

diff --git a/openbox/popup.h b/openbox/popup.h
index 0bf2f50074110aa4fe8397dfe1139c4c6cf59ac7..2b01ce24bf857396131e0560126c44b1addf4d94 100644 (file)
--- a/openbox/popup.h
+++ b/openbox/popup.h
@@ -49,9 +49,11 @@ struct _ObPopup
     gint h;
     gint minw;
     gint maxw;
+    guint iconwm; /* icon width multiplier. multiplied by the normal width */
+    guint iconhm; /* icon height multiplier. multipled by the normal height */
     gboolean mapped;
     gboolean delay_mapped;
- 
+
     void (*draw_icon)(gint x, gint y, gint w, gint h, gpointer data);
     gpointer draw_icon_data;
 };
@@ -108,7 +110,7 @@ void icon_popup_free(ObIconPopup *self);
 
 #define icon_popup_show(s, t, i) icon_popup_delay_show((s),0,(t),(i))
 void icon_popup_delay_show(ObIconPopup *self, gulong usec,
-                           gchar *text, const struct _ObClientIcon *icon);
+                           gchar *text, RrImage *icon);
 #define icon_popup_hide(p) popup_hide((p)->popup)
 #define icon_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
 #define icon_popup_text_width(p, w) popup_text_width((p)->popup,(w))
@@ -120,6 +122,7 @@ void icon_popup_delay_show(ObIconPopup *self, gulong usec,
 #define icon_popup_text_width_to_strings(p, s, n) \
     popup_text_width_to_strings((p)->popup,(s),(n))
 #define icon_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
+void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm);
 
 ObPagerPopup *pager_popup_new();
 void pager_popup_free(ObPagerPopup *self);
@@ -138,5 +141,6 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
 #define pager_popup_text_width_to_strings(p, s, n) \
     popup_text_width_to_strings((p)->popup,(s),(n))
 #define pager_popup_set_text_align(p, j) popup_set_text_align((p)->popup,(j))
+void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm);
 
 #endif