SOURCES: iterm-256-colors.patch (NEW) - handling 256 colors by lib...
witekfl
witekfl at pld-linux.org
Thu Feb 9 18:02:43 CET 2006
Author: witekfl Date: Thu Feb 9 17:02:43 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- handling 256 colors by library, fbiterm and xiterm
- changed behaviour of fbiterm (it must be run on top of framebuffer console)
- currently fbiterm works correctly only in 8bpp
---- Files affected:
SOURCES:
iterm-256-colors.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/iterm-256-colors.patch
diff -u /dev/null SOURCES/iterm-256-colors.patch:1.1
--- /dev/null Thu Feb 9 18:02:43 2006
+++ SOURCES/iterm-256-colors.patch Thu Feb 9 18:02:38 2006
@@ -0,0 +1,1269 @@
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/lib/src/screen.c iterm-0.5.new/lib/src/screen.c
+--- iterm-0.5/lib/src/screen.c 2002-12-02 09:15:49.000000000 +0100
++++ iterm-0.5.new/lib/src/screen.c 2006-02-09 13:55:45.668691500 +0100
+@@ -2434,7 +2434,13 @@
+ case 35: /* magenta */
+ case 36: /* cyan */
+ case 37: /* white */
+- screen->current_attr.foreground = params[i] - 29;
++ screen->current_attr.foreground = params[i] - 30;
++ break;
++ case 38: /* foreground 256 */
++ if ((i + 2) < n_params && params[i + 1] == 5) {
++ screen->current_attr.foreground = params[i + 2];
++ i += 2;
++ }
+ break;
+ case 39: /* default color */
+ screen->current_attr.foreground = 0;
+@@ -2447,7 +2453,13 @@
+ case 45: /* magenta background */
+ case 46: /* cyan background */
+ case 47: /* white background */
+- screen->current_attr.background = params[i] - 39;
++ screen->current_attr.background = params[i] - 40;
++ break;
++ case 48: /* background 256 */
++ if ((i + 2) < n_params && params[i + 1] == 5) {
++ screen->current_attr.background = params[i + 2];
++ i += 2;
++ }
+ break;
+ case 49: /* default color */
+ screen->current_attr.background = 0;
+@@ -2696,6 +2708,7 @@
+ VT100_register_sequence(vt100,"\033[l", GROUND_STATE, VTScreen_RST,screen);
+ VT100_register_sequence(vt100,"\033[m", GROUND_STATE, VTScreen_SGR,screen);
+ VT100_register_sequence(vt100,"\033[r",GROUND_STATE,VTScreen_DECSTBM,screen);
++
+ #ifdef BIDI
+ VT100_register_sequence(vt100,"\033[[",GROUND_STATE,VTScreen_SRS,screen);
+ #endif
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/lib/src/screen_internal.h iterm-0.5.new/lib/src/screen_internal.h
+--- iterm-0.5/lib/src/screen_internal.h 2002-12-02 09:10:33.000000000 +0100
++++ iterm-0.5.new/lib/src/screen_internal.h 2006-02-09 09:11:22.887163000 +0100
+@@ -119,9 +119,9 @@
+ /**< current underlined text attribute state */
+ unsigned int blink:1;
+ /**< current blink text attribute state*/
+- unsigned int foreground:4;
++ unsigned int foreground;
+ /**< current foreground color attribute state */
+- unsigned int background:4;
++ unsigned int background;
+ /**< current background color attribute state */
+ } current_attr;
+ /**< current text rendition flags */
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/lib/src/screen_row.c iterm-0.5.new/lib/src/screen_row.c
+--- iterm-0.5/lib/src/screen_row.c 2002-12-02 10:50:05.000000000 +0100
++++ iterm-0.5.new/lib/src/screen_row.c 2006-02-09 09:11:22.887163000 +0100
+@@ -55,8 +55,8 @@
+ if(blink) (attr)[ATTRIBUTES]|=BLINK; \
+ if(inverse)(attr)[ATTRIBUTES]|=INVERSE; \
+ if(underline)(attr)[ATTRIBUTES]|=UNDERLINE; \
+- (attr)[COLOR]|=foreground; \
+- (attr)[COLOR]|=(background<<4); \
++ (attr)[COLOR]|= foreground; \
++ (attr)[BACKGROUND]|=background; \
+ (attr)[CHARSET]|=charset; \
+ } while(0)
+
+@@ -255,7 +255,7 @@
+ static void RowBuffer_simple_replace_space(Row *row, int col)
+ {
+ row->buffer.value[GET_INDEX(row,col)] = ' ';
+- row->buffer.attrs[col][0] = row->buffer.attrs[col][1] = row->buffer.attrs[col][3] = 0;
++ row->buffer.attrs[col][0] = row->buffer.attrs[col][1] = row->buffer.attrs[col][3] = row->buffer.attrs[col][4] = 0;
+ row->buffer.attrs[col][2] = ASCII; /* ASCII */
+ Row_set_updated(row,col,(col+1));
+ }
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/lib/src/screen_row.h iterm-0.5.new/lib/src/screen_row.h
+--- iterm-0.5/lib/src/screen_row.h 2002-11-12 10:39:35.000000000 +0100
++++ iterm-0.5.new/lib/src/screen_row.h 2006-02-09 09:11:22.887163000 +0100
+@@ -11,16 +11,17 @@
+ #define __SCREEN_ROW_H__
+
+ #include "mbchar.h"
+-typedef unsigned char CellAttributes[4];
++typedef unsigned char CellAttributes[5];
+ /**<
+- attr[3] attr[2] attr[1] attr[0]
+- |num_combined|charset| color | attrs |
++ attr[4] attr[3] attr[2] attr[1] attr[0]
++ |background ||num_combined|charset| foreground | attrs |
+ */
+ enum {
+ ATTRIBUTES = 0,
+ COLOR = 1,
+ CHARSET = 2,
+- NUM_COMBINED = 3
++ NUM_COMBINED = 3,
++ BACKGROUND = 4
+ };
+
+ enum {
+@@ -103,15 +104,16 @@
+ (Row_is_char_drawn(row1,col1) && Row_is_char_drawn(row2,col2) && \
+ row1->buffer.attrs[col1][0] == row2->buffer.attrs[col2][0] && \
+ row1->buffer.attrs[col1][1] == row2->buffer.attrs[col2][1] && \
+- row1->buffer.attrs[col1][2] == row2->buffer.attrs[col2][2] )
++ row1->buffer.attrs[col1][2] == row2->buffer.attrs[col2][2] && \
++ row1->buffer.attrs[col1][4] == row2->buffer.attrs[col2][4])
+
+ #define Row_is_bold(row, col) ((row)->buffer.attrs[(col)][0]&BOLD)
+ #define Row_is_blink(row, col) ((row)->buffer.attrs[(col)][0]&BLINK)
+ #define Row_is_inverse(row, col) ( (((row)->buffer.attrs[(col)][0]&INVERSE) == INVERSE) ^ (((row)->buffer.attrs[(col)][0]&SELECTED) == SELECTED) )
+ #define Row_is_underline(row, col) ((row)->buffer.attrs[(col)][0]&UNDERLINE)
+
+-#define Row_get_foreground(row,col) (((row)->buffer.attrs[(col)][1])&FOREGROUND_MASK)
+-#define Row_get_background(row,col) ((((row)->buffer.attrs[(col)][1])&BACKGROUND_MASK) >> 4)
++#define Row_get_foreground(row,col) (((row)->buffer.attrs[(col)][1]))
++#define Row_get_background(row,col) (((row)->buffer.attrs[(col)][4]))
+
+ #define Row_get_charset(row,col) (((row)->buffer.attrs[(col)][2])&0xFF)
+ #define Row_get_num_combined(row,col) (((row)->buffer.attrs[(col)][3])&0xFF)
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/unix/fbiterm/src/fb.c iterm-0.5.new/unix/fbiterm/src/fb.c
+--- iterm-0.5/unix/fbiterm/src/fb.c 2002-09-13 12:55:53.000000000 +0200
++++ iterm-0.5.new/unix/fbiterm/src/fb.c 2006-02-09 09:31:27.214428750 +0100
+@@ -35,6 +35,12 @@
+ fb_true32_set_rendition, fb_true32_draw_text},
+ };
+
++static __u16 red[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0x
afaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x808, 0x1212, 0x1c1c, 0x2626, 0x3030, 0x3a3a, 0x4444, 0x4e4e, 0x5858, 0x6262, 0x6c6c, 0x7676, 0x8080, 0x8a8a, 0x9494, 0x9e9e, 0xa8a8, 0xb2b2, 0xbcbc, 0xc6c6, 0xd0d0, 0xdada, 0xe4e4, 0xeeee, };
++static __u16 green[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xaf
af, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x5f5f, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0x8787, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xafaf, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xd7d7, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x808, 0x1212, 0x1c1c, 0x2626, 0x3030, 0x3a3a, 0x4444, 0x4e4e, 0x5858, 0x6262, 0x6c6c, 0x7676, 0x8080, 0x8a8a, 0x9494, 0x9e9e, 0xa8a8, 0xb2b2, 0xbcbc, 0xc6c6, 0xd0d0, 0xdada, 0xe4e4, 0xeeee, };
++static __u16 blue[] = {0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787,
0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x0, 0x5f5f, 0x8787, 0xafaf, 0xd7d7, 0xffff, 0x808, 0x1212, 0x1c1c, 0x2626, 0x3030, 0x3a3a, 0x4444, 0x4e4e, 0x5858, 0x6262, 0x6c6c, 0x7676, 0x8080, 0x8a8a, 0x9494, 0x9e9e, 0xa8a8, 0xb2b2, 0xbcbc, 0xc6c6, 0xd0d0, 0xdada, 0xe4e4, 0xeeee, };
++static __u16 transp[240];
++static struct fb_cmap cmap;
++
+ void
+ fb_end ()
+ {
+@@ -96,6 +102,13 @@
+ return -1;
+ }
+ }
++ cmap.start = 16;
++ cmap.len = 240;
++ cmap.red = red;
++ cmap.green = green;
++ cmap.blue = blue;
++ cmap.transp = transp;
++ ioctl(pIterm->fb->fbfp, FBIOPUTCMAP, &cmap);
+
+ /* set framebuffer params */
+ pIterm->fb->line_length = fscinfo.line_length;
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/unix/fbiterm/src/fb_true8.c iterm-0.5.new/unix/fbiterm/src/fb_true8.c
+--- iterm-0.5/unix/fbiterm/src/fb_true8.c 2002-08-13 09:10:46.000000000 +0200
++++ iterm-0.5.new/unix/fbiterm/src/fb_true8.c 2006-02-09 13:54:47.337046000 +0100
+@@ -47,26 +47,22 @@
+ if (pIterm->lock)
+ return;
+
+- if (foreground == 0)
+- fgcmap = 7; /* white */
+- else
++ if (!foreground && !background)
+ {
+- fgcmap = foreground - 1;
+- if (fgcmap > 0 && fgcmap < 7)
+- fgcmap = (fgcmap == 0x02
+- || fgcmap ==
+- 0x05) ? fgcmap : (fgcmap & 0x02) | (~fgcmap & 0x05);
++ fgcmap = 7; /* white */
++ bgcmap = 0; /* black */
+ }
+-
+- if (background == 0)
+- bgcmap = 0; /* black */
+ else
+ {
+- bgcmap = background - 1;
++ fgcmap = foreground;
++ if (fgcmap > 0 && fgcmap < 7)
++ {
++ fgcmap = (fgcmap == 0x02 || fgcmap == 0x05) ? fgcmap : (fgcmap & 0x02) | (~fgcmap & 0x05);
++ if (bold) fgcmap | 0x08;
++ }
++ bgcmap = background;
+ if (bgcmap > 0 && bgcmap < 7)
+- bgcmap = (bgcmap == 0x02
+- || bgcmap ==
+- 0x05) ? bgcmap : (bgcmap & 0x02) | (~bgcmap & 0x05);
++ bgcmap = (bgcmap == 0x02 || bgcmap == 0x05) ? bgcmap : (bgcmap & 0x02) | (~bgcmap & 0x05);
+ }
+
+ if (inverse)
+@@ -107,15 +103,17 @@
+ {
+ if (c & 0x80000000)
+ {
++#if 0
+ if (pIterm->bold)
+ *(dst8) = (char) fgcmap | 0x08;
+ else
+- {
++ {
+ if (getenv ("ITERM_BOLD") != NULL)
+ *(dst8) = (char) fgcmap | 0x08;
+ else
++#endif
+ *(dst8) = (char) fgcmap;
+- }
++/* } */
+ }
+ else
+ *(dst8) = (char) bgcmap;
+diff -Nru -x '*o' -x '*P' -x '*.m4' -x '*[01]' -x 'request*' -x config.guess -x 'config.h*' -x '*.log' iterm-0.5/unix/fbiterm/src/term.c iterm-0.5.new/unix/fbiterm/src/term.c
+--- iterm-0.5/unix/fbiterm/src/term.c 2002-10-24 14:44:01.000000000 +0200
++++ iterm-0.5.new/unix/fbiterm/src/term.c 2006-02-09 09:11:22.883162750 +0100
+@@ -111,7 +111,7 @@
+ char *tty_name;
+ int console_fd = -1;
+ int display_mode;
+-
++#if 0
+ if( ((console_fd = open("/dev/console",O_RDWR)) < 0) &&
+ ((console_fd = open("/dev/console",O_RDONLY)) < 0) )
+ {
+@@ -133,7 +133,7 @@
+ }
+ close(console_fd);
+ }
+-
++#endif
+
+ if (!isatty(STDIN_FILENO))
+ {
+diff -Nru -x '*.o' -x '*0' -x '*1' -x 'config*' iterm-0.5/unix/Xaw/lib.orig/VT.c iterm-0.5/unix/Xaw/lib/VT.c
+--- iterm-0.5/unix/Xaw/lib.orig/VT.c 2002-12-17 02:48:46.000000000 +0100
++++ iterm-0.5/unix/Xaw/lib/VT.c 2006-02-09 16:11:52.987117000 +0100
+@@ -140,7 +140,489 @@
+ offset(textcolor[14]),XtRString, "cyan"},
+ {XtNtextColor15, XtCTextColor15, XtRPixel, sizeof(Pixel),
+ offset(textcolor[15]),XtRString, "white"},
+- {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
++
++ {XtNtextColor16, XtCTextColor16, XtRPixel, sizeof(Pixel),
++ offset(textcolor[16]),XtRString, "rgb:00/00/00"},
++ {XtNtextColor17, XtCTextColor17, XtRPixel, sizeof(Pixel),
++ offset(textcolor[17]),XtRString, "rgb:00/00/2a"},
++ {XtNtextColor18, XtCTextColor18, XtRPixel, sizeof(Pixel),
++ offset(textcolor[18]),XtRString, "rgb:00/00/55"},
++ {XtNtextColor19, XtCTextColor19, XtRPixel, sizeof(Pixel),
++ offset(textcolor[19]),XtRString, "rgb:00/00/7f"},
++ {XtNtextColor20, XtCTextColor20, XtRPixel, sizeof(Pixel),
++ offset(textcolor[20]),XtRString, "rgb:00/00/aa"},
++ {XtNtextColor21, XtCTextColor21, XtRPixel, sizeof(Pixel),
++ offset(textcolor[21]),XtRString, "rgb:00/00/d4"},
++ {XtNtextColor22, XtCTextColor22, XtRPixel, sizeof(Pixel),
++ offset(textcolor[22]),XtRString, "rgb:00/2a/00"},
++ {XtNtextColor23, XtCTextColor23, XtRPixel, sizeof(Pixel),
++ offset(textcolor[23]),XtRString, "rgb:00/2a/2a"},
++ {XtNtextColor24, XtCTextColor24, XtRPixel, sizeof(Pixel),
++ offset(textcolor[24]),XtRString, "rgb:00/2a/55"},
++ {XtNtextColor25, XtCTextColor25, XtRPixel, sizeof(Pixel),
++ offset(textcolor[25]),XtRString, "rgb:00/2a/7f"},
++ {XtNtextColor26, XtCTextColor26, XtRPixel, sizeof(Pixel),
++ offset(textcolor[26]),XtRString, "rgb:00/2a/aa"},
++ {XtNtextColor27, XtCTextColor27, XtRPixel, sizeof(Pixel),
++ offset(textcolor[27]),XtRString, "rgb:00/2a/d4"},
++ {XtNtextColor28, XtCTextColor28, XtRPixel, sizeof(Pixel),
++ offset(textcolor[28]),XtRString, "rgb:00/55/00"},
++ {XtNtextColor29, XtCTextColor29, XtRPixel, sizeof(Pixel),
++ offset(textcolor[29]),XtRString, "rgb:00/55/2a"},
++ {XtNtextColor30, XtCTextColor30, XtRPixel, sizeof(Pixel),
++ offset(textcolor[30]),XtRString, "rgb:00/55/55"},
++ {XtNtextColor31, XtCTextColor31, XtRPixel, sizeof(Pixel),
++ offset(textcolor[31]),XtRString, "rgb:00/55/7f"},
++ {XtNtextColor32, XtCTextColor32, XtRPixel, sizeof(Pixel),
++ offset(textcolor[32]),XtRString, "rgb:00/55/aa"},
++ {XtNtextColor33, XtCTextColor33, XtRPixel, sizeof(Pixel),
++ offset(textcolor[33]),XtRString, "rgb:00/55/d4"},
++ {XtNtextColor34, XtCTextColor34, XtRPixel, sizeof(Pixel),
++ offset(textcolor[34]),XtRString, "rgb:00/7f/00"},
++ {XtNtextColor35, XtCTextColor35, XtRPixel, sizeof(Pixel),
++ offset(textcolor[35]),XtRString, "rgb:00/7f/2a"},
++ {XtNtextColor36, XtCTextColor36, XtRPixel, sizeof(Pixel),
++ offset(textcolor[36]),XtRString, "rgb:00/7f/55"},
++ {XtNtextColor37, XtCTextColor37, XtRPixel, sizeof(Pixel),
++ offset(textcolor[37]),XtRString, "rgb:00/7f/7f"},
++ {XtNtextColor38, XtCTextColor38, XtRPixel, sizeof(Pixel),
++ offset(textcolor[38]),XtRString, "rgb:00/7f/aa"},
++ {XtNtextColor39, XtCTextColor39, XtRPixel, sizeof(Pixel),
++ offset(textcolor[39]),XtRString, "rgb:00/7f/d4"},
++ {XtNtextColor40, XtCTextColor40, XtRPixel, sizeof(Pixel),
++ offset(textcolor[40]),XtRString, "rgb:00/aa/00"},
++ {XtNtextColor41, XtCTextColor41, XtRPixel, sizeof(Pixel),
++ offset(textcolor[41]),XtRString, "rgb:00/aa/2a"},
++ {XtNtextColor42, XtCTextColor42, XtRPixel, sizeof(Pixel),
++ offset(textcolor[42]),XtRString, "rgb:00/aa/55"},
++ {XtNtextColor43, XtCTextColor43, XtRPixel, sizeof(Pixel),
++ offset(textcolor[43]),XtRString, "rgb:00/aa/7f"},
++ {XtNtextColor44, XtCTextColor44, XtRPixel, sizeof(Pixel),
++ offset(textcolor[44]),XtRString, "rgb:00/aa/aa"},
++ {XtNtextColor45, XtCTextColor45, XtRPixel, sizeof(Pixel),
++ offset(textcolor[45]),XtRString, "rgb:00/aa/d4"},
++ {XtNtextColor46, XtCTextColor46, XtRPixel, sizeof(Pixel),
++ offset(textcolor[46]),XtRString, "rgb:00/d4/00"},
++ {XtNtextColor47, XtCTextColor47, XtRPixel, sizeof(Pixel),
++ offset(textcolor[47]),XtRString, "rgb:00/d4/2a"},
++ {XtNtextColor48, XtCTextColor48, XtRPixel, sizeof(Pixel),
++ offset(textcolor[48]),XtRString, "rgb:00/d4/55"},
++ {XtNtextColor49, XtCTextColor49, XtRPixel, sizeof(Pixel),
++ offset(textcolor[49]),XtRString, "rgb:00/d4/7f"},
++ {XtNtextColor50, XtCTextColor50, XtRPixel, sizeof(Pixel),
++ offset(textcolor[50]),XtRString, "rgb:00/d4/aa"},
++ {XtNtextColor51, XtCTextColor51, XtRPixel, sizeof(Pixel),
++ offset(textcolor[51]),XtRString, "rgb:00/d4/d4"},
++ {XtNtextColor52, XtCTextColor52, XtRPixel, sizeof(Pixel),
++ offset(textcolor[52]),XtRString, "rgb:2a/00/00"},
++ {XtNtextColor53, XtCTextColor53, XtRPixel, sizeof(Pixel),
++ offset(textcolor[53]),XtRString, "rgb:2a/00/2a"},
++ {XtNtextColor54, XtCTextColor54, XtRPixel, sizeof(Pixel),
++ offset(textcolor[54]),XtRString, "rgb:2a/00/55"},
++ {XtNtextColor55, XtCTextColor55, XtRPixel, sizeof(Pixel),
++ offset(textcolor[55]),XtRString, "rgb:2a/00/7f"},
++ {XtNtextColor56, XtCTextColor56, XtRPixel, sizeof(Pixel),
++ offset(textcolor[56]),XtRString, "rgb:2a/00/aa"},
++ {XtNtextColor57, XtCTextColor57, XtRPixel, sizeof(Pixel),
++ offset(textcolor[57]),XtRString, "rgb:2a/00/d4"},
++ {XtNtextColor58, XtCTextColor58, XtRPixel, sizeof(Pixel),
++ offset(textcolor[58]),XtRString, "rgb:2a/2a/00"},
++ {XtNtextColor59, XtCTextColor59, XtRPixel, sizeof(Pixel),
++ offset(textcolor[59]),XtRString, "rgb:2a/2a/2a"},
++ {XtNtextColor60, XtCTextColor60, XtRPixel, sizeof(Pixel),
++ offset(textcolor[60]),XtRString, "rgb:2a/2a/55"},
++ {XtNtextColor61, XtCTextColor61, XtRPixel, sizeof(Pixel),
++ offset(textcolor[61]),XtRString, "rgb:2a/2a/7f"},
++ {XtNtextColor62, XtCTextColor62, XtRPixel, sizeof(Pixel),
++ offset(textcolor[62]),XtRString, "rgb:2a/2a/aa"},
++ {XtNtextColor63, XtCTextColor63, XtRPixel, sizeof(Pixel),
++ offset(textcolor[63]),XtRString, "rgb:2a/2a/d4"},
++ {XtNtextColor64, XtCTextColor64, XtRPixel, sizeof(Pixel),
++ offset(textcolor[64]),XtRString, "rgb:2a/55/00"},
++ {XtNtextColor65, XtCTextColor65, XtRPixel, sizeof(Pixel),
++ offset(textcolor[65]),XtRString, "rgb:2a/55/2a"},
++ {XtNtextColor66, XtCTextColor66, XtRPixel, sizeof(Pixel),
++ offset(textcolor[66]),XtRString, "rgb:2a/55/55"},
++ {XtNtextColor67, XtCTextColor67, XtRPixel, sizeof(Pixel),
++ offset(textcolor[67]),XtRString, "rgb:2a/55/7f"},
++ {XtNtextColor68, XtCTextColor68, XtRPixel, sizeof(Pixel),
++ offset(textcolor[68]),XtRString, "rgb:2a/55/aa"},
++ {XtNtextColor69, XtCTextColor69, XtRPixel, sizeof(Pixel),
++ offset(textcolor[69]),XtRString, "rgb:2a/55/d4"},
++ {XtNtextColor70, XtCTextColor70, XtRPixel, sizeof(Pixel),
++ offset(textcolor[70]),XtRString, "rgb:2a/7f/00"},
++ {XtNtextColor71, XtCTextColor71, XtRPixel, sizeof(Pixel),
++ offset(textcolor[71]),XtRString, "rgb:2a/7f/2a"},
++ {XtNtextColor72, XtCTextColor72, XtRPixel, sizeof(Pixel),
++ offset(textcolor[72]),XtRString, "rgb:2a/7f/55"},
++ {XtNtextColor73, XtCTextColor73, XtRPixel, sizeof(Pixel),
++ offset(textcolor[73]),XtRString, "rgb:2a/7f/7f"},
++ {XtNtextColor74, XtCTextColor74, XtRPixel, sizeof(Pixel),
++ offset(textcolor[74]),XtRString, "rgb:2a/7f/aa"},
++ {XtNtextColor75, XtCTextColor75, XtRPixel, sizeof(Pixel),
++ offset(textcolor[75]),XtRString, "rgb:2a/7f/d4"},
++ {XtNtextColor76, XtCTextColor76, XtRPixel, sizeof(Pixel),
++ offset(textcolor[76]),XtRString, "rgb:2a/aa/00"},
++ {XtNtextColor77, XtCTextColor77, XtRPixel, sizeof(Pixel),
++ offset(textcolor[77]),XtRString, "rgb:2a/aa/2a"},
++ {XtNtextColor78, XtCTextColor78, XtRPixel, sizeof(Pixel),
++ offset(textcolor[78]),XtRString, "rgb:2a/aa/55"},
++ {XtNtextColor79, XtCTextColor79, XtRPixel, sizeof(Pixel),
++ offset(textcolor[79]),XtRString, "rgb:2a/aa/7f"},
++ {XtNtextColor80, XtCTextColor80, XtRPixel, sizeof(Pixel),
++ offset(textcolor[80]),XtRString, "rgb:2a/aa/aa"},
++ {XtNtextColor81, XtCTextColor81, XtRPixel, sizeof(Pixel),
++ offset(textcolor[81]),XtRString, "rgb:2a/aa/d4"},
++ {XtNtextColor82, XtCTextColor82, XtRPixel, sizeof(Pixel),
++ offset(textcolor[82]),XtRString, "rgb:2a/d4/00"},
++ {XtNtextColor83, XtCTextColor83, XtRPixel, sizeof(Pixel),
++ offset(textcolor[83]),XtRString, "rgb:2a/d4/2a"},
++ {XtNtextColor84, XtCTextColor84, XtRPixel, sizeof(Pixel),
++ offset(textcolor[84]),XtRString, "rgb:2a/d4/55"},
++ {XtNtextColor85, XtCTextColor85, XtRPixel, sizeof(Pixel),
++ offset(textcolor[85]),XtRString, "rgb:2a/d4/7f"},
++ {XtNtextColor86, XtCTextColor86, XtRPixel, sizeof(Pixel),
++ offset(textcolor[86]),XtRString, "rgb:2a/d4/aa"},
++ {XtNtextColor87, XtCTextColor87, XtRPixel, sizeof(Pixel),
++ offset(textcolor[87]),XtRString, "rgb:2a/d4/d4"},
++ {XtNtextColor88, XtCTextColor88, XtRPixel, sizeof(Pixel),
++ offset(textcolor[88]),XtRString, "rgb:55/00/00"},
++ {XtNtextColor89, XtCTextColor89, XtRPixel, sizeof(Pixel),
++ offset(textcolor[89]),XtRString, "rgb:55/00/2a"},
++ {XtNtextColor90, XtCTextColor90, XtRPixel, sizeof(Pixel),
++ offset(textcolor[90]),XtRString, "rgb:55/00/55"},
++ {XtNtextColor91, XtCTextColor91, XtRPixel, sizeof(Pixel),
++ offset(textcolor[91]),XtRString, "rgb:55/00/7f"},
++ {XtNtextColor92, XtCTextColor92, XtRPixel, sizeof(Pixel),
++ offset(textcolor[92]),XtRString, "rgb:55/00/aa"},
++ {XtNtextColor93, XtCTextColor93, XtRPixel, sizeof(Pixel),
++ offset(textcolor[93]),XtRString, "rgb:55/00/d4"},
++ {XtNtextColor94, XtCTextColor94, XtRPixel, sizeof(Pixel),
++ offset(textcolor[94]),XtRString, "rgb:55/2a/00"},
++ {XtNtextColor95, XtCTextColor95, XtRPixel, sizeof(Pixel),
++ offset(textcolor[95]),XtRString, "rgb:55/2a/2a"},
++ {XtNtextColor96, XtCTextColor96, XtRPixel, sizeof(Pixel),
++ offset(textcolor[96]),XtRString, "rgb:55/2a/55"},
++ {XtNtextColor97, XtCTextColor97, XtRPixel, sizeof(Pixel),
++ offset(textcolor[97]),XtRString, "rgb:55/2a/7f"},
++ {XtNtextColor98, XtCTextColor98, XtRPixel, sizeof(Pixel),
++ offset(textcolor[98]),XtRString, "rgb:55/2a/aa"},
++ {XtNtextColor99, XtCTextColor99, XtRPixel, sizeof(Pixel),
++ offset(textcolor[99]),XtRString, "rgb:55/2a/d4"},
++ {XtNtextColor100, XtCTextColor100, XtRPixel, sizeof(Pixel),
++ offset(textcolor[100]),XtRString, "rgb:55/55/00"},
++ {XtNtextColor101, XtCTextColor101, XtRPixel, sizeof(Pixel),
++ offset(textcolor[101]),XtRString, "rgb:55/55/2a"},
++ {XtNtextColor102, XtCTextColor102, XtRPixel, sizeof(Pixel),
++ offset(textcolor[102]),XtRString, "rgb:55/55/55"},
++ {XtNtextColor103, XtCTextColor103, XtRPixel, sizeof(Pixel),
++ offset(textcolor[103]),XtRString, "rgb:55/55/7f"},
++ {XtNtextColor104, XtCTextColor104, XtRPixel, sizeof(Pixel),
++ offset(textcolor[104]),XtRString, "rgb:55/55/aa"},
++ {XtNtextColor105, XtCTextColor105, XtRPixel, sizeof(Pixel),
++ offset(textcolor[105]),XtRString, "rgb:55/55/d4"},
++ {XtNtextColor106, XtCTextColor106, XtRPixel, sizeof(Pixel),
++ offset(textcolor[106]),XtRString, "rgb:55/7f/00"},
++ {XtNtextColor107, XtCTextColor107, XtRPixel, sizeof(Pixel),
++ offset(textcolor[107]),XtRString, "rgb:55/7f/2a"},
++ {XtNtextColor108, XtCTextColor108, XtRPixel, sizeof(Pixel),
++ offset(textcolor[108]),XtRString, "rgb:55/7f/55"},
++ {XtNtextColor109, XtCTextColor109, XtRPixel, sizeof(Pixel),
++ offset(textcolor[109]),XtRString, "rgb:55/7f/7f"},
++ {XtNtextColor110, XtCTextColor110, XtRPixel, sizeof(Pixel),
++ offset(textcolor[110]),XtRString, "rgb:55/7f/aa"},
++ {XtNtextColor111, XtCTextColor111, XtRPixel, sizeof(Pixel),
++ offset(textcolor[111]),XtRString, "rgb:55/7f/d4"},
++ {XtNtextColor112, XtCTextColor112, XtRPixel, sizeof(Pixel),
++ offset(textcolor[112]),XtRString, "rgb:55/aa/00"},
++ {XtNtextColor113, XtCTextColor113, XtRPixel, sizeof(Pixel),
++ offset(textcolor[113]),XtRString, "rgb:55/aa/2a"},
++ {XtNtextColor114, XtCTextColor114, XtRPixel, sizeof(Pixel),
++ offset(textcolor[114]),XtRString, "rgb:55/aa/55"},
++ {XtNtextColor115, XtCTextColor115, XtRPixel, sizeof(Pixel),
++ offset(textcolor[115]),XtRString, "rgb:55/aa/7f"},
++ {XtNtextColor116, XtCTextColor116, XtRPixel, sizeof(Pixel),
++ offset(textcolor[116]),XtRString, "rgb:55/aa/aa"},
++ {XtNtextColor117, XtCTextColor117, XtRPixel, sizeof(Pixel),
++ offset(textcolor[117]),XtRString, "rgb:55/aa/d4"},
++ {XtNtextColor118, XtCTextColor118, XtRPixel, sizeof(Pixel),
++ offset(textcolor[118]),XtRString, "rgb:55/d4/00"},
++ {XtNtextColor119, XtCTextColor119, XtRPixel, sizeof(Pixel),
++ offset(textcolor[119]),XtRString, "rgb:55/d4/2a"},
++ {XtNtextColor120, XtCTextColor120, XtRPixel, sizeof(Pixel),
++ offset(textcolor[120]),XtRString, "rgb:55/d4/55"},
++ {XtNtextColor121, XtCTextColor121, XtRPixel, sizeof(Pixel),
++ offset(textcolor[121]),XtRString, "rgb:55/d4/7f"},
++ {XtNtextColor122, XtCTextColor122, XtRPixel, sizeof(Pixel),
++ offset(textcolor[122]),XtRString, "rgb:55/d4/aa"},
++ {XtNtextColor123, XtCTextColor123, XtRPixel, sizeof(Pixel),
++ offset(textcolor[123]),XtRString, "rgb:55/d4/d4"},
++ {XtNtextColor124, XtCTextColor124, XtRPixel, sizeof(Pixel),
++ offset(textcolor[124]),XtRString, "rgb:7f/00/00"},
++ {XtNtextColor125, XtCTextColor125, XtRPixel, sizeof(Pixel),
++ offset(textcolor[125]),XtRString, "rgb:7f/00/2a"},
++ {XtNtextColor126, XtCTextColor126, XtRPixel, sizeof(Pixel),
++ offset(textcolor[126]),XtRString, "rgb:7f/00/55"},
++ {XtNtextColor127, XtCTextColor127, XtRPixel, sizeof(Pixel),
++ offset(textcolor[127]),XtRString, "rgb:7f/00/7f"},
++ {XtNtextColor128, XtCTextColor128, XtRPixel, sizeof(Pixel),
++ offset(textcolor[128]),XtRString, "rgb:7f/00/aa"},
++ {XtNtextColor129, XtCTextColor129, XtRPixel, sizeof(Pixel),
++ offset(textcolor[129]),XtRString, "rgb:7f/00/d4"},
++ {XtNtextColor130, XtCTextColor130, XtRPixel, sizeof(Pixel),
++ offset(textcolor[130]),XtRString, "rgb:7f/2a/00"},
++ {XtNtextColor131, XtCTextColor131, XtRPixel, sizeof(Pixel),
++ offset(textcolor[131]),XtRString, "rgb:7f/2a/2a"},
++ {XtNtextColor132, XtCTextColor132, XtRPixel, sizeof(Pixel),
++ offset(textcolor[132]),XtRString, "rgb:7f/2a/55"},
++ {XtNtextColor133, XtCTextColor133, XtRPixel, sizeof(Pixel),
++ offset(textcolor[133]),XtRString, "rgb:7f/2a/7f"},
++ {XtNtextColor134, XtCTextColor134, XtRPixel, sizeof(Pixel),
++ offset(textcolor[134]),XtRString, "rgb:7f/2a/aa"},
++ {XtNtextColor135, XtCTextColor135, XtRPixel, sizeof(Pixel),
++ offset(textcolor[135]),XtRString, "rgb:7f/2a/d4"},
++ {XtNtextColor136, XtCTextColor136, XtRPixel, sizeof(Pixel),
++ offset(textcolor[136]),XtRString, "rgb:7f/55/00"},
++ {XtNtextColor137, XtCTextColor137, XtRPixel, sizeof(Pixel),
++ offset(textcolor[137]),XtRString, "rgb:7f/55/2a"},
++ {XtNtextColor138, XtCTextColor138, XtRPixel, sizeof(Pixel),
++ offset(textcolor[138]),XtRString, "rgb:7f/55/55"},
++ {XtNtextColor139, XtCTextColor139, XtRPixel, sizeof(Pixel),
++ offset(textcolor[139]),XtRString, "rgb:7f/55/7f"},
++ {XtNtextColor140, XtCTextColor140, XtRPixel, sizeof(Pixel),
++ offset(textcolor[140]),XtRString, "rgb:7f/55/aa"},
++ {XtNtextColor141, XtCTextColor141, XtRPixel, sizeof(Pixel),
++ offset(textcolor[141]),XtRString, "rgb:7f/55/d4"},
++ {XtNtextColor142, XtCTextColor142, XtRPixel, sizeof(Pixel),
++ offset(textcolor[142]),XtRString, "rgb:7f/7f/00"},
++ {XtNtextColor143, XtCTextColor143, XtRPixel, sizeof(Pixel),
++ offset(textcolor[143]),XtRString, "rgb:7f/7f/2a"},
++ {XtNtextColor144, XtCTextColor144, XtRPixel, sizeof(Pixel),
++ offset(textcolor[144]),XtRString, "rgb:7f/7f/55"},
++ {XtNtextColor145, XtCTextColor145, XtRPixel, sizeof(Pixel),
++ offset(textcolor[145]),XtRString, "rgb:7f/7f/7f"},
++ {XtNtextColor146, XtCTextColor146, XtRPixel, sizeof(Pixel),
++ offset(textcolor[146]),XtRString, "rgb:7f/7f/aa"},
++ {XtNtextColor147, XtCTextColor147, XtRPixel, sizeof(Pixel),
++ offset(textcolor[147]),XtRString, "rgb:7f/7f/d4"},
++ {XtNtextColor148, XtCTextColor148, XtRPixel, sizeof(Pixel),
++ offset(textcolor[148]),XtRString, "rgb:7f/aa/00"},
++ {XtNtextColor149, XtCTextColor149, XtRPixel, sizeof(Pixel),
++ offset(textcolor[149]),XtRString, "rgb:7f/aa/2a"},
++ {XtNtextColor150, XtCTextColor150, XtRPixel, sizeof(Pixel),
++ offset(textcolor[150]),XtRString, "rgb:7f/aa/55"},
++ {XtNtextColor151, XtCTextColor151, XtRPixel, sizeof(Pixel),
++ offset(textcolor[151]),XtRString, "rgb:7f/aa/7f"},
++ {XtNtextColor152, XtCTextColor152, XtRPixel, sizeof(Pixel),
++ offset(textcolor[152]),XtRString, "rgb:7f/aa/aa"},
++ {XtNtextColor153, XtCTextColor153, XtRPixel, sizeof(Pixel),
++ offset(textcolor[153]),XtRString, "rgb:7f/aa/d4"},
++ {XtNtextColor154, XtCTextColor154, XtRPixel, sizeof(Pixel),
++ offset(textcolor[154]),XtRString, "rgb:7f/d4/00"},
++ {XtNtextColor155, XtCTextColor155, XtRPixel, sizeof(Pixel),
++ offset(textcolor[155]),XtRString, "rgb:7f/d4/2a"},
++ {XtNtextColor156, XtCTextColor156, XtRPixel, sizeof(Pixel),
++ offset(textcolor[156]),XtRString, "rgb:7f/d4/55"},
++ {XtNtextColor157, XtCTextColor157, XtRPixel, sizeof(Pixel),
++ offset(textcolor[157]),XtRString, "rgb:7f/d4/7f"},
++ {XtNtextColor158, XtCTextColor158, XtRPixel, sizeof(Pixel),
++ offset(textcolor[158]),XtRString, "rgb:7f/d4/aa"},
++ {XtNtextColor159, XtCTextColor159, XtRPixel, sizeof(Pixel),
++ offset(textcolor[159]),XtRString, "rgb:7f/d4/d4"},
++ {XtNtextColor160, XtCTextColor160, XtRPixel, sizeof(Pixel),
++ offset(textcolor[160]),XtRString, "rgb:aa/00/00"},
++ {XtNtextColor161, XtCTextColor161, XtRPixel, sizeof(Pixel),
++ offset(textcolor[161]),XtRString, "rgb:aa/00/2a"},
++ {XtNtextColor162, XtCTextColor162, XtRPixel, sizeof(Pixel),
++ offset(textcolor[162]),XtRString, "rgb:aa/00/55"},
++ {XtNtextColor163, XtCTextColor163, XtRPixel, sizeof(Pixel),
++ offset(textcolor[163]),XtRString, "rgb:aa/00/7f"},
++ {XtNtextColor164, XtCTextColor164, XtRPixel, sizeof(Pixel),
++ offset(textcolor[164]),XtRString, "rgb:aa/00/aa"},
++ {XtNtextColor165, XtCTextColor165, XtRPixel, sizeof(Pixel),
++ offset(textcolor[165]),XtRString, "rgb:aa/00/d4"},
++ {XtNtextColor166, XtCTextColor166, XtRPixel, sizeof(Pixel),
++ offset(textcolor[166]),XtRString, "rgb:aa/2a/00"},
++ {XtNtextColor167, XtCTextColor167, XtRPixel, sizeof(Pixel),
++ offset(textcolor[167]),XtRString, "rgb:aa/2a/2a"},
++ {XtNtextColor168, XtCTextColor168, XtRPixel, sizeof(Pixel),
++ offset(textcolor[168]),XtRString, "rgb:aa/2a/55"},
++ {XtNtextColor169, XtCTextColor169, XtRPixel, sizeof(Pixel),
++ offset(textcolor[169]),XtRString, "rgb:aa/2a/7f"},
++ {XtNtextColor170, XtCTextColor170, XtRPixel, sizeof(Pixel),
++ offset(textcolor[170]),XtRString, "rgb:aa/2a/aa"},
++ {XtNtextColor171, XtCTextColor171, XtRPixel, sizeof(Pixel),
++ offset(textcolor[171]),XtRString, "rgb:aa/2a/d4"},
++ {XtNtextColor172, XtCTextColor172, XtRPixel, sizeof(Pixel),
++ offset(textcolor[172]),XtRString, "rgb:aa/55/00"},
++ {XtNtextColor173, XtCTextColor173, XtRPixel, sizeof(Pixel),
++ offset(textcolor[173]),XtRString, "rgb:aa/55/2a"},
++ {XtNtextColor174, XtCTextColor174, XtRPixel, sizeof(Pixel),
++ offset(textcolor[174]),XtRString, "rgb:aa/55/55"},
++ {XtNtextColor175, XtCTextColor175, XtRPixel, sizeof(Pixel),
++ offset(textcolor[175]),XtRString, "rgb:aa/55/7f"},
++ {XtNtextColor176, XtCTextColor176, XtRPixel, sizeof(Pixel),
++ offset(textcolor[176]),XtRString, "rgb:aa/55/aa"},
++ {XtNtextColor177, XtCTextColor177, XtRPixel, sizeof(Pixel),
++ offset(textcolor[177]),XtRString, "rgb:aa/55/d4"},
++ {XtNtextColor178, XtCTextColor178, XtRPixel, sizeof(Pixel),
++ offset(textcolor[178]),XtRString, "rgb:aa/7f/00"},
++ {XtNtextColor179, XtCTextColor179, XtRPixel, sizeof(Pixel),
++ offset(textcolor[179]),XtRString, "rgb:aa/7f/2a"},
++ {XtNtextColor180, XtCTextColor180, XtRPixel, sizeof(Pixel),
++ offset(textcolor[180]),XtRString, "rgb:aa/7f/55"},
++ {XtNtextColor181, XtCTextColor181, XtRPixel, sizeof(Pixel),
++ offset(textcolor[181]),XtRString, "rgb:aa/7f/7f"},
++ {XtNtextColor182, XtCTextColor182, XtRPixel, sizeof(Pixel),
++ offset(textcolor[182]),XtRString, "rgb:aa/7f/aa"},
++ {XtNtextColor183, XtCTextColor183, XtRPixel, sizeof(Pixel),
++ offset(textcolor[183]),XtRString, "rgb:aa/7f/d4"},
++ {XtNtextColor184, XtCTextColor184, XtRPixel, sizeof(Pixel),
++ offset(textcolor[184]),XtRString, "rgb:aa/aa/00"},
++ {XtNtextColor185, XtCTextColor185, XtRPixel, sizeof(Pixel),
++ offset(textcolor[185]),XtRString, "rgb:aa/aa/2a"},
++ {XtNtextColor186, XtCTextColor186, XtRPixel, sizeof(Pixel),
++ offset(textcolor[186]),XtRString, "rgb:aa/aa/55"},
++ {XtNtextColor187, XtCTextColor187, XtRPixel, sizeof(Pixel),
++ offset(textcolor[187]),XtRString, "rgb:aa/aa/7f"},
++ {XtNtextColor188, XtCTextColor188, XtRPixel, sizeof(Pixel),
++ offset(textcolor[188]),XtRString, "rgb:aa/aa/aa"},
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list