--- rxvt-unicode/src/defaultfont.h	2003/12/18 04:14:30	1.7
+++ rxvt-unicode/src/defaultfont.h	2004/07/26 14:57:12	1.19
@@ -1,16 +1,17 @@
-/*
- * $Id: defaultfont.h,v 1.7 2003/12/18 04:14:30 pcg Exp $
- */
+#ifndef DEFAULTFONT_H_
+#define DEFAULTFONT_H_
 
-#ifndef _DEFAULTFONT_H_
-#define _DEFAULTFONT_H_
+#include <X11/Xlib.h>
+#if XFT
+# include <X11/Xft/Xft.h>
+#endif
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
 # ifdef HAVE_SETLOCALE
-#  include <locale.h>
+#  include <clocale>
 # endif
 #endif				/* HAVE_XLOCALE */
 
@@ -21,19 +22,42 @@
 #include "rxvtlib.h"
 #include "feature.h"
 #include "encoding.h"
-#include "rxvtvec.h"
+#include "rxvtstl.h"
 
 struct rxvt_fontprop {
   enum {
     medium = 100, bold = 200,
     roman  = 0, italic = 100,
   };
-  int height;
-  int weight;
-  int slant;
+  int width, height;
+  int weight, slant;
+};
+
+struct rxvt_drawable {
+  rxvt_display *display;
+  Drawable drawable;
+#if XFT
+  XftDraw *xftdrawable;
+  operator XftDraw *();
+#endif
+
+  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_fontset *fs;
   // managed by the fontset
   rxvt_t r;
   void set_term (rxvt_t r) { this->r = r; }
@@ -54,9 +78,9 @@
   }
 
   rxvt_font () { name = 0; }
-  ~rxvt_font () { free (name); clear (); };
+  ~rxvt_font () { free (name); };
 
-  void clear_rect (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);
 
   virtual void clear () { };
 
@@ -65,27 +89,28 @@
   virtual bool load (const rxvt_fontprop &prop) = 0;
   virtual bool has_codepoint (uint32_t unicode) = 0;
 
-  virtual void draw (int x, int y,
+  virtual void draw (rxvt_drawable &d,
+                     int x, int y,
                      const text_t *text, int len,
                      int fg, int bg) = 0;
 };
 
-//#define FONT_REF(obj) (obj)->refcnt++
-//#define FONT_UNREF(obj) if (!--(obj)->refcnt) delete (obj)
-#define FONT_UNREF(f) delete f
+#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
 
 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);
 
-  void populate (const char *desc);
-  int find_font (uint32_t unicode);
+  bool populate (const char *desc);
+  int find_font (uint32_t unicode, bool bold = false);
 
-  rxvt_font *operator [](int id) const
+  rxvt_font *operator [] (int id) const
   {
     return fonts[id];
   }