X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=ac1deb4b0bf3ab8e32ce8e21b4a02c27ba2424dd;hb=9cb80fc994c09ee62f99f46244b840ce25fd40f4;hp=a327756f7c6275bbcc89419a1ee3596a60910a7b;hpb=a79651294c54a784b34c85e3832e8c7ca4f3aa17;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index a327756f..ac1deb4b 100644
--- a/render/render.h
+++ b/render/render.h
@@ -45,6 +45,7 @@ typedef struct _RrColor            RrColor;
 
 typedef guint32 RrPixel32;
 typedef guint16 RrPixel16;
+typedef guchar  RrPixel8;
 
 typedef enum {
     RR_RELIEF_FLAT,
@@ -120,11 +121,13 @@ struct _RrTextureText {
     RrFont *font;
     RrJustify justify;
     RrColor *color;
-    gchar *string;
+    const gchar *string;
     gint shadow_offset_x;
     gint shadow_offset_y;
     RrColor *shadow_color;
-    gchar shadow_alpha;
+    guchar shadow_alpha;
+    gboolean shortcut; /*!< Underline a character */
+    guint shortcut_pos; /*!< Position in bytes of the character to underline */
 };
 
 struct _RrPixmapMask {
@@ -227,8 +230,9 @@ GC       RrColorGC    (RrColor *c);
 RrAppearance *RrAppearanceNew  (const RrInstance *inst, gint numtex);
 RrAppearance *RrAppearanceCopy (RrAppearance *a);
 void          RrAppearanceFree (RrAppearance *a);
+void          RrAppearanceAddTextures(RrAppearance *a, gint numtex);
 
-RrFont *RrFontOpen          (const RrInstance *inst, gchar *name, gint size,
+RrFont *RrFontOpen          (const RrInstance *inst, const gchar *name, gint size,
                              RrFontWeight weight, RrFontSlant slant);
 RrFont *RrFontOpenDefault   (const RrInstance *inst);
 void    RrFontClose         (RrFont *f);
@@ -242,7 +246,9 @@ gint    RrFontMaxCharWidth  (const RrFont *f);
    it is non-null. */
 Pixmap RrPaintPixmap (RrAppearance *a, gint w, gint h);
 void   RrPaint       (RrAppearance *a, Window win, gint w, gint h);
-void   RrMinsize     (RrAppearance *a, gint *w, gint *h);
+void   RrMinSize     (RrAppearance *a, gint *w, gint *h);
+gint   RrMinWidth    (RrAppearance *a);
+gint   RrMinHeight   (RrAppearance *a);
 void   RrMargins     (RrAppearance *a, gint *l, gint *t, gint *r, gint *b);
 
 gboolean RrPixmapToRGBA(const RrInstance *inst,