repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 87952965b44e21fefd8fd8204d81d287be8f6c3d:
path_to: 
revision_to: 

commit 87952965b44e21fefd8fd8204d81d287be8f6c3d
Author: Marc Lehmann 
Date:   Sun May 23 00:12:02 2010 +0000

    USE_256_COLORS ? 7 : 127 fonts

diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -333,7 +333,7 @@ enum {

 #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)
diff --git a/src/rxvtfont.h b/src/rxvtfont.h

--- a/src/rxvtfont.h
+++ b/src/rxvtfont.h
@@ -72,8 +72,15 @@ struct rxvt_fontset
 {
   char *fontdesc;

-  enum { fontCount = 7 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
-  enum { firstFont = 2 }; // index of first font in set
+  // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
+#if USE_256_COLORS
+  enum { fontCount =   7 }; // 4 extra colors bits, 4 fewer fontcount bits
+#else
+  enum { fontCount = 127 };
+#endif
+
+  // index of first font in set
+  enum { firstFont = 2 };

   rxvt_fontset (rxvt_term *term);
   ~rxvt_fontset ();

-----END OF PAGE-----