--- rxvt-unicode/src/defaultfont.h	2004/02/24 00:44:23	1.14
+++ rxvt-unicode/src/defaultfont.h	2004/07/26 14:57:12	1.19
@@ -11,7 +11,7 @@
 # include <X11/Xlocale.h>
 #else
 # ifdef HAVE_SETLOCALE
-#  include <locale.h>
+#  include <clocale>
 # endif
 #endif				/* HAVE_XLOCALE */
 
@@ -36,18 +36,28 @@
 struct rxvt_drawable {
   rxvt_display *display;
   Drawable drawable;
-# if XFT
+#if XFT
   XftDraw *xftdrawable;
+  operator XftDraw *();
 #endif
+
   rxvt_drawable (rxvt_display *display, Drawable drawable)
-  : display(display), drawable(drawable), xftdrawable(0) { }
+  : display(display),
+#if XFT
+    xftdrawable(0),
+#endif
+    drawable(drawable)
+  { }
+
+#if XFT
   ~rxvt_drawable ();
+#endif
 
   operator Drawable() { return drawable; }
-  operator XftDraw *();
 };
 
 struct rxvt_font {
+  struct rxvt_fontset *fs;
   // managed by the fontset
   rxvt_t r;
   void set_term (rxvt_t r) { this->r = r; }
@@ -90,13 +100,15 @@
 struct rxvt_fallback_font;
 
 struct rxvt_fontset {
+  char *fontdesc;
+
   rxvt_fontset (rxvt_t r);
   ~rxvt_fontset ();
 
   rxvt_font *new_font (const char *name, codeset cs);
 
   bool populate (const char *desc);
-  int find_font (uint32_t unicode);
+  int find_font (uint32_t unicode, bool bold = false);
 
   rxvt_font *operator [] (int id) const
   {