--- rxvt-unicode/src/rxvtfont.h	2004/11/21 20:19:24	1.15
+++ rxvt-unicode/src/rxvtfont.h	2006/01/30 04:27:17	1.20
@@ -34,20 +34,20 @@
     medium = 100, bold = 200,
     roman  = 0, italic = 100,
   };
-  int width, height;
+  int width, height, ascent;
   int weight, slant;
 };
 
 struct rxvt_drawable {
-  rxvt_display *display;
-  Drawable drawable;
+  rxvt_screen *screen;
 #if XFT
   XftDraw *xftdrawable;
   operator XftDraw *();
 #endif
+  Drawable drawable;
 
-  rxvt_drawable (rxvt_display *display, Drawable drawable)
-  : display(display),
+  rxvt_drawable (rxvt_screen *screen, Drawable drawable)
+  : screen(screen),
 #if XFT
     xftdrawable(0),
 #endif
@@ -63,8 +63,8 @@
 
 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 +76,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 has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
 
   virtual void draw (rxvt_drawable &d,
                      int x, int y,
@@ -101,7 +101,7 @@
 struct rxvt_fontset {
   char *fontdesc;
 
-  rxvt_fontset (rxvt_term *r);
+  rxvt_fontset (rxvt_term *term);
   ~rxvt_fontset ();
 
   bool populate (const char *desc);
@@ -117,7 +117,7 @@
   }
 
 private:
-  rxvt_term *r;
+  rxvt_term *term;
   rxvt_fontprop prop;
   simplevec<rxvt_font *> fonts;
   const rxvt_fallback_font *fallback;