--- rxvt-unicode/src/rxvt.h	2010/03/31 23:19:06	1.387
+++ rxvt-unicode/src/rxvt.h	2010/04/01 01:01:44	1.397
@@ -308,37 +308,38 @@
 
 #define RS_None                 0
 
-#define RS_colorMask		0x0000007fUL	// 128 colors
-#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)
+#define RS_fgMask               (RS_colorMask << RS_fgShift)
 
-// font styles
-#define RS_Bold                 0x00004000UL    // value 1
-#define RS_Italic		0x00008000UL    // value 2
+// must have space for rxvt_fontset::fontCount * 2 + 2 values
+#define RS_fontShift            (RS_fgShift + Color_Bits)
+#define RS_Careful		(1UL << RS_fontShift)	/* be careful when drawing these */
+#define RS_fontMask             ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful)   // includes RS_Careful
 
-// fake styles
-#define RS_Blink                0x00010000UL    // blink
-#define RS_RVid                 0x00020000UL    // reverse video
-#define RS_Uline                0x00040000UL    // underline
+// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
+#define RS_redraw		(2UL << RS_fontShift)
 
 // 5 custom bits for extensions
-#define RS_customCount          16
-#define RS_customMask           0x00780000UL
-#define RS_customShift          19
-
-// must have space for rxvt_fontset::fontCount * 2 + 2 values
-#define RS_fontMask             0xf8000000UL    // includes RS_Careful
-#define RS_fontShift            27
-#define RS_Careful		0x08000000UL	/* be careful when drawing these */
+#define RS_customCount          16UL
+#define RS_customShift          23
+#define RS_customMask           ((RS_customCount - 1UL) << RS_customShift)
 
-// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
-#define RS_redraw               0x02000000UL
+// font styles
+#define RS_Bold                 (1UL << RS_styleShift)
+#define RS_Italic		(2UL << RS_styleShift)
 
 #define RS_styleCount		4
+#define RS_styleShift		27
 #define RS_styleMask		(RS_Bold | RS_Italic)
-#define RS_styleShift		14
+
+// 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)
@@ -460,7 +461,11 @@
   Color_White = maxCOLOR,
 #endif
   minTermCOLOR = Color_White + 1,
+#ifndef USE_256_COLORS
   maxTermCOLOR = Color_White + 72,
+#else
+  maxTermCOLOR = Color_White + 240,
+#endif
 #ifndef NO_CURSORCOLOR
   Color_cursor,
   Color_cursor2,
@@ -500,7 +505,11 @@
 #endif
 };
 
+#ifndef USE_256_COLORS
 #define Color_Bits      7 // 0 .. maxTermCOLOR
+#else
+#define Color_Bits      9 // 0 .. maxTermCOLOR
+#endif
 
 /*
  * Resource list
@@ -631,10 +640,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))