by gno gno [n=user@notbald.gropeep.org] Index: src/feature.h =================================================================== RCS file: /schmorpforge/rxvt-unicode/src/feature.h,v retrieving revision 1.61 diff -u -p -r1.61 feature.h --- src/feature.h 30 May 2009 08:51:23 -0000 1.61 +++ src/feature.h 28 Mar 2010 11:08:56 -0000 @@ -80,6 +80,8 @@ */ #define XTERM_COLORS +#define XTERM_256_COLORS + /* * Disable separate colours for bold, underline and reverse video */ Index: src/init.C =================================================================== RCS file: /schmorpforge/rxvt-unicode/src/init.C,v retrieving revision 1.262 diff -u -p -r1.262 init.C --- src/init.C 31 Jan 2010 09:02:48 -0000 1.262 +++ src/init.C 28 Mar 2010 11:08:56 -0000 @@ -176,6 +176,7 @@ const char *const def_colorName[] = "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) "rgb:ff/ff/ff", // 7/15: bright white (White) +#ifndef XTERM_256_COLORS // 88 xterm colours "rgb:00/00/00", "rgb:00/00/8b", @@ -249,6 +250,249 @@ const char *const def_colorName[] = "rgb:b9/b9/b9", "rgb:d0/d0/d0", "rgb:e7/e7/e7", +#else + // 256 xterm colours + "rgb:00/00/00", + "rgb:00/00/5f", + "rgb:00/00/87", + "rgb:00/00/af", + "rgb:00/00/d7", + "rgb:00/00/ff", + "rgb:00/5f/00", + "rgb:00/5f/5f", + "rgb:00/5f/87", + "rgb:00/5f/af", + "rgb:00/5f/d7", + "rgb:00/5f/ff", + "rgb:00/87/00", + "rgb:00/87/5f", + "rgb:00/87/87", + "rgb:00/87/af", + "rgb:00/87/d7", + "rgb:00/87/ff", + "rgb:00/af/00", + "rgb:00/af/5f", + "rgb:00/af/87", + "rgb:00/af/af", + "rgb:00/af/d7", + "rgb:00/af/ff", + "rgb:00/d7/00", + "rgb:00/d7/5f", + "rgb:00/d7/87", + "rgb:00/d7/af", + "rgb:00/d7/d7", + "rgb:00/d7/ff", + "rgb:00/ff/00", + "rgb:00/ff/5f", + "rgb:00/ff/87", + "rgb:00/ff/af", + "rgb:00/ff/d7", + "rgb:00/ff/ff", + "rgb:5f/00/00", + "rgb:5f/00/5f", + "rgb:5f/00/87", + "rgb:5f/00/af", + "rgb:5f/00/d7", + "rgb:5f/00/ff", + "rgb:5f/5f/00", + "rgb:5f/5f/5f", + "rgb:5f/5f/87", + "rgb:5f/5f/af", + "rgb:5f/5f/d7", + "rgb:5f/5f/ff", + "rgb:5f/87/00", + "rgb:5f/87/5f", + "rgb:5f/87/87", + "rgb:5f/87/af", + "rgb:5f/87/d7", + "rgb:5f/87/ff", + "rgb:5f/af/00", + "rgb:5f/af/5f", + "rgb:5f/af/87", + "rgb:5f/af/af", + "rgb:5f/af/d7", + "rgb:5f/af/ff", + "rgb:5f/d7/00", + "rgb:5f/d7/5f", + "rgb:5f/d7/87", + "rgb:5f/d7/af", + "rgb:5f/d7/d7", + "rgb:5f/d7/ff", + "rgb:5f/ff/00", + "rgb:5f/ff/5f", + "rgb:5f/ff/87", + "rgb:5f/ff/af", + "rgb:5f/ff/d7", + "rgb:5f/ff/ff", + "rgb:87/00/00", + "rgb:87/00/5f", + "rgb:87/00/87", + "rgb:87/00/af", + "rgb:87/00/d7", + "rgb:87/00/ff", + "rgb:87/5f/00", + "rgb:87/5f/5f", + "rgb:87/5f/87", + "rgb:87/5f/af", + "rgb:87/5f/d7", + "rgb:87/5f/ff", + "rgb:87/87/00", + "rgb:87/87/5f", + "rgb:87/87/87", + "rgb:87/87/af", + "rgb:87/87/d7", + "rgb:87/87/ff", + "rgb:87/af/00", + "rgb:87/af/5f", + "rgb:87/af/87", + "rgb:87/af/af", + "rgb:87/af/d7", + "rgb:87/af/ff", + "rgb:87/d7/00", + "rgb:87/d7/5f", + "rgb:87/d7/87", + "rgb:87/d7/af", + "rgb:87/d7/d7", + "rgb:87/d7/ff", + "rgb:87/ff/00", + "rgb:87/ff/5f", + "rgb:87/ff/87", + "rgb:87/ff/af", + "rgb:87/ff/d7", + "rgb:87/ff/ff", + "rgb:af/00/00", + "rgb:af/00/5f", + "rgb:af/00/87", + "rgb:af/00/af", + "rgb:af/00/d7", + "rgb:af/00/ff", + "rgb:af/5f/00", + "rgb:af/5f/5f", + "rgb:af/5f/87", + "rgb:af/5f/af", + "rgb:af/5f/d7", + "rgb:af/5f/ff", + "rgb:af/87/00", + "rgb:af/87/5f", + "rgb:af/87/87", + "rgb:af/87/af", + "rgb:af/87/d7", + "rgb:af/87/ff", + "rgb:af/af/00", + "rgb:af/af/5f", + "rgb:af/af/87", + "rgb:af/af/af", + "rgb:af/af/d7", + "rgb:af/af/ff", + "rgb:af/d7/00", + "rgb:af/d7/5f", + "rgb:af/d7/87", + "rgb:af/d7/af", + "rgb:af/d7/d7", + "rgb:af/d7/ff", + "rgb:af/ff/00", + "rgb:af/ff/5f", + "rgb:af/ff/87", + "rgb:af/ff/af", + "rgb:af/ff/d7", + "rgb:af/ff/ff", + "rgb:d7/00/00", + "rgb:d7/00/5f", + "rgb:d7/00/87", + "rgb:d7/00/af", + "rgb:d7/00/d7", + "rgb:d7/00/ff", + "rgb:d7/5f/00", + "rgb:d7/5f/5f", + "rgb:d7/5f/87", + "rgb:d7/5f/af", + "rgb:d7/5f/d7", + "rgb:d7/5f/ff", + "rgb:d7/87/00", + "rgb:d7/87/5f", + "rgb:d7/87/87", + "rgb:d7/87/af", + "rgb:d7/87/d7", + "rgb:d7/87/ff", + "rgb:d7/af/00", + "rgb:d7/af/5f", + "rgb:d7/af/87", + "rgb:d7/af/af", + "rgb:d7/af/d7", + "rgb:d7/af/ff", + "rgb:d7/d7/00", + "rgb:d7/d7/5f", + "rgb:d7/d7/87", + "rgb:d7/d7/af", + "rgb:d7/d7/d7", + "rgb:d7/d7/ff", + "rgb:d7/ff/00", + "rgb:d7/ff/5f", + "rgb:d7/ff/87", + "rgb:d7/ff/af", + "rgb:d7/ff/d7", + "rgb:d7/ff/ff", + "rgb:ff/00/00", + "rgb:ff/00/5f", + "rgb:ff/00/87", + "rgb:ff/00/af", + "rgb:ff/00/d7", + "rgb:ff/00/ff", + "rgb:ff/5f/00", + "rgb:ff/5f/5f", + "rgb:ff/5f/87", + "rgb:ff/5f/af", + "rgb:ff/5f/d7", + "rgb:ff/5f/ff", + "rgb:ff/87/00", + "rgb:ff/87/5f", + "rgb:ff/87/87", + "rgb:ff/87/af", + "rgb:ff/87/d7", + "rgb:ff/87/ff", + "rgb:ff/af/00", + "rgb:ff/af/5f", + "rgb:ff/af/87", + "rgb:ff/af/af", + "rgb:ff/af/d7", + "rgb:ff/af/ff", + "rgb:ff/d7/00", + "rgb:ff/d7/5f", + "rgb:ff/d7/87", + "rgb:ff/d7/af", + "rgb:ff/d7/d7", + "rgb:ff/d7/ff", + "rgb:ff/ff/00", + "rgb:ff/ff/5f", + "rgb:ff/ff/87", + "rgb:ff/ff/af", + "rgb:ff/ff/d7", + "rgb:ff/ff/ff", + "rgb:08/08/08", + "rgb:12/12/12", + "rgb:1c/1c/1c", + "rgb:26/26/26", + "rgb:30/30/30", + "rgb:3a/3a/3a", + "rgb:44/44/44", + "rgb:4e/4e/4e", + "rgb:58/58/58", + "rgb:62/62/62", + "rgb:6c/6c/6c", + "rgb:76/76/76", + "rgb:80/80/80", + "rgb:8a/8a/8a", + "rgb:94/94/94", + "rgb:9e/9e/9e", + "rgb:a8/a8/a8", + "rgb:b2/b2/b2", + "rgb:bc/bc/bc", + "rgb:c6/c6/c6", + "rgb:d0/d0/d0", + "rgb:da/da/da", + "rgb:e4/e4/e4", + "rgb:ee/ee/ee", +#endif #ifndef NO_CURSORCOLOR COLOR_CURSOR_BACKGROUND, Index: src/rxvt.h =================================================================== RCS file: /schmorpforge/rxvt-unicode/src/rxvt.h,v retrieving revision 1.380 diff -u -p -r1.380 rxvt.h --- src/rxvt.h 24 Jan 2010 21:53:13 -0000 1.380 +++ src/rxvt.h 28 Mar 2010 11:08:56 -0000 @@ -312,32 +312,59 @@ enum { #define RS_None 0 +#ifndef XTERM_256_COLORS #define RS_fgMask 0x0000007fUL // 128 colors #define RS_bgMask 0x00003f80UL // 128 colors +#else +#define RS_fgMask 0x000001ffUL // 512 colors +#define RS_bgMask 0x0003fe00UL // 512 colors +#endif // font styles +#ifndef XTERM_256_COLORS #define RS_Bold 0x00004000UL // value 1 #define RS_Italic 0x00008000UL // value 2 +#else +#define RS_Bold 0x00040000UL // value 1 +#define RS_Italic 0x00080000UL // value 2 +#endif // fake styles +#ifndef XTERM_256_COLORS #define RS_Blink 0x00010000UL // blink #define RS_RVid 0x00020000UL // reverse video #define RS_Uline 0x00040000UL // underline +#else +#define RS_Blink 0x00100000UL // blink +#define RS_RVid 0x00200000UL // reverse video +#define RS_Uline 0x00400000UL // underline +#endif // toggle this to force redraw, must be != RS_Careful #define RS_redraw 0x01000000UL +#ifndef XTERM_256_COLORS // 5 custom bits for extensions #define RS_customCount 32 #define RS_customMask 0x00f80000UL #define RS_customShift 19 +#else +// 1 custom bits for extensions +#define RS_customCount 2 +#define RS_customMask 0x00800000UL +#define RS_customShift 23 +#endif // other flags #define RS_Careful 0x80000000UL /* be careful when drawing these */ #define RS_styleCount 4 #define RS_styleMask (RS_Bold | RS_Italic) +#ifndef XTERM_256_COLORS #define RS_styleShift 14 +#else +#define RS_styleShift 18 +#endif #define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) #define RS_attrMask (RS_baseattrMask | RS_fontMask) @@ -463,7 +490,11 @@ enum colour_list { Color_White = maxCOLOR, #endif minTermCOLOR = Color_White + 1, +#ifndef XTERM_256_COLORS maxTermCOLOR = Color_White + 72, +#else + maxTermCOLOR = Color_White + 240, +#endif #ifndef NO_CURSORCOLOR Color_cursor, Color_cursor2, @@ -503,7 +534,11 @@ enum colour_list { #endif }; +#ifndef XTERM_256_COLORS #define Color_Bits 7 // 0 .. maxTermCOLOR +#else +#define Color_Bits 9 // 0 .. maxTermCOLOR +#endif /* * Resource list