X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Frender.h;h=3ff0636b8a0e1c244e8ec1b323c49ac0b9abb789;hb=a908e04818e2d9eab3e3d8049c573e8d9ddcd0b8;hp=c90c8582c77c74ebaf0331c2f4c2a43da81deb17;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index c90c8582..3ff0636b 100644
--- a/render/render.h
+++ b/render/render.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    render.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -20,11 +20,16 @@
 #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>
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef union  _RrTextureData      RrTextureData;
 typedef struct _RrAppearance       RrAppearance;
 typedef struct _RrSurface          RrSurface;
@@ -198,9 +203,9 @@ RrAppearance *RrAppearanceNew  (const RrInstance *inst, gint numtex);
 RrAppearance *RrAppearanceCopy (RrAppearance *a);
 void          RrAppearanceFree (RrAppearance *a);
 
-int RrFontMeasureString (const RrFont *f, const gchar *str);
-int RrFontHeight        (const RrFont *f);
-int RrFontMaxCharWidth  (const RrFont *f);
+RrSize *RrFontMeasureString (const RrFont *f, const gchar *str);
+gint RrFontHeight        (const RrFont *f);
+gint RrFontMaxCharWidth  (const RrFont *f);
 
 void RrPaint   (RrAppearance *a, Window win, gint w, gint h);
 void RrMinsize (RrAppearance *a, gint *w, gint *h);
@@ -210,4 +215,6 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
                         Pixmap pmap, Pixmap mask,
                         gint *w, gint *h, RrPixel32 **data);
 
+G_END_DECLS
+
 #endif /*__render_h*/