| … | |
… | |
| 247 | # define COLORTERMENVFULL COLORTERMENV "-xpm" |
247 | # define COLORTERMENVFULL COLORTERMENV "-xpm" |
| 248 | #else |
248 | #else |
| 249 | # define COLORTERMENVFULL COLORTERMENV |
249 | # define COLORTERMENVFULL COLORTERMENV |
| 250 | #endif |
250 | #endif |
| 251 | #ifndef TERMENV |
251 | #ifndef TERMENV |
| 252 | # ifdef USE_256_COLORS |
252 | # if USE_256_COLORS |
| 253 | # define TERMENV "rxvt-unicode-256color" |
253 | # define TERMENV "rxvt-unicode-256color" |
| 254 | # else |
254 | # else |
| 255 | # define TERMENV "rxvt-unicode" |
255 | # define TERMENV "rxvt-unicode" |
| 256 | # endif |
256 | # endif |
| 257 | #endif |
257 | #endif |
| … | |
… | |
| 323 | #define RS_fgMask (RS_colorMask << RS_fgShift) |
323 | #define RS_fgMask (RS_colorMask << RS_fgShift) |
| 324 | |
324 | |
| 325 | // must have space for rxvt_fontset::fontCount * 2 + 2 values |
325 | // must have space for rxvt_fontset::fontCount * 2 + 2 values |
| 326 | #define RS_fontShift (RS_fgShift + Color_Bits) |
326 | #define RS_fontShift (RS_fgShift + Color_Bits) |
| 327 | #define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ |
327 | #define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ |
|
|
328 | #define RS_fontCount rxvt_fontset::fontCount |
| 328 | #define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful |
329 | #define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful |
| 329 | |
330 | |
| 330 | // toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" |
331 | // toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" |
| 331 | #define RS_redraw (2UL << RS_fontShift) |
332 | #define RS_redraw (2UL << RS_fontShift) |
| 332 | |
333 | |
| 333 | #define RS_Sel (1UL << 22) |
334 | #define RS_Sel (1UL << 22) |
| … | |
… | |
| 467 | Color_White = maxBrightCOLOR, |
468 | Color_White = maxBrightCOLOR, |
| 468 | #else |
469 | #else |
| 469 | Color_White = maxCOLOR, |
470 | Color_White = maxCOLOR, |
| 470 | #endif |
471 | #endif |
| 471 | minTermCOLOR = Color_White + 1, |
472 | minTermCOLOR = Color_White + 1, |
| 472 | #ifndef USE_256_COLORS |
473 | #if USE_256_COLORS |
|
|
474 | maxTermCOLOR = Color_White + 240, |
|
|
475 | #else |
| 473 | maxTermCOLOR = Color_White + 72, |
476 | maxTermCOLOR = Color_White + 72, |
| 474 | #else |
|
|
| 475 | maxTermCOLOR = Color_White + 240, |
|
|
| 476 | #endif |
477 | #endif |
| 477 | #ifndef NO_CURSORCOLOR |
478 | #ifndef NO_CURSORCOLOR |
| 478 | Color_cursor, |
479 | Color_cursor, |
| 479 | Color_cursor2, |
480 | Color_cursor2, |
| 480 | #endif |
481 | #endif |
| … | |
… | |
| 512 | #else |
513 | #else |
| 513 | TOTAL_COLORS = NRS_COLORS |
514 | TOTAL_COLORS = NRS_COLORS |
| 514 | #endif |
515 | #endif |
| 515 | }; |
516 | }; |
| 516 | |
517 | |
| 517 | #ifndef USE_256_COLORS |
518 | #if USE_256_COLORS |
| 518 | #define Color_Bits 7 // 0 .. maxTermCOLOR |
519 | # define Color_Bits 9 // 0 .. maxTermCOLOR |
| 519 | #else |
520 | #else |
| 520 | #define Color_Bits 9 // 0 .. maxTermCOLOR |
521 | # define Color_Bits 7 // 0 .. maxTermCOLOR |
| 521 | #endif |
522 | #endif |
| 522 | |
523 | |
| 523 | /* |
524 | /* |
| 524 | * Resource list |
525 | * Resource list |
| 525 | */ |
526 | */ |
