--- rxvt-unicode/src/rxvtlib.h.in	2006/01/08 08:49:20	1.63
+++ rxvt-unicode/src/rxvtlib.h.in	2007/05/01 21:10:04	1.76
@@ -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;
 
@@ -62,12 +63,9 @@
 
 extern rxvt_t rxvt_current_term;
 
-#define SET_R(r) rxvt_current_term = (r)
+#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
 #define GET_R rxvt_current_term
 
-#define scrollbar_visible()    scrollBar.state
-#define menubar_visible()      menuBar.state
-
 typedef struct {
   int row;
   int col;
@@ -92,10 +90,11 @@
  *  ncol       : 1 <= ncol       <= MAX(tlen_t)
  *  nrow       : 1 <= nrow       <= MAX(int)
  *  saveLines  : 0 <= saveLines  <= MAX(int)
- *  total_rows : nrow + saveLines
- *  nsaved     : 0 <= nsaved     <= saveLines
  *  term_start : 0 <= term_start < saveLines
- *  view_start : 0 <= view_start < saveLines
+ *  total_rows : nrow + saveLines
+ *
+ *  top_row    : -saveLines <= top_row    <= 0
+ *  view_start : top_row    <= view_start <= 0
  *
  *          | most coordinates are stored relative to term_start,
  *  ROW_BUF | which is the first line of the terminal screen
@@ -103,9 +102,9 @@
  *  |························= row_buf[1]
  *  |························= row_buf[2] etc.
  *  |
- *  +------------+···········= term_start - nsaved
+ *  +------------+···········= term_start + top_row
  *  | scrollback |                                      
- *  | scrollback +---------+·= term_start - view_start
+ *  | scrollback +---------+·= term_start + view_start
  *  | scrollback | display |
  *  | scrollback | display |
  *  +------------+·display·+·= term_start
@@ -134,9 +133,9 @@
   int            lineSpace;     /* number of extra pixels between rows      */
   int            saveLines;     /* number of lines that fit in scrollback   */
   int            total_rows;    /* total number of rows in this terminal    */
-  int            nsaved;        /* number of rows saved to scrollback       */
   int            term_start;    /* term lines start here                    */
   int            view_start;    /* scrollback view starts here              */
+  int            top_row;       /* topmost row index of scrollback          */
   Window         parent[6];     /* parent identifiers - we're parent[0]     */
   Window         vt;            /* vt100 window                             */
   GC             gc;            /* GC for drawing                           */
@@ -207,22 +206,17 @@
 
 /* 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
 };
 
 /* ------------------------------------------------------------------------- */
 
 typedef struct {
-  short           state;
-  Window          win;
-  struct rxvt_drawable *drawable;
-} menuBar_t;
-
-typedef struct {
   char            state;        /* scrollbar state                          */
   char            init;         /* scrollbar has been initialised           */
   unsigned int    beg;          /* slider sub-window begin height           */
@@ -242,10 +236,8 @@
 
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
-  menuBar_t       menuBar;
-  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
@@ -254,11 +246,9 @@
   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
+  line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
   line_t         *drawn_buf;    // text on screen
-  line_t         *temp_buf;     // temporary buffer
   line_t         *swap_buf;     // lines for swap buffer
   char           *tabs;         /* per location: 1 == tab-stop               */
   screen_t        screen;
@@ -267,7 +257,6 @@
 };
 
 void rxvt_init ();
-bool rxvt_tainted ();
 
 #endif                          /* _RXVTLIB_H_ */