--- rxvt-unicode/src/rxvt.h	2010/04/01 00:12:33	1.391
+++ rxvt-unicode/src/rxvt.h	2010/05/23 00:12:02	1.408
@@ -249,7 +249,11 @@
 # define COLORTERMENVFULL COLORTERMENV
 #endif
 #ifndef TERMENV
-# define TERMENV        "rxvt-unicode"
+# if USE_256_COLORS
+#  define TERMENV        "rxvt-unicode-256color"
+# else
+#  define TERMENV        "rxvt-unicode"
+# endif
 #endif
 
 #if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
@@ -306,43 +310,46 @@
   SECONDARY,
 };
 
+// define various rendition bits and masks. the rendition word
+// is 32 bits in size, and we should use it as efficiently as possible
+
 #define RS_None                 0
 
-#ifndef USE_256_COLORS
-#define RS_colorMask		0x0000007fUL	// 128 colors
-#else
-#define RS_colorMask		0x000001ffUL
-#endif
-#define RS_fgShift		0
-#define RS_bgShift		Color_Bits
-#define RS_fgMask               (RS_colorMask << RS_fgShift)
+// GET_BGATTR depends on RS_fgShift > RS_bgShift
+#define RS_colorMask		((1UL << Color_Bits) - 1UL)
+#define RS_bgShift		0
+#define RS_fgShift		(RS_bgShift + Color_Bits)
 #define RS_bgMask               (RS_colorMask << RS_bgShift)
-
-// font styles
-#define RS_Bold                 0x08000000UL    // value 1
-#define RS_Italic		0x10000000UL    // value 2
-
-// fake styles
-#define RS_Blink                0x20000000UL    // blink
-#define RS_RVid                 0x40000000UL    // reverse video
-#define RS_Uline                0x80000000UL    // underline
-
-// 5 custom bits for extensions
-#define RS_customCount          16
-#define RS_customMask           0x07800000UL
-#define RS_customShift          23
+#define RS_fgMask               (RS_colorMask << RS_fgShift)
 
 // must have space for rxvt_fontset::fontCount * 2 + 2 values
-#define RS_fontMask             0x007c0000UL    // includes RS_Careful
-#define RS_fontShift            18
-#define RS_Careful		0x00010000UL	/* be careful when drawing these */
+#define RS_fontShift            (RS_fgShift + Color_Bits)
+#define RS_Careful		(1UL << RS_fontShift)	/* be careful when drawing these */
+#define RS_fontCount		rxvt_fontset::fontCount
+#define RS_fontMask             ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful)   // includes RS_Careful
 
 // toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
-#define RS_redraw               0x00020000UL
+#define RS_redraw		(2UL << RS_fontShift)
+
+#define RS_Sel                  (1UL << 22)
+
+// 4 custom bits for extensions
+#define RS_customCount          16UL
+#define RS_customShift          23
+#define RS_customMask           ((RS_customCount - 1UL) << RS_customShift)
+
+// font styles
+#define RS_Bold                 (1UL << RS_styleShift)
+#define RS_Italic		(2UL << RS_styleShift)
 
 #define RS_styleCount		4
-#define RS_styleMask		(RS_Bold | RS_Italic)
 #define RS_styleShift		27
+#define RS_styleMask		(RS_Bold | RS_Italic)
+
+// fake styles
+#define RS_Blink                (1UL << 29)
+#define RS_RVid                 (1UL << 30)    // reverse video
+#define RS_Uline                (1UL << 31)    // underline
 
 #define RS_baseattrMask         (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
 #define RS_attrMask             (RS_baseattrMask | RS_fontMask)
@@ -387,7 +394,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,
 
@@ -399,8 +407,6 @@
    */
 
   // deprecated
-  Rxvt_Color_BD          = 18,
-  Rxvt_Color_UL          = 19,
   Rxvt_restoreFG         = 39,
   Rxvt_restoreBG         = 49,
 
@@ -464,10 +470,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,
@@ -487,6 +493,7 @@
 #endif
 #ifdef OPTION_HC
   Color_HC,
+  Color_HTC,
 #endif
   Color_scroll,
 #ifdef RXVT_SCROLLBAR
@@ -508,10 +515,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
 
 /*
@@ -643,10 +650,13 @@
 #define SET_STYLE(x,style)	(((x) & ~RS_styleMask) | ((style) << RS_styleShift))
 
 #define GET_ATTR(x)             (((x) & RS_attrMask))
-#define GET_BGATTR(x)                                                   \
-    (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid))                \
-                        | (((x) & RS_colorMask) << RS_bgShift))              \
-                     : ((x) & (RS_attrMask | RS_bgMask)))
+// return attributes defining the background, encoding doesn't matter
+// depends on RS_fgShift > RS_bgShift
+#define GET_BGATTR(x)                                      \
+  (expect_false ((x) & RS_RVid)                            \
+    ? (((x) & (RS_attrMask & ~RS_RVid))                    \
+      | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift)))  \
+    : ((x) & (RS_attrMask | RS_bgMask)))
 #define SET_FGCOLOR(x,fg)       (((x) & ~RS_fgMask)   | ((fg) << RS_fgShift))
 #define SET_BGCOLOR(x,bg)       (((x) & ~RS_bgMask)   | ((bg) << RS_bgShift))
 #define SET_ATTR(x,a)           (((x) & ~RS_attrMask) | (a))
@@ -956,7 +966,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