--- rxvt-unicode/src/rxvtlib.h.in	2006/01/16 15:00:20	1.67
+++ rxvt-unicode/src/rxvtlib.h.in	2007/06/23 13:43:06	1.77
@@ -30,10 +30,12 @@
 // stdlib.h might provide it
 #endif
 
-#include "ptytty.h"
+using namespace std;
 
 extern "C" {
-#include <X11/Intrinsic.h>      /* Xlib, Xutil, Xresource, Xfuncproto */
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xresource.h>
 }
 
 /*
@@ -54,7 +56,6 @@
 struct rxvt_color;
 struct rxvt_vars;               /* defined later on */
 struct rxvt_term;
-struct rxvt_display;
 struct rxvt_im;
 struct rxvt_drawable;
 
@@ -187,7 +188,7 @@
   unsigned int      screen;     /* screen being used                         */
   unsigned int      clicks;     /* number of clicks                          */
   selection_op_t    op;         /* current operation                         */
-  bool              rect;       /* rectangluar selection?                    */
+  bool              rect;       /* rectangular selection?                    */
   row_col_t         beg;        /* beginning of selection   <= mark          */
   row_col_t         mark;       /* point of initial click   <= end           */
   row_col_t         end;        /* one character past end point              */
@@ -205,11 +206,12 @@
 
 /* rxvt_vars.options */
 enum {
-# define def(name,idx) Opt_ ## name = 1UL << (idx),
+# define def(name,idx) Opt_ ## name = idx,
 # define nodef(name)   Opt_ ## name = 0,
 # include "optinc.h"
 # undef nodef
 # undef def
+Opt_count
 };
 
 /* ------------------------------------------------------------------------- */
@@ -234,9 +236,8 @@
 
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
-  uint32_t        options;
+  uint8_t         options[(Opt_count + 7) >> 3];
   XSizeHints      szHint;
-  rxvt_display   *display;
   rxvt_color     *pix_colors;
   rxvt_color     *pix_colors_focused;
 #ifdef OFF_FOCUS_FADING
@@ -245,7 +246,6 @@
   short           numpix_colors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
   int             sb_shadow;    /* scrollbar shadow width                    */
-  rxvt_ptytty     pty;
   int             numlock_state;
   line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
   line_t         *drawn_buf;    // text on screen
@@ -257,7 +257,6 @@
 };
 
 void rxvt_init ();
-bool rxvt_tainted ();
 
 #endif                          /* _RXVTLIB_H_ */