--- rxvt-unicode/src/rxvt.h	2010/04/18 11:11:28	1.405
+++ rxvt-unicode/src/rxvt.h	2010/05/23 00:37:19	1.409
@@ -249,7 +249,7 @@
 # define COLORTERMENVFULL COLORTERMENV
 #endif
 #ifndef TERMENV
-# ifdef USE_256_COLORS
+# if USE_256_COLORS
 #  define TERMENV        "rxvt-unicode-256color"
 # else
 #  define TERMENV        "rxvt-unicode"
@@ -325,14 +325,15 @@
 // 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
+#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		(2UL << RS_fontShift)
 
 #define RS_Sel                  (1UL << 22)
 
-// 5 custom bits for extensions
+// 4 custom bits for extensions
 #define RS_customCount          16UL
 #define RS_customShift          23
 #define RS_customMask           ((RS_customCount - 1UL) << RS_customShift)
@@ -469,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,
@@ -514,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
 
 /*
@@ -616,6 +617,8 @@
  * MACRO DEFINES
  *****************************************************************************
  */
+
+// speed hack, copy some member variable into a local variable of the same name
 #define dLocal(type,name)       type const name = this->name
 
 // for speed reasons, we assume that all codepoints 32 to 126 are