--- rxvt-unicode/src/defaultfont.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/defaultfont.h	2003/12/04 00:43:26	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: defaultfont.h,v 1.1 2003/11/24 17:28:08 pcg Exp $
+ * $Id: defaultfont.h,v 1.6 2003/12/04 00:43:26 pcg Exp $
  */
 
 #ifndef _DEFAULTFONT_H_
@@ -23,21 +23,14 @@
 #include "encoding.h"
 #include "rxvtvec.h"
 
-#include "defaultfont.intpro"	/* PROTOS for internal routines */
-
-typedef struct rxvt_vars rxvt_t;
-
 struct rxvt_font {
   // managed by the fontset
-#if EXPLICIT_CONTEXT
-  rxvt_t *rxvt_term;
-  void set_term (pR) { this->rxvt_term = R; }
-#else
-  void set_term (pR) { }
-#endif
+  rxvt_t r;
+  void set_term (rxvt_t r) { this->r = r; }
+
   char *name;
   codeset cs;
-  bool loaded;
+  bool loaded; // wether we tried loading it before (not wether it's loaded)
 
   // managed by the font object
   bool prop; // wether this is a proportional font or has other funny characteristics
@@ -72,7 +65,7 @@
 struct rxvt_fallback_font;
 
 struct rxvt_fontset {
-  rxvt_fontset (pR);
+  rxvt_fontset (rxvt_t r);
   ~rxvt_fontset ();
 
   rxvt_font *new_font (const char *name, codeset cs);
@@ -91,9 +84,7 @@
   }
 
 private:
-#ifdef EXPLICIT_CONTEXT
-  rxvt_t *rxvt_term;
-#endif
+  rxvt_t r;
   simplevec<rxvt_font *> fonts;
   const rxvt_fallback_font *fallback;