all my changes while i was offline.

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index 1a41b219bcb77333a50c652221976b61f05e1bd5..006eaf4cdf44db2f410c7db6f537877b00b93a95 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -6,7 +6,7 @@
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include "color.h"
-#include "../kernel/geom.h"
+#include "kernel/geom.h"
 
 typedef enum {
     Surface_Planar,
@@ -79,6 +79,7 @@ typedef struct Surface {
 typedef struct {
     XftFont *xftfont;
     int height;
+    int elipses_length;
 } ObFont;
 
 typedef enum {
@@ -109,12 +110,12 @@ typedef struct TextureMask {
 } TextureMask;
 
 typedef struct TextureRGBA {
-    int width;
-    int height;
+    guint width;
+    guint height;
     unsigned long *data;
 /* cached scaled so we don't have to scale often */
-    int cwidth;
-    int cheight;
+    guint cwidth;
+    guint cheight;
     unsigned long *cache;
 } TextureRGBA;
 
@@ -156,6 +157,6 @@ 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);
 
 #endif /*__render_h*/