add a default icon made by merry.

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index e90b6fe6d60278fe26a36e6ad1654213c8e2ffc1..02804c014f53689ce7dc404fef02976b7fc6d0ca 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -1,10 +1,9 @@
 #ifndef __render_h
 #define __render_h
 
-#define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #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 <X11/Xlib.h>
 #include <glib.h>
 
 typedef union  _RrTextureData      RrTextureData;
@@ -15,6 +14,7 @@ typedef struct _RrTexture          RrTexture;
 typedef struct _RrTextureMask      RrTextureMask;
 typedef struct _RrTextureRGBA      RrTextureRGBA;
 typedef struct _RrTextureText      RrTextureText;
+typedef struct _RrTextureLineArt   RrTextureLineArt;
 typedef struct _RrPixmapMask       RrPixmapMask;
 typedef struct _RrInstance         RrInstance;
 typedef struct _RrColor            RrColor;
@@ -48,6 +48,7 @@ typedef enum {
     RR_TEXTURE_NONE,
     RR_TEXTURE_MASK,
     RR_TEXTURE_TEXT,
+    RR_TEXTURE_LINE_ART,
     RR_TEXTURE_RGBA
 } RrTextureType;
 
@@ -66,6 +67,7 @@ struct _RrSurface {
     RrColor *border_color;
     RrColor *bevel_dark; 
     RrColor *bevel_light;
+    RrColor *interlace_color;
     gboolean interlaced;
     gboolean border;
     RrAppearance *parent;
@@ -104,10 +106,19 @@ struct _RrTextureRGBA {
     RrPixel32 *cache;
 };
 
+struct _RrTextureLineArt {
+    RrColor *color;
+    gint x1;
+    gint y1;
+    gint x2;
+    gint y2;
+};
+
 union _RrTextureData {
     RrTextureRGBA rgba;
     RrTextureText text;
     RrTextureMask mask;
+    RrTextureLineArt lineart;
 };
 
 struct _RrTexture {
@@ -153,8 +164,6 @@ gint     RrBlueShift    (const RrInstance *inst);
 gint     RrRedMask      (const RrInstance *inst);
 gint     RrGreenMask    (const RrInstance *inst);
 gint     RrBlueMask     (const RrInstance *inst);
-guint    RrPseudoBPC    (const RrInstance *inst);
-XColor*  RrPseudoColors (const RrInstance *inst);
 
 RrColor *RrColorNew   (const RrInstance *inst, gint r, gint g, gint b);
 RrColor *RrColorParse (const RrInstance *inst, gchar *colorname);
@@ -164,6 +173,7 @@ gint     RrColorRed   (const RrColor *c);
 gint     RrColorGreen (const RrColor *c);
 gint     RrColorBlue  (const RrColor *c);
 gulong   RrColorPixel (const RrColor *c);
+GC       RrColorGC    (RrColor *c);
 
 RrAppearance *RrAppearanceNew  (const RrInstance *inst, gint numtex);
 RrAppearance *RrAppearanceCopy (RrAppearance *a);
@@ -173,8 +183,9 @@ int RrFontMeasureString (const RrFont *f, const gchar *str);
 int RrFontHeight        (const RrFont *f);
 int RrFontMaxCharWidth  (const RrFont *f);
 
-void RrPaint   (RrAppearance *l, Window win, gint w, gint h);
-void RrMinsize (RrAppearance *l, gint *w, gint *h);
+void RrPaint   (RrAppearance *a, Window win, gint w, gint h);
+void RrMinsize (RrAppearance *a, gint *w, gint *h);
+void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b);
 
 gboolean RrPixmapToRGBA(const RrInstance *inst,
                         Pixmap pmap, Pixmap mask,