--- rxvt-unicode/src/rxvt.h	2007/12/29 14:40:09	1.345
+++ rxvt-unicode/src/rxvt.h	2008/01/26 15:26:54	1.353
@@ -283,6 +283,10 @@
 # define HAVE_SCROLLBARS 1
 #endif
 
+#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
+# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
+#endif
+
 enum {
   NO_REFRESH       = 0,  /* Window not visible at all!        */
   FAST_REFRESH     = 1,  /* Fully exposed window              */
@@ -396,8 +400,8 @@
   XTerm_title            =  2,
   XTerm_property         =  3,      // change X property
   XTerm_Color            =  4,      // change colors
-  XTerm_Color00          = 10,      // not implemented, CLASH!
-  XTerm_Color01          = 11,      // not implemented
+  XTerm_Color00          = 10,      // change fg color
+  XTerm_Color01          = 11,      // change bg color
   XTerm_Color_cursor     = 12,      // change actual 'Cursor' color
   XTerm_Color_pointer_fg = 13,      // change actual 'Pointer' fg color
   XTerm_Color_pointer_bg = 14,      // change actual 'Pointer' bg color
@@ -412,13 +416,15 @@
   XTerm_emacs51          = 51,      // reserved for emacs shell
   /*
    * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
-   * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
    */
-  Rxvt_Color_BD          = 18,      // change actual 'Bold' color
-  Rxvt_Color_UL          = 19,      // change actual 'Underline' color
+
+  // deprecated
+  Rxvt_Color_BD          = 18,
+  Rxvt_Color_UL          = 19,
+  Rxvt_restoreFG         = 39,
+  Rxvt_restoreBG         = 49,
+
   Rxvt_Pixmap            = 20,      // new bg pixmap
-  Rxvt_restoreFG         = 39,      // change default fg color
-  Rxvt_restoreBG         = 49,      // change default bg color
   Rxvt_dumpscreen        = 55,      // dump scrollback and all of screen
 
   URxvt_locale           = 701,     // change locale
@@ -426,8 +432,8 @@
 
   URxvt_Color_IT         = 704,     // change actual 'Italic' colour
   URxvt_Color_tint       = 705,     // change actual tint colour
-  URxvt_Color_BD         = 706,
-  URxvt_Color_UL         = 707,
+  URxvt_Color_BD         = 706,     // change actual 'Bold' color
+  URxvt_Color_UL         = 707,     // change actual 'Underline' color
 
   URxvt_font             = 710,
   URxvt_boldFont         = 711,
@@ -554,6 +560,7 @@
 #define PrivMode_LFNL		(1UL<<19)
 #define PrivMode_MouseBtnEvent  (1UL<<20)
 #define PrivMode_MouseAnyEvent  (1UL<<21)
+#define PrivMode_BracketPaste   (1UL<<22)
 
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
 
@@ -978,7 +985,6 @@
 #ifdef META8_OPTION
                   meta_char,            /* Alt-key prefix */
 #endif
-                  scrollbar_align,
                   selection_wait,
                   selection_type;
 /* ---------- */
@@ -1006,9 +1012,6 @@
                   mouse_slip_wheel_speed,
 #endif
                   refresh_count,
-                  last_bot,   /* scrollbar last bottom position            */
-                  last_top,   /* scrollbar last top position               */
-                  last_state, /* scrollbar last state                      */
                   window_vt_x,
                   window_vt_y,
                   window_sb_x,
@@ -1060,8 +1063,6 @@
   char *          incr_buf;
   size_t          incr_buf_size, incr_buf_fill;
 /* ---------- */
-  Cursor          leftptr_cursor;
-/* ---------- */
   struct mouse_event MEvent;
   XComposeStatus  compose;
   struct termios  tio;
@@ -1269,8 +1270,8 @@
   void process_graphics ();
   // init.C
   void init_vars ();
-  void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
+  void init (int argc, const char *const *argv, stringvec *envv);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();
@@ -1287,7 +1288,6 @@
   ~rxvt_term ();
   void destroy ();
   void emergency_cleanup ();
-  void init (int argc, const char *const *argv, stringvec *envv);
   void recolour_cursor ();
   void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
   void window_calc (unsigned int newwidth, unsigned int newheight);