--- rxvt-unicode/src/rxvt.h	2010/04/01 16:34:41	1.399
+++ rxvt-unicode/src/rxvt.h	2010/05/23 00:02:52	1.406
@@ -249,11 +249,11 @@
 # define COLORTERMENVFULL COLORTERMENV
 #endif
 #ifndef TERMENV
-# ifdef USE_256_COLORS
+# if USE_256_COLORS
 #  define TERMENV        "rxvt-unicode-256color"
 # else
 #  define TERMENV        "rxvt-unicode"
-#endif
+# endif
 #endif
 
 #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
@@ -330,6 +330,8 @@
 // toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
 #define RS_redraw		(2UL << RS_fontShift)
 
+#define RS_Sel                  (1UL << 22)
+
 // 5 custom bits for extensions
 #define RS_customCount          16UL
 #define RS_customShift          23
@@ -391,7 +393,8 @@
   XTerm_Color_pointer_bg = 14,      // change actual 'Pointer' bg color
   XTerm_Color05          = 15,      // not implemented (tektronix fg)
   XTerm_Color06          = 16,      // not implemented (tektronix bg)
-  XTerm_Color_RV         = 17,      // change actual 'Highlight' color
+  XTerm_Color_HC         = 17,      // change actual 'Highlight' bg color
+  XTerm_Color_HTC        = 19,      // change actual 'Highlight' fg color
   XTerm_logfile          = 46,      // not implemented
   XTerm_font             = 50,
 
@@ -403,8 +406,6 @@
    */
 
   // deprecated
-  Rxvt_Color_BD          = 18,
-  Rxvt_Color_UL          = 19,
   Rxvt_restoreFG         = 39,
   Rxvt_restoreBG         = 49,
 
@@ -468,10 +469,10 @@
   Color_White = maxCOLOR,
 #endif
   minTermCOLOR = Color_White + 1,
-#ifndef USE_256_COLORS
-  maxTermCOLOR = Color_White + 72,
-#else
+#if USE_256_COLORS
   maxTermCOLOR = Color_White + 240,
+#else
+  maxTermCOLOR = Color_White + 72,
 #endif
 #ifndef NO_CURSORCOLOR
   Color_cursor,
@@ -491,6 +492,7 @@
 #endif
 #ifdef OPTION_HC
   Color_HC,
+  Color_HTC,
 #endif
   Color_scroll,
 #ifdef RXVT_SCROLLBAR
@@ -512,10 +514,10 @@
 #endif
 };
 
-#ifndef USE_256_COLORS
-#define Color_Bits      7 // 0 .. maxTermCOLOR
+#if USE_256_COLORS
+# define Color_Bits      9 // 0 .. maxTermCOLOR
 #else
-#define Color_Bits      9 // 0 .. maxTermCOLOR
+# define Color_Bits      7 // 0 .. maxTermCOLOR
 #endif
 
 /*
@@ -963,7 +965,6 @@
   XSizeHints      szHint;
   rxvt_color     *pix_colors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
-  int             numlock_state;
   line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
   line_t         *drawn_buf;    // text on screen
   line_t         *swap_buf;     // lines for swap buffer