X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=22a9bac7061c763db3139cdd714f1f9a4daf0974;hb=e8c19d0c99930e9bc495c0bf0cbe5d94e6d8dd0f;hp=3e76ed8b97dc8e9c5593686ddd439066c11b832b;hpb=740c5b2a20d5110435d0874f8cc6a4c9dfd14777;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 3e76ed8b..22a9bac7 100644
--- a/render/render.h
+++ b/render/render.h
@@ -20,6 +20,9 @@
 #ifndef __render_h
 #define __render_h
 
+#include "geom.h"
+#include "version.h"
+
 #include <X11/Xlib.h> /* some platforms dont include this as needed for Xft */
 #define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #include <X11/Xft/Xft.h>
@@ -58,11 +61,13 @@ typedef enum {
     RR_SURFACE_NONE,
     RR_SURFACE_PARENTREL,
     RR_SURFACE_SOLID,
+    RR_SURFACE_SPLIT,
     RR_SURFACE_HORIZONTAL,
     RR_SURFACE_VERTICAL,
     RR_SURFACE_DIAGONAL,
     RR_SURFACE_CROSS_DIAGONAL,
-    RR_SURFACE_PYRAMID
+    RR_SURFACE_PYRAMID,
+    RR_SURFACE_OSX
 } RrSurfaceColorType;
 
 typedef enum {
@@ -200,7 +205,7 @@ RrAppearance *RrAppearanceNew  (const RrInstance *inst, gint numtex);
 RrAppearance *RrAppearanceCopy (RrAppearance *a);
 void          RrAppearanceFree (RrAppearance *a);
 
-gint RrFontMeasureString (const RrFont *f, const gchar *str);
+RrSize *RrFontMeasureString (const RrFont *f, const gchar *str);
 gint RrFontHeight        (const RrFont *f);
 gint RrFontMaxCharWidth  (const RrFont *f);