--- rxvt-unicode/src/rxvtfont.h	2006/01/25 21:03:04	1.19
+++ rxvt-unicode/src/rxvtfont.h	2007/06/25 13:50:41	1.23
@@ -13,7 +13,7 @@
 # ifdef HAVE_SETLOCALE
 #  include <clocale>
 # endif
-#endif				/* HAVE_XLOCALE */
+#endif
 
 #ifdef HAVE_NL_LANGINFO
 # include <langinfo.h>
@@ -38,29 +38,6 @@
   int weight, slant;
 };
 
-struct rxvt_drawable {
-  rxvt_screen *screen;
-#if XFT
-  XftDraw *xftdrawable;
-  operator XftDraw *();
-#endif
-  Drawable drawable;
-
-  rxvt_drawable (rxvt_screen *screen, Drawable drawable)
-  : screen(screen),
-#if XFT
-    xftdrawable(0),
-#endif
-    drawable(drawable)
-  { }
-
-#if XFT
-  ~rxvt_drawable ();
-#endif
-
-  operator Drawable() { return drawable; }
-};
-
 struct rxvt_font {
   // managed by the fontset
   rxvt_term *term;
@@ -76,7 +53,7 @@
 
   void set_name (char *name);
 
-  rxvt_font () { name = 0; }
+  rxvt_font ();
   virtual ~rxvt_font () { free (name); };
 
   virtual void clear () { };
@@ -85,7 +62,7 @@
 
   virtual rxvt_fontprop properties () = 0;
 
-  virtual bool load (const rxvt_fontprop &morph) = 0;
+  virtual bool load (const rxvt_fontprop &morph, bool force_prop) = 0;
   virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
 
   virtual void draw (rxvt_drawable &d,
@@ -105,7 +82,7 @@
   ~rxvt_fontset ();
 
   bool populate (const char *desc);
-  void set_prop (const rxvt_fontprop &prop) { this->prop = prop; }
+  void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
   int find_font (uint32_t unicode);
   int find_font (const char *name) const;
   bool realize_font (int i);
@@ -119,6 +96,7 @@
 private:
   rxvt_term *term;
   rxvt_fontprop prop;
+  bool force_prop;
   simplevec<rxvt_font *> fonts;
   const rxvt_fallback_font *fallback;