--- rxvt-unicode/src/rxvt.h	2007/12/31 01:05:51	1.347
+++ rxvt-unicode/src/rxvt.h	2008/02/06 12:05:59	1.357
@@ -99,15 +99,6 @@
  * SYSTEM HACKS
  *****************************************************************************
  */
-/* Consistent defines - please report on the necessity
- * @ Unixware: defines (__svr4__)
- */
-#if defined (SVR4) && !defined (__svr4__)
-# define __svr4__ 1
-#endif
-#if defined (sun) && !defined (__sun__)
-# define __sun__ 1
-#endif
 
 #ifndef HAVE_XPOINTER
 typedef char *XPointer;
@@ -211,15 +202,6 @@
  *****************************************************************************
  */
 
-/* If we're using either the rxvt scrollbar, keep the
- * scrollColor resource.
- */
-#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
-# define KEEP_SCROLLCOLOR 1
-#else
-# undef KEEP_SCROLLCOLOR
-#endif
-
 /*
  * the 'essential' information for reporting Mouse Events
  * pared down from XButtonEvent
@@ -279,8 +261,8 @@
 
 #define scrollBar_esc           30
 
-#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
-# define HAVE_SCROLLBARS 1
+#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
+# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
 #endif
 
 enum {
@@ -396,8 +378,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 +394,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 +410,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,
@@ -497,8 +481,8 @@
 #ifdef OPTION_HC
   Color_HC,
 #endif
-#ifdef KEEP_SCROLLCOLOR
   Color_scroll,
+#ifdef RXVT_SCROLLBAR
   Color_trough,
 #endif
 #if ENABLE_TRANSPARENCY
@@ -508,7 +492,7 @@
   Color_fade,
 #endif
   NRS_COLORS,                 /* */
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
   Color_topShadow = NRS_COLORS,
   Color_bottomShadow,
   TOTAL_COLORS
@@ -554,6 +538,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)
 
@@ -1056,8 +1041,6 @@
   char *          incr_buf;
   size_t          incr_buf_size, incr_buf_fill;
 /* ---------- */
-  Cursor          leftptr_cursor;
-/* ---------- */
   struct mouse_event MEvent;
   XComposeStatus  compose;
   struct termios  tio;
@@ -1152,9 +1135,7 @@
   void x_cb (XEvent &xev);
   xevent_watcher termwin_ev;
   xevent_watcher vt_ev;
-#ifdef HAVE_SCROLLBARS
   xevent_watcher scrollbar_ev;
-#endif
 
   void child_cb (ev::child &w, int revents); ev::child child_ev;
   void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
@@ -1265,8 +1246,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 ();
@@ -1283,7 +1264,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);
@@ -1492,7 +1472,6 @@
   void resize_scrollbar ();
   int scrollbar_mapping (int map);
   int scrollbar_show (int update);
-  void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
 
   // xdefaults.C
   void get_options (int argc, const char *const *argv);