X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.h;h=6de9d184cdaf08109debda8989a2ca07a786b292;hb=2391410e3fd7767e266c0efe84fd34244ea29dc6;hp=0bf2f50074110aa4fe8397dfe1139c4c6cf59ac7;hpb=82b2f0aa7a1723632e8d3cf7dc772e4bdb66868a;p=chaz%2Fopenbox

diff --git a/openbox/popup.h b/openbox/popup.h
index 0bf2f500..6de9d184 100644
--- a/openbox/popup.h
+++ b/openbox/popup.h
@@ -20,7 +20,7 @@
 #define __popup_h
 
 #include "window.h"
-#include "render/render.h"
+#include "obrender/render.h"
 #include <glib.h>
 
 struct _ObClientIcon;
@@ -49,9 +49,12 @@ 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;
- 
+    guint delay_timer;
+
     void (*draw_icon)(gint x, gint y, gint w, gint h, gpointer data);
     gpointer draw_icon_data;
 };
@@ -75,7 +78,7 @@ struct _ObPagerPopup
     RrAppearance *unhilight;
 };
 
-ObPopup *popup_new();
+ObPopup *popup_new(void);
 void popup_free(ObPopup *self);
 
 /*! Position the popup. The gravity rules are not the same X uses for windows,
@@ -97,18 +100,18 @@ void popup_text_width_to_strings(ObPopup *self, gchar **strings, gint num);
 void popup_set_text_align(ObPopup *self, RrJustify align);
 
 #define popup_show(s, t) popup_delay_show((s),0,(t))
-void popup_delay_show(ObPopup *self, gulong usec, gchar *text);
+void popup_delay_show(ObPopup *self, gulong msec, gchar *text);
 void popup_hide(ObPopup *self);
 
 RrAppearance *popup_icon_appearance(ObPopup *self);
 
 
-ObIconPopup *icon_popup_new();
+ObIconPopup *icon_popup_new(void);
 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);
+void icon_popup_delay_show(ObIconPopup *self, gulong msec,
+                           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,12 +123,13 @@ 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();
+ObPagerPopup *pager_popup_new(void);
 void pager_popup_free(ObPagerPopup *self);
 
 #define pager_popup_show(s, t, d) pager_popup_delay_show((s),0,(t),(d))
-void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
+void pager_popup_delay_show(ObPagerPopup *self, gulong msec,
                             gchar *text, guint desk);
 #define pager_popup_hide(p) popup_hide((p)->popup)
 #define pager_popup_position(p, g, x, y) popup_position((p)->popup,(g),(x),(y))
@@ -138,5 +142,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