| 1 |
by gno |
| 2 |
gno [n=user@notbald.gropeep.org] |
| 3 |
|
| 4 |
diff -ur rxvt-unicode.orig/configure.ac rxvt-unicode/configure.ac |
| 5 |
--- rxvt-unicode.orig/configure.ac 2007-06-26 14:59:13.000000000 -0700 |
| 6 |
+++ rxvt-unicode/configure.ac 2007-06-27 17:05:31.000000000 -0700 |
| 7 |
@@ -104,6 +104,7 @@ |
| 8 |
support_mousewheel=yes |
| 9 |
support_mouseslipwheel=yes |
| 10 |
support_text_blink=yes |
| 11 |
+support_xterm_colors=88 |
| 12 |
support_pointer_blank=yes |
| 13 |
support_scroll_rxvt=yes |
| 14 |
support_scroll_next=yes |
| 15 |
@@ -148,6 +149,7 @@ |
| 16 |
support_mousewheel=no |
| 17 |
support_mouseslipwheel=no |
| 18 |
support_text_blink=no |
| 19 |
+ support_xterm_colors=no |
| 20 |
support_pointer_blank=no |
| 21 |
support_scroll_rxvt=no |
| 22 |
support_scroll_next=no |
| 23 |
@@ -179,6 +181,7 @@ |
| 24 |
support_mousewheel=yes |
| 25 |
support_mouseslipwheel=yes |
| 26 |
support_text_blink=yes |
| 27 |
+ support_xterm_colors=88 |
| 28 |
support_pointer_blank=yes |
| 29 |
support_scroll_rxvt=yes |
| 30 |
support_scroll_next=yes |
| 31 |
@@ -419,6 +422,12 @@ |
| 32 |
support_text_blink=$enableval |
| 33 |
fi]) |
| 34 |
|
| 35 |
+AC_ARG_ENABLE(xterm-colors, |
| 36 |
+ [ --enable-xterm-colors enable Xterm 88 or 256 color model], |
| 37 |
+ [if test x$enableval = x88 -o x$enableval = x256 -o x$enableval = xno; then |
| 38 |
+ support_xterm_colors=$enableval |
| 39 |
+ fi]) |
| 40 |
+ |
| 41 |
AC_ARG_ENABLE(pointer-blank, |
| 42 |
[ --enable-pointer-blank enable pointer blank when typing or inactive pointer], |
| 43 |
[if test x$enableval = xyes -o x$enableval = xno; then |
| 44 |
@@ -830,6 +839,9 @@ |
| 45 |
if test x$support_text_blink = xyes; then |
| 46 |
AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) |
| 47 |
fi |
| 48 |
+if test x$support_xterm_colors = x88 -o x$support_xterm_colors = x256; then |
| 49 |
+ AC_DEFINE_UNQUOTED(XTERM_COLORS, $support_xterm_colors, Set to 88 or 256 depending on Xterm color cube you want) |
| 50 |
+fi |
| 51 |
if test x$support_unicode3 = xyes; then |
| 52 |
AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0) |
| 53 |
fi |
| 54 |
@@ -977,6 +989,9 @@ |
| 55 |
if test x$terminfo != x; then |
| 56 |
echo " set TERMINFO to: $terminfo" |
| 57 |
fi |
| 58 |
+if test x$support_xterm_colors != xno; then |
| 59 |
+ echo " Xterm color cube: $support_xterm_colors" |
| 60 |
+fi |
| 61 |
echo " default resource name: $RESNAME" |
| 62 |
echo " resource class: $RESCLASS" |
| 63 |
if test x$RESFALLBACK != x; then |
| 64 |
diff -ur rxvt-unicode.orig/src/feature.h rxvt-unicode/src/feature.h |
| 65 |
--- rxvt-unicode.orig/src/feature.h 2007-06-01 21:57:54.000000000 -0700 |
| 66 |
+++ rxvt-unicode/src/feature.h 2007-06-27 17:05:31.000000000 -0700 |
| 67 |
@@ -34,6 +34,8 @@ |
| 68 |
# define XAPPLOADDIRLOCALE X11LIBDIR "/%s/app-defaults" |
| 69 |
#endif |
| 70 |
|
| 71 |
+#include "../config.h" |
| 72 |
+ |
| 73 |
/*-------------------------------SECURITY-------------------------------*/ |
| 74 |
|
| 75 |
/* |
| 76 |
@@ -85,7 +87,9 @@ |
| 77 |
/* |
| 78 |
* Make colours match xterm colours instead of `traditional' rxvt colours |
| 79 |
*/ |
| 80 |
-#define XTERM_COLORS |
| 81 |
+#ifndef XTERM_COLORS |
| 82 |
+#define XTERM_COLORS 256 |
| 83 |
+#endif |
| 84 |
|
| 85 |
/* |
| 86 |
* Disable separate colours for bold, underline and reverse video |
| 87 |
diff -ur rxvt-unicode.orig/src/init.C rxvt-unicode/src/init.C |
| 88 |
--- rxvt-unicode.orig/src/init.C 2007-06-25 17:40:18.000000000 -0700 |
| 89 |
+++ rxvt-unicode/src/init.C 2007-06-27 17:05:31.000000000 -0700 |
| 90 |
@@ -71,6 +71,7 @@ |
| 91 |
"rgb:00/ff/ff", // 6/14: bright cyan (Cyan) |
| 92 |
"rgb:ff/ff/ff", // 7/15: bright white (White) |
| 93 |
|
| 94 |
+#if XTERM_COLORS == 88 |
| 95 |
// 88 xterm colours |
| 96 |
"rgb:00/00/00", |
| 97 |
"rgb:00/00/8b", |
| 98 |
@@ -144,6 +145,251 @@ |
| 99 |
"rgb:b9/b9/b9", |
| 100 |
"rgb:d0/d0/d0", |
| 101 |
"rgb:e7/e7/e7", |
| 102 |
+#elif XTERM_COLORS == 256 |
| 103 |
+ // 256 xterm colours |
| 104 |
+ "rgb:00/00/00", |
| 105 |
+ "rgb:00/00/5f", |
| 106 |
+ "rgb:00/00/87", |
| 107 |
+ "rgb:00/00/af", |
| 108 |
+ "rgb:00/00/d7", |
| 109 |
+ "rgb:00/00/ff", |
| 110 |
+ "rgb:00/5f/00", |
| 111 |
+ "rgb:00/5f/5f", |
| 112 |
+ "rgb:00/5f/87", |
| 113 |
+ "rgb:00/5f/af", |
| 114 |
+ "rgb:00/5f/d7", |
| 115 |
+ "rgb:00/5f/ff", |
| 116 |
+ "rgb:00/87/00", |
| 117 |
+ "rgb:00/87/5f", |
| 118 |
+ "rgb:00/87/87", |
| 119 |
+ "rgb:00/87/af", |
| 120 |
+ "rgb:00/87/d7", |
| 121 |
+ "rgb:00/87/ff", |
| 122 |
+ "rgb:00/af/00", |
| 123 |
+ "rgb:00/af/5f", |
| 124 |
+ "rgb:00/af/87", |
| 125 |
+ "rgb:00/af/af", |
| 126 |
+ "rgb:00/af/d7", |
| 127 |
+ "rgb:00/af/ff", |
| 128 |
+ "rgb:00/d7/00", |
| 129 |
+ "rgb:00/d7/5f", |
| 130 |
+ "rgb:00/d7/87", |
| 131 |
+ "rgb:00/d7/af", |
| 132 |
+ "rgb:00/d7/d7", |
| 133 |
+ "rgb:00/d7/ff", |
| 134 |
+ "rgb:00/ff/00", |
| 135 |
+ "rgb:00/ff/5f", |
| 136 |
+ "rgb:00/ff/87", |
| 137 |
+ "rgb:00/ff/af", |
| 138 |
+ "rgb:00/ff/d7", |
| 139 |
+ "rgb:00/ff/ff", |
| 140 |
+ "rgb:5f/00/00", |
| 141 |
+ "rgb:5f/00/5f", |
| 142 |
+ "rgb:5f/00/87", |
| 143 |
+ "rgb:5f/00/af", |
| 144 |
+ "rgb:5f/00/d7", |
| 145 |
+ "rgb:5f/00/ff", |
| 146 |
+ "rgb:5f/5f/00", |
| 147 |
+ "rgb:5f/5f/5f", |
| 148 |
+ "rgb:5f/5f/87", |
| 149 |
+ "rgb:5f/5f/af", |
| 150 |
+ "rgb:5f/5f/d7", |
| 151 |
+ "rgb:5f/5f/ff", |
| 152 |
+ "rgb:5f/87/00", |
| 153 |
+ "rgb:5f/87/5f", |
| 154 |
+ "rgb:5f/87/87", |
| 155 |
+ "rgb:5f/87/af", |
| 156 |
+ "rgb:5f/87/d7", |
| 157 |
+ "rgb:5f/87/ff", |
| 158 |
+ "rgb:5f/af/00", |
| 159 |
+ "rgb:5f/af/5f", |
| 160 |
+ "rgb:5f/af/87", |
| 161 |
+ "rgb:5f/af/af", |
| 162 |
+ "rgb:5f/af/d7", |
| 163 |
+ "rgb:5f/af/ff", |
| 164 |
+ "rgb:5f/d7/00", |
| 165 |
+ "rgb:5f/d7/5f", |
| 166 |
+ "rgb:5f/d7/87", |
| 167 |
+ "rgb:5f/d7/af", |
| 168 |
+ "rgb:5f/d7/d7", |
| 169 |
+ "rgb:5f/d7/ff", |
| 170 |
+ "rgb:5f/ff/00", |
| 171 |
+ "rgb:5f/ff/5f", |
| 172 |
+ "rgb:5f/ff/87", |
| 173 |
+ "rgb:5f/ff/af", |
| 174 |
+ "rgb:5f/ff/d7", |
| 175 |
+ "rgb:5f/ff/ff", |
| 176 |
+ "rgb:87/00/00", |
| 177 |
+ "rgb:87/00/5f", |
| 178 |
+ "rgb:87/00/87", |
| 179 |
+ "rgb:87/00/af", |
| 180 |
+ "rgb:87/00/d7", |
| 181 |
+ "rgb:87/00/ff", |
| 182 |
+ "rgb:87/5f/00", |
| 183 |
+ "rgb:87/5f/5f", |
| 184 |
+ "rgb:87/5f/87", |
| 185 |
+ "rgb:87/5f/af", |
| 186 |
+ "rgb:87/5f/d7", |
| 187 |
+ "rgb:87/5f/ff", |
| 188 |
+ "rgb:87/87/00", |
| 189 |
+ "rgb:87/87/5f", |
| 190 |
+ "rgb:87/87/87", |
| 191 |
+ "rgb:87/87/af", |
| 192 |
+ "rgb:87/87/d7", |
| 193 |
+ "rgb:87/87/ff", |
| 194 |
+ "rgb:87/af/00", |
| 195 |
+ "rgb:87/af/5f", |
| 196 |
+ "rgb:87/af/87", |
| 197 |
+ "rgb:87/af/af", |
| 198 |
+ "rgb:87/af/d7", |
| 199 |
+ "rgb:87/af/ff", |
| 200 |
+ "rgb:87/d7/00", |
| 201 |
+ "rgb:87/d7/5f", |
| 202 |
+ "rgb:87/d7/87", |
| 203 |
+ "rgb:87/d7/af", |
| 204 |
+ "rgb:87/d7/d7", |
| 205 |
+ "rgb:87/d7/ff", |
| 206 |
+ "rgb:87/ff/00", |
| 207 |
+ "rgb:87/ff/5f", |
| 208 |
+ "rgb:87/ff/87", |
| 209 |
+ "rgb:87/ff/af", |
| 210 |
+ "rgb:87/ff/d7", |
| 211 |
+ "rgb:87/ff/ff", |
| 212 |
+ "rgb:af/00/00", |
| 213 |
+ "rgb:af/00/5f", |
| 214 |
+ "rgb:af/00/87", |
| 215 |
+ "rgb:af/00/af", |
| 216 |
+ "rgb:af/00/d7", |
| 217 |
+ "rgb:af/00/ff", |
| 218 |
+ "rgb:af/5f/00", |
| 219 |
+ "rgb:af/5f/5f", |
| 220 |
+ "rgb:af/5f/87", |
| 221 |
+ "rgb:af/5f/af", |
| 222 |
+ "rgb:af/5f/d7", |
| 223 |
+ "rgb:af/5f/ff", |
| 224 |
+ "rgb:af/87/00", |
| 225 |
+ "rgb:af/87/5f", |
| 226 |
+ "rgb:af/87/87", |
| 227 |
+ "rgb:af/87/af", |
| 228 |
+ "rgb:af/87/d7", |
| 229 |
+ "rgb:af/87/ff", |
| 230 |
+ "rgb:af/af/00", |
| 231 |
+ "rgb:af/af/5f", |
| 232 |
+ "rgb:af/af/87", |
| 233 |
+ "rgb:af/af/af", |
| 234 |
+ "rgb:af/af/d7", |
| 235 |
+ "rgb:af/af/ff", |
| 236 |
+ "rgb:af/d7/00", |
| 237 |
+ "rgb:af/d7/5f", |
| 238 |
+ "rgb:af/d7/87", |
| 239 |
+ "rgb:af/d7/af", |
| 240 |
+ "rgb:af/d7/d7", |
| 241 |
+ "rgb:af/d7/ff", |
| 242 |
+ "rgb:af/ff/00", |
| 243 |
+ "rgb:af/ff/5f", |
| 244 |
+ "rgb:af/ff/87", |
| 245 |
+ "rgb:af/ff/af", |
| 246 |
+ "rgb:af/ff/d7", |
| 247 |
+ "rgb:af/ff/ff", |
| 248 |
+ "rgb:d7/00/00", |
| 249 |
+ "rgb:d7/00/5f", |
| 250 |
+ "rgb:d7/00/87", |
| 251 |
+ "rgb:d7/00/af", |
| 252 |
+ "rgb:d7/00/d7", |
| 253 |
+ "rgb:d7/00/ff", |
| 254 |
+ "rgb:d7/5f/00", |
| 255 |
+ "rgb:d7/5f/5f", |
| 256 |
+ "rgb:d7/5f/87", |
| 257 |
+ "rgb:d7/5f/af", |
| 258 |
+ "rgb:d7/5f/d7", |
| 259 |
+ "rgb:d7/5f/ff", |
| 260 |
+ "rgb:d7/87/00", |
| 261 |
+ "rgb:d7/87/5f", |
| 262 |
+ "rgb:d7/87/87", |
| 263 |
+ "rgb:d7/87/af", |
| 264 |
+ "rgb:d7/87/d7", |
| 265 |
+ "rgb:d7/87/ff", |
| 266 |
+ "rgb:d7/af/00", |
| 267 |
+ "rgb:d7/af/5f", |
| 268 |
+ "rgb:d7/af/87", |
| 269 |
+ "rgb:d7/af/af", |
| 270 |
+ "rgb:d7/af/d7", |
| 271 |
+ "rgb:d7/af/ff", |
| 272 |
+ "rgb:d7/d7/00", |
| 273 |
+ "rgb:d7/d7/5f", |
| 274 |
+ "rgb:d7/d7/87", |
| 275 |
+ "rgb:d7/d7/af", |
| 276 |
+ "rgb:d7/d7/d7", |
| 277 |
+ "rgb:d7/d7/ff", |
| 278 |
+ "rgb:d7/ff/00", |
| 279 |
+ "rgb:d7/ff/5f", |
| 280 |
+ "rgb:d7/ff/87", |
| 281 |
+ "rgb:d7/ff/af", |
| 282 |
+ "rgb:d7/ff/d7", |
| 283 |
+ "rgb:d7/ff/ff", |
| 284 |
+ "rgb:ff/00/00", |
| 285 |
+ "rgb:ff/00/5f", |
| 286 |
+ "rgb:ff/00/87", |
| 287 |
+ "rgb:ff/00/af", |
| 288 |
+ "rgb:ff/00/d7", |
| 289 |
+ "rgb:ff/00/ff", |
| 290 |
+ "rgb:ff/5f/00", |
| 291 |
+ "rgb:ff/5f/5f", |
| 292 |
+ "rgb:ff/5f/87", |
| 293 |
+ "rgb:ff/5f/af", |
| 294 |
+ "rgb:ff/5f/d7", |
| 295 |
+ "rgb:ff/5f/ff", |
| 296 |
+ "rgb:ff/87/00", |
| 297 |
+ "rgb:ff/87/5f", |
| 298 |
+ "rgb:ff/87/87", |
| 299 |
+ "rgb:ff/87/af", |
| 300 |
+ "rgb:ff/87/d7", |
| 301 |
+ "rgb:ff/87/ff", |
| 302 |
+ "rgb:ff/af/00", |
| 303 |
+ "rgb:ff/af/5f", |
| 304 |
+ "rgb:ff/af/87", |
| 305 |
+ "rgb:ff/af/af", |
| 306 |
+ "rgb:ff/af/d7", |
| 307 |
+ "rgb:ff/af/ff", |
| 308 |
+ "rgb:ff/d7/00", |
| 309 |
+ "rgb:ff/d7/5f", |
| 310 |
+ "rgb:ff/d7/87", |
| 311 |
+ "rgb:ff/d7/af", |
| 312 |
+ "rgb:ff/d7/d7", |
| 313 |
+ "rgb:ff/d7/ff", |
| 314 |
+ "rgb:ff/ff/00", |
| 315 |
+ "rgb:ff/ff/5f", |
| 316 |
+ "rgb:ff/ff/87", |
| 317 |
+ "rgb:ff/ff/af", |
| 318 |
+ "rgb:ff/ff/d7", |
| 319 |
+ "rgb:ff/ff/ff", |
| 320 |
+ "rgb:08/08/08", |
| 321 |
+ "rgb:12/12/12", |
| 322 |
+ "rgb:1c/1c/1c", |
| 323 |
+ "rgb:26/26/26", |
| 324 |
+ "rgb:30/30/30", |
| 325 |
+ "rgb:3a/3a/3a", |
| 326 |
+ "rgb:44/44/44", |
| 327 |
+ "rgb:4e/4e/4e", |
| 328 |
+ "rgb:58/58/58", |
| 329 |
+ "rgb:62/62/62", |
| 330 |
+ "rgb:6c/6c/6c", |
| 331 |
+ "rgb:76/76/76", |
| 332 |
+ "rgb:80/80/80", |
| 333 |
+ "rgb:8a/8a/8a", |
| 334 |
+ "rgb:94/94/94", |
| 335 |
+ "rgb:9e/9e/9e", |
| 336 |
+ "rgb:a8/a8/a8", |
| 337 |
+ "rgb:b2/b2/b2", |
| 338 |
+ "rgb:bc/bc/bc", |
| 339 |
+ "rgb:c6/c6/c6", |
| 340 |
+ "rgb:d0/d0/d0", |
| 341 |
+ "rgb:da/da/da", |
| 342 |
+ "rgb:e4/e4/e4", |
| 343 |
+ "rgb:ee/ee/ee", |
| 344 |
+#else |
| 345 |
+#error XTERM_COLORS needs to be set to 88 or 256 |
| 346 |
+#endif |
| 347 |
|
| 348 |
#ifndef NO_CURSORCOLOR |
| 349 |
COLOR_CURSOR_BACKGROUND, |
| 350 |
diff -ur rxvt-unicode.orig/src/rxvt.h rxvt-unicode/src/rxvt.h |
| 351 |
--- rxvt-unicode.orig/src/rxvt.h 2007-06-25 17:40:19.000000000 -0700 |
| 352 |
+++ rxvt-unicode/src/rxvt.h 2007-06-27 23:04:47.000000000 -0700 |
| 353 |
@@ -397,32 +397,58 @@ |
| 354 |
|
| 355 |
#define RS_None 0 |
| 356 |
|
| 357 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 358 |
#define RS_fgMask 0x0000007fUL // 128 colors |
| 359 |
#define RS_bgMask 0x00003f80UL // 128 colors |
| 360 |
+#elif XTERM_COLORS == 256 |
| 361 |
+#define RS_fgMask 0x000001ffUL // 512 colors |
| 362 |
+#define RS_bgMask 0x0003fe00UL // 512 colors |
| 363 |
+#endif |
| 364 |
|
| 365 |
// font styles |
| 366 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 367 |
#define RS_Bold 0x00004000UL // value 1 |
| 368 |
#define RS_Italic 0x00008000UL // value 2 |
| 369 |
+#elif XTERM_COLORS == 256 |
| 370 |
+#define RS_Bold 0x00040000UL // value 1 |
| 371 |
+#define RS_Italic 0x00080000UL // value 2 |
| 372 |
+#endif |
| 373 |
|
| 374 |
// fake styles |
| 375 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 376 |
#define RS_Blink 0x00010000UL // blink |
| 377 |
#define RS_RVid 0x00020000UL // reverse video |
| 378 |
#define RS_Uline 0x00040000UL // underline |
| 379 |
+#elif XTERM_COLORS == 256 |
| 380 |
+#define RS_Blink 0x00100000UL // blink (disabled) |
| 381 |
+#define RS_RVid 0x00200000UL // reverse video (disabled) |
| 382 |
+#define RS_Uline 0x00400000UL // underline |
| 383 |
+#endif |
| 384 |
+ |
| 385 |
|
| 386 |
// toggle this to force redraw, must be != RS_Careful |
| 387 |
#define RS_redraw 0x01000000UL |
| 388 |
|
| 389 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 390 |
// 5 custom bits for extensions |
| 391 |
#define RS_customCount 32 |
| 392 |
#define RS_customMask 0x00f80000UL |
| 393 |
+#elif XTERM_COLORS == 256 |
| 394 |
+#define RS_customCount 0 |
| 395 |
+#define RS_customMask 0x00000000UL |
| 396 |
+#endif |
| 397 |
#define RS_customShift 19 |
| 398 |
|
| 399 |
// other flags |
| 400 |
#define RS_Careful 0x80000000UL /* be careful when drawing these */ |
| 401 |
|
| 402 |
#define RS_styleCount 4 |
| 403 |
#define RS_styleMask (RS_Bold | RS_Italic) |
| 404 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 405 |
#define RS_styleShift 14 |
| 406 |
+#elif XTERM_COLORS == 256 |
| 407 |
+#define RS_styleShift 18 |
| 408 |
+#endif |
| 409 |
|
| 410 |
#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) |
| 411 |
#define RS_attrMask (RS_baseattrMask | RS_fontMask) |
| 412 |
@@ -545,7 +573,13 @@ |
| 413 |
Color_White = maxCOLOR, |
| 414 |
#endif |
| 415 |
minTermCOLOR = Color_White + 1, |
| 416 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 417 |
maxTermCOLOR = Color_White + 72, |
| 418 |
+#elif (XTERM_COLORS == 256) |
| 419 |
+ maxTermCOLOR = Color_White + 240, |
| 420 |
+#else |
| 421 |
+#error XTERM_COLORS needs to be set to 88 or 256 |
| 422 |
+#endif |
| 423 |
#ifndef NO_CURSORCOLOR |
| 424 |
Color_cursor, |
| 425 |
Color_cursor2, |
| 426 |
@@ -585,7 +619,11 @@ |
| 427 |
#endif |
| 428 |
}; |
| 429 |
|
| 430 |
+#if !defined(XTERM_COLORS) || XTERM_COLORS == 88 |
| 431 |
#define Color_Bits 7 // 0 .. maxTermCOLOR |
| 432 |
+#elif XTERM_COLORS == 256 |
| 433 |
+#define Color_Bits 9 // 0 .. maxTermCOLOR |
| 434 |
+#endif |
| 435 |
|
| 436 |
/* |
| 437 |
* Resource list |
