--- rxvt-unicode/src/rxvtfont.h	2005/11/28 19:35:04	1.16
+++ rxvt-unicode/src/rxvtfont.h	2008/11/05 14:43:54	1.25
@@ -6,19 +6,6 @@
 # include <X11/Xft/Xft.h>
 #endif
 
-#ifdef HAVE_XSETLOCALE
-# define X_LOCALE
-# include <X11/Xlocale.h>
-#else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
-#endif				/* HAVE_XLOCALE */
-
-#ifdef HAVE_NL_LANGINFO
-# include <langinfo.h>
-#endif
-
 #include <inttypes.h>
 
 #include "feature.h"
@@ -28,43 +15,22 @@
 
 struct rxvt_term;
 
-struct rxvt_fontprop {
+struct rxvt_fontprop
+{
   enum {
     unset  = -1,
     medium = 100, bold = 200,
     roman  = 0, italic = 100,
   };
-  int width, height;
+  int width, height, ascent;
   int weight, slant;
 };
 
-struct rxvt_drawable {
-  rxvt_display *display;
-#if XFT
-  XftDraw *xftdrawable;
-  operator XftDraw *();
-#endif
-  Drawable drawable;
-
-  rxvt_drawable (rxvt_display *display, Drawable drawable)
-  : display(display),
-#if XFT
-    xftdrawable(0),
-#endif
-    drawable(drawable)
-  { }
-
-#if XFT
-  ~rxvt_drawable ();
-#endif
-
-  operator Drawable() { return drawable; }
-};
-
-struct rxvt_font {
+struct rxvt_font
+{
   // managed by the fontset
-  rxvt_term *r;
-  void set_term (rxvt_term *r) { this->r = r; }
+  rxvt_term *term;
+  void set_term (rxvt_term *term) { this->term = term; }
 
   char *name;
   codeset cs;
@@ -76,17 +42,17 @@
 
   void set_name (char *name);
 
-  rxvt_font () { name = 0; }
+  rxvt_font ();
   virtual ~rxvt_font () { free (name); };
 
   virtual void clear () { };
 
-  void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color);
+  void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
 
   virtual rxvt_fontprop properties () = 0;
 
-  virtual bool load (const rxvt_fontprop &morph) = 0;
-  virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) = 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,
                      int x, int y,
@@ -98,14 +64,15 @@
 
 struct rxvt_fallback_font;
 
-struct rxvt_fontset {
+struct rxvt_fontset
+{
   char *fontdesc;
 
-  rxvt_fontset (rxvt_term *r);
+  rxvt_fontset (rxvt_term *term);
   ~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);
@@ -117,8 +84,9 @@
   }
 
 private:
-  rxvt_term *r;
+  rxvt_term *term;
   rxvt_fontprop prop;
+  bool force_prop;
   simplevec<rxvt_font *> fonts;
   const rxvt_fallback_font *fallback;