make icons use pixel32 data, and image_draw takes pixel32 data.

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index ff11c65cde1bb55fa7a441afec2059a3c9ee620f..68fec4681ab1c9a06f437894d9844b1354432dea 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -79,6 +79,7 @@ typedef struct Surface {
 typedef struct {
     XftFont *xftfont;
     int height;
+    int elipses_length;
 } ObFont;
 
 typedef enum {
@@ -109,13 +110,13 @@ typedef struct TextureMask {
 } TextureMask;
 
 typedef struct TextureRGBA {
-    int width;
-    int height;
-    unsigned long *data;
+    guint width;
+    guint height;
+    pixel32 *data;
 /* cached scaled so we don't have to scale often */
-    int cwidth;
-    int cheight;
-    unsigned long *cache;
+    guint cwidth;
+    guint cheight;
+    pixel32 *cache;
 } TextureRGBA;
 
 typedef union {
@@ -156,6 +157,9 @@ void truecolor_startup(void);
 void pseudocolor_startup(void);
 void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h);
 
-void appearance_minsize(Appearance *l, Size *s);
+void appearance_minsize(Appearance *l, int *w, int *h);
+
+gboolean render_pixmap_to_rgba(Pixmap pmap, Pixmap mask,
+                               int *w, int *h, pixel32 **data);
 
 #endif /*__render_h*/