--- rxvt-unicode/src/rxvtlib.h.in	2005/12/31 16:06:48	1.55
+++ rxvt-unicode/src/rxvtlib.h.in	2006/01/05 21:21:49	1.59
@@ -79,32 +79,10 @@
 typedef uint16_t text_t; // saves lots of memory
 #endif
 typedef uint32_t rend_t;
-typedef  int32_t tlen_t; // was int16_t, but this result sin smaller code and memory use
+typedef  int32_t tlen_t;  // was int16_t, but this results in smaller code and memory use
+typedef  int32_t tlen_t_; // specifically for use in the line_t structure
 
-#define LINE_CONT -1
-
-struct line_t {
-   text_t *t; // terminal the text
-   rend_t *r; // rendition, uses RS_ flags
-   tlen_t l;  // length of each text line, LINE_CONT == continued on next line
-
-   bool is_longer ()
-   {
-     return l < 0;
-   }
-
-   void set_is_longer ()
-   {
-     l = LINE_CONT;
-   }
-
-   void clear ()
-   {
-     t = 0;
-     r = 0;
-     l = 0;
-   }
-};
+struct line_t;
 
 /*
  * terminal limits:
@@ -254,22 +232,25 @@
 #define Opt_cursorUnderline      (1UL<<23)
 #if ENABLE_FRILLS
 # define Opt_insecure		 (1UL<<24) // insecure esc sequences
-# define Opt_borderLess		 (1UL<<25) // mem borderless hints
+# define Opt_borderLess		 (1UL<<25) // mwm borderless hints
 # define Opt_hold		 (1UL<<26) // hold window open after exit
+# define Opt_skipBuiltinGlyphs	 (1UL<<27) // do not use internal glyphs
 #else
 # define Opt_insecure		 0
 # define Opt_borderLess		 0
 # define Opt_hold		 0
+# define Opt_skipBuiltinGlyphs	 0
 #endif
 #if ENABLE_STYLES
-# define Opt_intensityStyles	 (1UL<<27) // font styles imply intensity
+# define Opt_intensityStyles	 (1UL<<28) // font styles imply intensity
 #else
 # define Opt_intensityStyles	 0
 #endif
-/* place holder used for parsing command-line options */
-#define Opt_Reverse              (1UL<<30)
-#define Opt_Boolean              (1UL<<31)
 
+#define SET_OPTION(opt)		 (options |= (opt))
+#define CLR_OPTION(opt)		 (options &= ~(opt))
+#define OPTION(opt)              (options & (opt))
+#define OPTION_R(opt)            (r->options & (opt))
 #define DEFAULT_OPTIONS          (Opt_scrollBar | Opt_scrollTtyOutput \
                                   | Opt_jumpScroll | Opt_secondaryScreen \
                                   | Opt_pastableTabs | Opt_intensityStyles)