X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=982ce12ca79d61fb43087aceaa774d59d5ac61c4;hb=280c70b00bbde16d576c78863af7edfdd9f2d423;hp=26de9e481dc621839cb8cf404fef22a60144cc4f;hpb=138d3e38d88dbcb1426bd1eb0cd8c43dd01777ad;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 26de9e48..982ce12c 100644
--- a/render/render.h
+++ b/render/render.h
@@ -125,8 +125,9 @@ struct _RrTextureText {
     gint shadow_offset_x;
     gint shadow_offset_y;
     RrColor *shadow_color;
-    gchar shadow_alpha;
-    gunichar shortcut; /*!< Underline this character */
+    guchar shadow_alpha;
+    gboolean shortcut; /*!< Underline a character */
+    guint shortcut_pos; /*!< Position in bytes of the character to underline */
 };
 
 struct _RrPixmapMask {
@@ -194,7 +195,7 @@ struct _RrAppearance {
 
 #define RrDefaultFontFamily       "arial,sans"
 #define RrDefaultFontSize         8
-#define RrDefaultFontWeight       RR_FONTWEIGHT_NORMAL
+#define RrDefaultFontWeight       RR_FONTWEIGHT_BOLD
 #define RrDefaultFontSlant        RR_FONTSLANT_NORMAL
 
 RrInstance* RrInstanceNew (Display *display, gint screen);
@@ -229,6 +230,7 @@ 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, const gchar *name, gint size,
                              RrFontWeight weight, RrFontSlant slant);
@@ -244,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,