rename osx to mirrorhorizontal and split to splitvertical, this will make all themes...

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index c90c8582c77c74ebaf0331c2f4c2a43da81deb17..fda4060718b21d7ce85e4670a50d655a9baaa64c 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -1,6 +1,7 @@
-/* -*- 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) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
    Copyright (c) 2003        Derek Foreman
 
@@ -20,11 +21,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;
@@ -56,11 +62,13 @@ typedef enum {
     RR_SURFACE_NONE,
     RR_SURFACE_PARENTREL,
     RR_SURFACE_SOLID,
+    RR_SURFACE_SPLIT_VERTICAL,
     RR_SURFACE_HORIZONTAL,
     RR_SURFACE_VERTICAL,
     RR_SURFACE_DIAGONAL,
     RR_SURFACE_CROSS_DIAGONAL,
-    RR_SURFACE_PYRAMID
+    RR_SURFACE_PYRAMID,
+    RR_SURFACE_MIRROR_HORIZONTAL,
 } RrSurfaceColorType;
 
 typedef enum {
@@ -198,9 +206,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 +218,6 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
                         Pixmap pmap, Pixmap mask,
                         gint *w, gint *h, RrPixel32 **data);
 
+G_END_DECLS
+
 #endif /*__render_h*/