# ------------------------------------------------------------------------------
# 256colres.h | 964 +++++++++++++------------------------------------------
# 256colres.pl | 6
# 88colres.h | 290 ++++------------
# 88colres.pl | 6
# MANIFEST | 2
# XTerm.ad | 2
# button.c | 25 -
# charproc.c | 107 ++----
# ctlseqs.ms | 32 -
# data.c | 2
# data.h | 1
# input.c | 10
# main.c | 14
# menu.c | 52 ++
# menu.h | 22 +
# ptyx.h | 12
# util.c | 20 -
# version.h | 2
# xterm.h | 1
# xterm.log.html | 28 +
# xterm.man | 19 -
# 21 files changed, 553 insertions, 1064 deletions
# ------------------------------------------------------------------------------
Index: 256colres.h
--- xterm-125+/256colres.h Sun Jul 18 16:29:08 1999
+++ xterm-126/256colres.h Tue Feb 8 19:26:45 2000
@@ -1,724 +1,244 @@
/*
- * This header file was generated by 256colres.pl
+ * This header file was generated by ./256colres.pl
*/
-/* $XFree86: xc/programs/xterm/256colres.h,v 1.1 1999/07/18 03:27:04 dawes Exp $ */
-{"color16", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[16]),
- XtRString, DFT_COLOR("rgb:00/00/00")},
-{"color17", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[17]),
- XtRString, DFT_COLOR("rgb:00/00/2a")},
-{"color18", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[18]),
- XtRString, DFT_COLOR("rgb:00/00/55")},
-{"color19", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[19]),
- XtRString, DFT_COLOR("rgb:00/00/7f")},
-{"color20", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[20]),
- XtRString, DFT_COLOR("rgb:00/00/aa")},
-{"color21", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[21]),
- XtRString, DFT_COLOR("rgb:00/00/d4")},
-{"color22", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[22]),
- XtRString, DFT_COLOR("rgb:00/2a/00")},
-{"color23", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[23]),
- XtRString, DFT_COLOR("rgb:00/2a/2a")},
-{"color24", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[24]),
- XtRString, DFT_COLOR("rgb:00/2a/55")},
-{"color25", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[25]),
- XtRString, DFT_COLOR("rgb:00/2a/7f")},
-{"color26", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[26]),
- XtRString, DFT_COLOR("rgb:00/2a/aa")},
-{"color27", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[27]),
- XtRString, DFT_COLOR("rgb:00/2a/d4")},
-{"color28", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[28]),
- XtRString, DFT_COLOR("rgb:00/55/00")},
-{"color29", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[29]),
- XtRString, DFT_COLOR("rgb:00/55/2a")},
-{"color30", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[30]),
- XtRString, DFT_COLOR("rgb:00/55/55")},
-{"color31", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[31]),
- XtRString, DFT_COLOR("rgb:00/55/7f")},
-{"color32", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[32]),
- XtRString, DFT_COLOR("rgb:00/55/aa")},
-{"color33", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[33]),
- XtRString, DFT_COLOR("rgb:00/55/d4")},
-{"color34", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[34]),
- XtRString, DFT_COLOR("rgb:00/7f/00")},
-{"color35", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[35]),
- XtRString, DFT_COLOR("rgb:00/7f/2a")},
-{"color36", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[36]),
- XtRString, DFT_COLOR("rgb:00/7f/55")},
-{"color37", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[37]),
- XtRString, DFT_COLOR("rgb:00/7f/7f")},
-{"color38", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[38]),
- XtRString, DFT_COLOR("rgb:00/7f/aa")},
-{"color39", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[39]),
- XtRString, DFT_COLOR("rgb:00/7f/d4")},
-{"color40", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[40]),
- XtRString, DFT_COLOR("rgb:00/aa/00")},
-{"color41", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[41]),
- XtRString, DFT_COLOR("rgb:00/aa/2a")},
-{"color42", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[42]),
- XtRString, DFT_COLOR("rgb:00/aa/55")},
-{"color43", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[43]),
- XtRString, DFT_COLOR("rgb:00/aa/7f")},
-{"color44", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[44]),
- XtRString, DFT_COLOR("rgb:00/aa/aa")},
-{"color45", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[45]),
- XtRString, DFT_COLOR("rgb:00/aa/d4")},
-{"color46", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[46]),
- XtRString, DFT_COLOR("rgb:00/d4/00")},
-{"color47", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[47]),
- XtRString, DFT_COLOR("rgb:00/d4/2a")},
-{"color48", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[48]),
- XtRString, DFT_COLOR("rgb:00/d4/55")},
-{"color49", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[49]),
- XtRString, DFT_COLOR("rgb:00/d4/7f")},
-{"color50", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[50]),
- XtRString, DFT_COLOR("rgb:00/d4/aa")},
-{"color51", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[51]),
- XtRString, DFT_COLOR("rgb:00/d4/d4")},
-{"color52", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[52]),
- XtRString, DFT_COLOR("rgb:2a/00/00")},
-{"color53", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[53]),
- XtRString, DFT_COLOR("rgb:2a/00/2a")},
-{"color54", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[54]),
- XtRString, DFT_COLOR("rgb:2a/00/55")},
-{"color55", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[55]),
- XtRString, DFT_COLOR("rgb:2a/00/7f")},
-{"color56", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[56]),
- XtRString, DFT_COLOR("rgb:2a/00/aa")},
-{"color57", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[57]),
- XtRString, DFT_COLOR("rgb:2a/00/d4")},
-{"color58", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[58]),
- XtRString, DFT_COLOR("rgb:2a/2a/00")},
-{"color59", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[59]),
- XtRString, DFT_COLOR("rgb:2a/2a/2a")},
-{"color60", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[60]),
- XtRString, DFT_COLOR("rgb:2a/2a/55")},
-{"color61", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[61]),
- XtRString, DFT_COLOR("rgb:2a/2a/7f")},
-{"color62", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[62]),
- XtRString, DFT_COLOR("rgb:2a/2a/aa")},
-{"color63", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[63]),
- XtRString, DFT_COLOR("rgb:2a/2a/d4")},
-{"color64", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[64]),
- XtRString, DFT_COLOR("rgb:2a/55/00")},
-{"color65", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[65]),
- XtRString, DFT_COLOR("rgb:2a/55/2a")},
-{"color66", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[66]),
- XtRString, DFT_COLOR("rgb:2a/55/55")},
-{"color67", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[67]),
- XtRString, DFT_COLOR("rgb:2a/55/7f")},
-{"color68", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[68]),
- XtRString, DFT_COLOR("rgb:2a/55/aa")},
-{"color69", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[69]),
- XtRString, DFT_COLOR("rgb:2a/55/d4")},
-{"color70", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[70]),
- XtRString, DFT_COLOR("rgb:2a/7f/00")},
-{"color71", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[71]),
- XtRString, DFT_COLOR("rgb:2a/7f/2a")},
-{"color72", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[72]),
- XtRString, DFT_COLOR("rgb:2a/7f/55")},
-{"color73", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[73]),
- XtRString, DFT_COLOR("rgb:2a/7f/7f")},
-{"color74", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[74]),
- XtRString, DFT_COLOR("rgb:2a/7f/aa")},
-{"color75", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[75]),
- XtRString, DFT_COLOR("rgb:2a/7f/d4")},
-{"color76", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[76]),
- XtRString, DFT_COLOR("rgb:2a/aa/00")},
-{"color77", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[77]),
- XtRString, DFT_COLOR("rgb:2a/aa/2a")},
-{"color78", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[78]),
- XtRString, DFT_COLOR("rgb:2a/aa/55")},
-{"color79", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[79]),
- XtRString, DFT_COLOR("rgb:2a/aa/7f")},
-{"color80", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[80]),
- XtRString, DFT_COLOR("rgb:2a/aa/aa")},
-{"color81", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[81]),
- XtRString, DFT_COLOR("rgb:2a/aa/d4")},
-{"color82", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[82]),
- XtRString, DFT_COLOR("rgb:2a/d4/00")},
-{"color83", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[83]),
- XtRString, DFT_COLOR("rgb:2a/d4/2a")},
-{"color84", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[84]),
- XtRString, DFT_COLOR("rgb:2a/d4/55")},
-{"color85", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[85]),
- XtRString, DFT_COLOR("rgb:2a/d4/7f")},
-{"color86", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[86]),
- XtRString, DFT_COLOR("rgb:2a/d4/aa")},
-{"color87", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[87]),
- XtRString, DFT_COLOR("rgb:2a/d4/d4")},
-{"color88", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[88]),
- XtRString, DFT_COLOR("rgb:55/00/00")},
-{"color89", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[89]),
- XtRString, DFT_COLOR("rgb:55/00/2a")},
-{"color90", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[90]),
- XtRString, DFT_COLOR("rgb:55/00/55")},
-{"color91", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[91]),
- XtRString, DFT_COLOR("rgb:55/00/7f")},
-{"color92", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[92]),
- XtRString, DFT_COLOR("rgb:55/00/aa")},
-{"color93", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[93]),
- XtRString, DFT_COLOR("rgb:55/00/d4")},
-{"color94", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[94]),
- XtRString, DFT_COLOR("rgb:55/2a/00")},
-{"color95", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[95]),
- XtRString, DFT_COLOR("rgb:55/2a/2a")},
-{"color96", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[96]),
- XtRString, DFT_COLOR("rgb:55/2a/55")},
-{"color97", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[97]),
- XtRString, DFT_COLOR("rgb:55/2a/7f")},
-{"color98", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[98]),
- XtRString, DFT_COLOR("rgb:55/2a/aa")},
-{"color99", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[99]),
- XtRString, DFT_COLOR("rgb:55/2a/d4")},
-{"color100", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[100]),
- XtRString, DFT_COLOR("rgb:55/55/00")},
-{"color101", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[101]),
- XtRString, DFT_COLOR("rgb:55/55/2a")},
-{"color102", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[102]),
- XtRString, DFT_COLOR("rgb:55/55/55")},
-{"color103", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[103]),
- XtRString, DFT_COLOR("rgb:55/55/7f")},
-{"color104", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[104]),
- XtRString, DFT_COLOR("rgb:55/55/aa")},
-{"color105", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[105]),
- XtRString, DFT_COLOR("rgb:55/55/d4")},
-{"color106", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[106]),
- XtRString, DFT_COLOR("rgb:55/7f/00")},
-{"color107", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[107]),
- XtRString, DFT_COLOR("rgb:55/7f/2a")},
-{"color108", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[108]),
- XtRString, DFT_COLOR("rgb:55/7f/55")},
-{"color109", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[109]),
- XtRString, DFT_COLOR("rgb:55/7f/7f")},
-{"color110", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[110]),
- XtRString, DFT_COLOR("rgb:55/7f/aa")},
-{"color111", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[111]),
- XtRString, DFT_COLOR("rgb:55/7f/d4")},
-{"color112", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[112]),
- XtRString, DFT_COLOR("rgb:55/aa/00")},
-{"color113", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[113]),
- XtRString, DFT_COLOR("rgb:55/aa/2a")},
-{"color114", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[114]),
- XtRString, DFT_COLOR("rgb:55/aa/55")},
-{"color115", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[115]),
- XtRString, DFT_COLOR("rgb:55/aa/7f")},
-{"color116", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[116]),
- XtRString, DFT_COLOR("rgb:55/aa/aa")},
-{"color117", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[117]),
- XtRString, DFT_COLOR("rgb:55/aa/d4")},
-{"color118", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[118]),
- XtRString, DFT_COLOR("rgb:55/d4/00")},
-{"color119", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[119]),
- XtRString, DFT_COLOR("rgb:55/d4/2a")},
-{"color120", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[120]),
- XtRString, DFT_COLOR("rgb:55/d4/55")},
-{"color121", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[121]),
- XtRString, DFT_COLOR("rgb:55/d4/7f")},
-{"color122", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[122]),
- XtRString, DFT_COLOR("rgb:55/d4/aa")},
-{"color123", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[123]),
- XtRString, DFT_COLOR("rgb:55/d4/d4")},
-{"color124", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[124]),
- XtRString, DFT_COLOR("rgb:7f/00/00")},
-{"color125", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[125]),
- XtRString, DFT_COLOR("rgb:7f/00/2a")},
-{"color126", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[126]),
- XtRString, DFT_COLOR("rgb:7f/00/55")},
-{"color127", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[127]),
- XtRString, DFT_COLOR("rgb:7f/00/7f")},
-{"color128", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[128]),
- XtRString, DFT_COLOR("rgb:7f/00/aa")},
-{"color129", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[129]),
- XtRString, DFT_COLOR("rgb:7f/00/d4")},
-{"color130", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[130]),
- XtRString, DFT_COLOR("rgb:7f/2a/00")},
-{"color131", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[131]),
- XtRString, DFT_COLOR("rgb:7f/2a/2a")},
-{"color132", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[132]),
- XtRString, DFT_COLOR("rgb:7f/2a/55")},
-{"color133", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[133]),
- XtRString, DFT_COLOR("rgb:7f/2a/7f")},
-{"color134", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[134]),
- XtRString, DFT_COLOR("rgb:7f/2a/aa")},
-{"color135", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[135]),
- XtRString, DFT_COLOR("rgb:7f/2a/d4")},
-{"color136", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[136]),
- XtRString, DFT_COLOR("rgb:7f/55/00")},
-{"color137", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[137]),
- XtRString, DFT_COLOR("rgb:7f/55/2a")},
-{"color138", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[138]),
- XtRString, DFT_COLOR("rgb:7f/55/55")},
-{"color139", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[139]),
- XtRString, DFT_COLOR("rgb:7f/55/7f")},
-{"color140", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[140]),
- XtRString, DFT_COLOR("rgb:7f/55/aa")},
-{"color141", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[141]),
- XtRString, DFT_COLOR("rgb:7f/55/d4")},
-{"color142", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[142]),
- XtRString, DFT_COLOR("rgb:7f/7f/00")},
-{"color143", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[143]),
- XtRString, DFT_COLOR("rgb:7f/7f/2a")},
-{"color144", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[144]),
- XtRString, DFT_COLOR("rgb:7f/7f/55")},
-{"color145", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[145]),
- XtRString, DFT_COLOR("rgb:7f/7f/7f")},
-{"color146", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[146]),
- XtRString, DFT_COLOR("rgb:7f/7f/aa")},
-{"color147", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[147]),
- XtRString, DFT_COLOR("rgb:7f/7f/d4")},
-{"color148", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[148]),
- XtRString, DFT_COLOR("rgb:7f/aa/00")},
-{"color149", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[149]),
- XtRString, DFT_COLOR("rgb:7f/aa/2a")},
-{"color150", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[150]),
- XtRString, DFT_COLOR("rgb:7f/aa/55")},
-{"color151", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[151]),
- XtRString, DFT_COLOR("rgb:7f/aa/7f")},
-{"color152", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[152]),
- XtRString, DFT_COLOR("rgb:7f/aa/aa")},
-{"color153", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[153]),
- XtRString, DFT_COLOR("rgb:7f/aa/d4")},
-{"color154", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[154]),
- XtRString, DFT_COLOR("rgb:7f/d4/00")},
-{"color155", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[155]),
- XtRString, DFT_COLOR("rgb:7f/d4/2a")},
-{"color156", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[156]),
- XtRString, DFT_COLOR("rgb:7f/d4/55")},
-{"color157", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[157]),
- XtRString, DFT_COLOR("rgb:7f/d4/7f")},
-{"color158", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[158]),
- XtRString, DFT_COLOR("rgb:7f/d4/aa")},
-{"color159", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[159]),
- XtRString, DFT_COLOR("rgb:7f/d4/d4")},
-{"color160", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[160]),
- XtRString, DFT_COLOR("rgb:aa/00/00")},
-{"color161", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[161]),
- XtRString, DFT_COLOR("rgb:aa/00/2a")},
-{"color162", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[162]),
- XtRString, DFT_COLOR("rgb:aa/00/55")},
-{"color163", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[163]),
- XtRString, DFT_COLOR("rgb:aa/00/7f")},
-{"color164", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[164]),
- XtRString, DFT_COLOR("rgb:aa/00/aa")},
-{"color165", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[165]),
- XtRString, DFT_COLOR("rgb:aa/00/d4")},
-{"color166", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[166]),
- XtRString, DFT_COLOR("rgb:aa/2a/00")},
-{"color167", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[167]),
- XtRString, DFT_COLOR("rgb:aa/2a/2a")},
-{"color168", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[168]),
- XtRString, DFT_COLOR("rgb:aa/2a/55")},
-{"color169", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[169]),
- XtRString, DFT_COLOR("rgb:aa/2a/7f")},
-{"color170", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[170]),
- XtRString, DFT_COLOR("rgb:aa/2a/aa")},
-{"color171", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[171]),
- XtRString, DFT_COLOR("rgb:aa/2a/d4")},
-{"color172", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[172]),
- XtRString, DFT_COLOR("rgb:aa/55/00")},
-{"color173", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[173]),
- XtRString, DFT_COLOR("rgb:aa/55/2a")},
-{"color174", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[174]),
- XtRString, DFT_COLOR("rgb:aa/55/55")},
-{"color175", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[175]),
- XtRString, DFT_COLOR("rgb:aa/55/7f")},
-{"color176", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[176]),
- XtRString, DFT_COLOR("rgb:aa/55/aa")},
-{"color177", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[177]),
- XtRString, DFT_COLOR("rgb:aa/55/d4")},
-{"color178", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[178]),
- XtRString, DFT_COLOR("rgb:aa/7f/00")},
-{"color179", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[179]),
- XtRString, DFT_COLOR("rgb:aa/7f/2a")},
-{"color180", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[180]),
- XtRString, DFT_COLOR("rgb:aa/7f/55")},
-{"color181", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[181]),
- XtRString, DFT_COLOR("rgb:aa/7f/7f")},
-{"color182", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[182]),
- XtRString, DFT_COLOR("rgb:aa/7f/aa")},
-{"color183", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[183]),
- XtRString, DFT_COLOR("rgb:aa/7f/d4")},
-{"color184", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[184]),
- XtRString, DFT_COLOR("rgb:aa/aa/00")},
-{"color185", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[185]),
- XtRString, DFT_COLOR("rgb:aa/aa/2a")},
-{"color186", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[186]),
- XtRString, DFT_COLOR("rgb:aa/aa/55")},
-{"color187", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[187]),
- XtRString, DFT_COLOR("rgb:aa/aa/7f")},
-{"color188", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[188]),
- XtRString, DFT_COLOR("rgb:aa/aa/aa")},
-{"color189", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[189]),
- XtRString, DFT_COLOR("rgb:aa/aa/d4")},
-{"color190", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[190]),
- XtRString, DFT_COLOR("rgb:aa/d4/00")},
-{"color191", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[191]),
- XtRString, DFT_COLOR("rgb:aa/d4/2a")},
-{"color192", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[192]),
- XtRString, DFT_COLOR("rgb:aa/d4/55")},
-{"color193", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[193]),
- XtRString, DFT_COLOR("rgb:aa/d4/7f")},
-{"color194", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[194]),
- XtRString, DFT_COLOR("rgb:aa/d4/aa")},
-{"color195", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[195]),
- XtRString, DFT_COLOR("rgb:aa/d4/d4")},
-{"color196", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[196]),
- XtRString, DFT_COLOR("rgb:d4/00/00")},
-{"color197", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[197]),
- XtRString, DFT_COLOR("rgb:d4/00/2a")},
-{"color198", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[198]),
- XtRString, DFT_COLOR("rgb:d4/00/55")},
-{"color199", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[199]),
- XtRString, DFT_COLOR("rgb:d4/00/7f")},
-{"color200", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[200]),
- XtRString, DFT_COLOR("rgb:d4/00/aa")},
-{"color201", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[201]),
- XtRString, DFT_COLOR("rgb:d4/00/d4")},
-{"color202", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[202]),
- XtRString, DFT_COLOR("rgb:d4/2a/00")},
-{"color203", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[203]),
- XtRString, DFT_COLOR("rgb:d4/2a/2a")},
-{"color204", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[204]),
- XtRString, DFT_COLOR("rgb:d4/2a/55")},
-{"color205", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[205]),
- XtRString, DFT_COLOR("rgb:d4/2a/7f")},
-{"color206", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[206]),
- XtRString, DFT_COLOR("rgb:d4/2a/aa")},
-{"color207", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[207]),
- XtRString, DFT_COLOR("rgb:d4/2a/d4")},
-{"color208", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[208]),
- XtRString, DFT_COLOR("rgb:d4/55/00")},
-{"color209", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[209]),
- XtRString, DFT_COLOR("rgb:d4/55/2a")},
-{"color210", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[210]),
- XtRString, DFT_COLOR("rgb:d4/55/55")},
-{"color211", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[211]),
- XtRString, DFT_COLOR("rgb:d4/55/7f")},
-{"color212", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[212]),
- XtRString, DFT_COLOR("rgb:d4/55/aa")},
-{"color213", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[213]),
- XtRString, DFT_COLOR("rgb:d4/55/d4")},
-{"color214", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[214]),
- XtRString, DFT_COLOR("rgb:d4/7f/00")},
-{"color215", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[215]),
- XtRString, DFT_COLOR("rgb:d4/7f/2a")},
-{"color216", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[216]),
- XtRString, DFT_COLOR("rgb:d4/7f/55")},
-{"color217", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[217]),
- XtRString, DFT_COLOR("rgb:d4/7f/7f")},
-{"color218", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[218]),
- XtRString, DFT_COLOR("rgb:d4/7f/aa")},
-{"color219", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[219]),
- XtRString, DFT_COLOR("rgb:d4/7f/d4")},
-{"color220", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[220]),
- XtRString, DFT_COLOR("rgb:d4/aa/00")},
-{"color221", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[221]),
- XtRString, DFT_COLOR("rgb:d4/aa/2a")},
-{"color222", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[222]),
- XtRString, DFT_COLOR("rgb:d4/aa/55")},
-{"color223", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[223]),
- XtRString, DFT_COLOR("rgb:d4/aa/7f")},
-{"color224", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[224]),
- XtRString, DFT_COLOR("rgb:d4/aa/aa")},
-{"color225", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[225]),
- XtRString, DFT_COLOR("rgb:d4/aa/d4")},
-{"color226", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[226]),
- XtRString, DFT_COLOR("rgb:d4/d4/00")},
-{"color227", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[227]),
- XtRString, DFT_COLOR("rgb:d4/d4/2a")},
-{"color228", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[228]),
- XtRString, DFT_COLOR("rgb:d4/d4/55")},
-{"color229", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[229]),
- XtRString, DFT_COLOR("rgb:d4/d4/7f")},
-{"color230", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[230]),
- XtRString, DFT_COLOR("rgb:d4/d4/aa")},
-{"color231", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[231]),
- XtRString, DFT_COLOR("rgb:d4/d4/d4")},
-{"color232", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[232]),
- XtRString, DFT_COLOR("rgb:08/08/08")},
-{"color233", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[233]),
- XtRString, DFT_COLOR("rgb:12/12/12")},
-{"color234", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[234]),
- XtRString, DFT_COLOR("rgb:1c/1c/1c")},
-{"color235", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[235]),
- XtRString, DFT_COLOR("rgb:26/26/26")},
-{"color236", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[236]),
- XtRString, DFT_COLOR("rgb:30/30/30")},
-{"color237", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[237]),
- XtRString, DFT_COLOR("rgb:3a/3a/3a")},
-{"color238", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[238]),
- XtRString, DFT_COLOR("rgb:44/44/44")},
-{"color239", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[239]),
- XtRString, DFT_COLOR("rgb:4e/4e/4e")},
-{"color240", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[240]),
- XtRString, DFT_COLOR("rgb:58/58/58")},
-{"color241", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[241]),
- XtRString, DFT_COLOR("rgb:62/62/62")},
-{"color242", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[242]),
- XtRString, DFT_COLOR("rgb:6c/6c/6c")},
-{"color243", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[243]),
- XtRString, DFT_COLOR("rgb:76/76/76")},
-{"color244", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[244]),
- XtRString, DFT_COLOR("rgb:80/80/80")},
-{"color245", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[245]),
- XtRString, DFT_COLOR("rgb:8a/8a/8a")},
-{"color246", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[246]),
- XtRString, DFT_COLOR("rgb:94/94/94")},
-{"color247", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[247]),
- XtRString, DFT_COLOR("rgb:9e/9e/9e")},
-{"color248", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[248]),
- XtRString, DFT_COLOR("rgb:a8/a8/a8")},
-{"color249", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[249]),
- XtRString, DFT_COLOR("rgb:b2/b2/b2")},
-{"color250", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[250]),
- XtRString, DFT_COLOR("rgb:bc/bc/bc")},
-{"color251", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[251]),
- XtRString, DFT_COLOR("rgb:c6/c6/c6")},
-{"color252", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[252]),
- XtRString, DFT_COLOR("rgb:d0/d0/d0")},
-{"color253", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[253]),
- XtRString, DFT_COLOR("rgb:da/da/da")},
-{"color254", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[254]),
- XtRString, DFT_COLOR("rgb:e4/e4/e4")},
-{"color255", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[255]),
- XtRString, DFT_COLOR("rgb:ee/ee/ee")},
+/* $XFree86$ */
+COLOR_RES("color16", screen.Acolors[16], DFT_COLOR("rgb:00/00/00")),
+COLOR_RES("color17", screen.Acolors[17], DFT_COLOR("rgb:00/00/2a")),
+COLOR_RES("color18", screen.Acolors[18], DFT_COLOR("rgb:00/00/55")),
+COLOR_RES("color19", screen.Acolors[19], DFT_COLOR("rgb:00/00/7f")),
+COLOR_RES("color20", screen.Acolors[20], DFT_COLOR("rgb:00/00/aa")),
+COLOR_RES("color21", screen.Acolors[21], DFT_COLOR("rgb:00/00/d4")),
+COLOR_RES("color22", screen.Acolors[22], DFT_COLOR("rgb:00/2a/00")),
+COLOR_RES("color23", screen.Acolors[23], DFT_COLOR("rgb:00/2a/2a")),
+COLOR_RES("color24", screen.Acolors[24], DFT_COLOR("rgb:00/2a/55")),
+COLOR_RES("color25", screen.Acolors[25], DFT_COLOR("rgb:00/2a/7f")),
+COLOR_RES("color26", screen.Acolors[26], DFT_COLOR("rgb:00/2a/aa")),
+COLOR_RES("color27", screen.Acolors[27], DFT_COLOR("rgb:00/2a/d4")),
+COLOR_RES("color28", screen.Acolors[28], DFT_COLOR("rgb:00/55/00")),
+COLOR_RES("color29", screen.Acolors[29], DFT_COLOR("rgb:00/55/2a")),
+COLOR_RES("color30", screen.Acolors[30], DFT_COLOR("rgb:00/55/55")),
+COLOR_RES("color31", screen.Acolors[31], DFT_COLOR("rgb:00/55/7f")),
+COLOR_RES("color32", screen.Acolors[32], DFT_COLOR("rgb:00/55/aa")),
+COLOR_RES("color33", screen.Acolors[33], DFT_COLOR("rgb:00/55/d4")),
+COLOR_RES("color34", screen.Acolors[34], DFT_COLOR("rgb:00/7f/00")),
+COLOR_RES("color35", screen.Acolors[35], DFT_COLOR("rgb:00/7f/2a")),
+COLOR_RES("color36", screen.Acolors[36], DFT_COLOR("rgb:00/7f/55")),
+COLOR_RES("color37", screen.Acolors[37], DFT_COLOR("rgb:00/7f/7f")),
+COLOR_RES("color38", screen.Acolors[38], DFT_COLOR("rgb:00/7f/aa")),
+COLOR_RES("color39", screen.Acolors[39], DFT_COLOR("rgb:00/7f/d4")),
+COLOR_RES("color40", screen.Acolors[40], DFT_COLOR("rgb:00/aa/00")),
+COLOR_RES("color41", screen.Acolors[41], DFT_COLOR("rgb:00/aa/2a")),
+COLOR_RES("color42", screen.Acolors[42], DFT_COLOR("rgb:00/aa/55")),
+COLOR_RES("color43", screen.Acolors[43], DFT_COLOR("rgb:00/aa/7f")),
+COLOR_RES("color44", screen.Acolors[44], DFT_COLOR("rgb:00/aa/aa")),
+COLOR_RES("color45", screen.Acolors[45], DFT_COLOR("rgb:00/aa/d4")),
+COLOR_RES("color46", screen.Acolors[46], DFT_COLOR("rgb:00/d4/00")),
+COLOR_RES("color47", screen.Acolors[47], DFT_COLOR("rgb:00/d4/2a")),
+COLOR_RES("color48", screen.Acolors[48], DFT_COLOR("rgb:00/d4/55")),
+COLOR_RES("color49", screen.Acolors[49], DFT_COLOR("rgb:00/d4/7f")),
+COLOR_RES("color50", screen.Acolors[50], DFT_COLOR("rgb:00/d4/aa")),
+COLOR_RES("color51", screen.Acolors[51], DFT_COLOR("rgb:00/d4/d4")),
+COLOR_RES("color52", screen.Acolors[52], DFT_COLOR("rgb:2a/00/00")),
+COLOR_RES("color53", screen.Acolors[53], DFT_COLOR("rgb:2a/00/2a")),
+COLOR_RES("color54", screen.Acolors[54], DFT_COLOR("rgb:2a/00/55")),
+COLOR_RES("color55", screen.Acolors[55], DFT_COLOR("rgb:2a/00/7f")),
+COLOR_RES("color56", screen.Acolors[56], DFT_COLOR("rgb:2a/00/aa")),
+COLOR_RES("color57", screen.Acolors[57], DFT_COLOR("rgb:2a/00/d4")),
+COLOR_RES("color58", screen.Acolors[58], DFT_COLOR("rgb:2a/2a/00")),
+COLOR_RES("color59", screen.Acolors[59], DFT_COLOR("rgb:2a/2a/2a")),
+COLOR_RES("color60", screen.Acolors[60], DFT_COLOR("rgb:2a/2a/55")),
+COLOR_RES("color61", screen.Acolors[61], DFT_COLOR("rgb:2a/2a/7f")),
+COLOR_RES("color62", screen.Acolors[62], DFT_COLOR("rgb:2a/2a/aa")),
+COLOR_RES("color63", screen.Acolors[63], DFT_COLOR("rgb:2a/2a/d4")),
+COLOR_RES("color64", screen.Acolors[64], DFT_COLOR("rgb:2a/55/00")),
+COLOR_RES("color65", screen.Acolors[65], DFT_COLOR("rgb:2a/55/2a")),
+COLOR_RES("color66", screen.Acolors[66], DFT_COLOR("rgb:2a/55/55")),
+COLOR_RES("color67", screen.Acolors[67], DFT_COLOR("rgb:2a/55/7f")),
+COLOR_RES("color68", screen.Acolors[68], DFT_COLOR("rgb:2a/55/aa")),
+COLOR_RES("color69", screen.Acolors[69], DFT_COLOR("rgb:2a/55/d4")),
+COLOR_RES("color70", screen.Acolors[70], DFT_COLOR("rgb:2a/7f/00")),
+COLOR_RES("color71", screen.Acolors[71], DFT_COLOR("rgb:2a/7f/2a")),
+COLOR_RES("color72", screen.Acolors[72], DFT_COLOR("rgb:2a/7f/55")),
+COLOR_RES("color73", screen.Acolors[73], DFT_COLOR("rgb:2a/7f/7f")),
+COLOR_RES("color74", screen.Acolors[74], DFT_COLOR("rgb:2a/7f/aa")),
+COLOR_RES("color75", screen.Acolors[75], DFT_COLOR("rgb:2a/7f/d4")),
+COLOR_RES("color76", screen.Acolors[76], DFT_COLOR("rgb:2a/aa/00")),
+COLOR_RES("color77", screen.Acolors[77], DFT_COLOR("rgb:2a/aa/2a")),
+COLOR_RES("color78", screen.Acolors[78], DFT_COLOR("rgb:2a/aa/55")),
+COLOR_RES("color79", screen.Acolors[79], DFT_COLOR("rgb:2a/aa/7f")),
+COLOR_RES("color80", screen.Acolors[80], DFT_COLOR("rgb:2a/aa/aa")),
+COLOR_RES("color81", screen.Acolors[81], DFT_COLOR("rgb:2a/aa/d4")),
+COLOR_RES("color82", screen.Acolors[82], DFT_COLOR("rgb:2a/d4/00")),
+COLOR_RES("color83", screen.Acolors[83], DFT_COLOR("rgb:2a/d4/2a")),
+COLOR_RES("color84", screen.Acolors[84], DFT_COLOR("rgb:2a/d4/55")),
+COLOR_RES("color85", screen.Acolors[85], DFT_COLOR("rgb:2a/d4/7f")),
+COLOR_RES("color86", screen.Acolors[86], DFT_COLOR("rgb:2a/d4/aa")),
+COLOR_RES("color87", screen.Acolors[87], DFT_COLOR("rgb:2a/d4/d4")),
+COLOR_RES("color88", screen.Acolors[88], DFT_COLOR("rgb:55/00/00")),
+COLOR_RES("color89", screen.Acolors[89], DFT_COLOR("rgb:55/00/2a")),
+COLOR_RES("color90", screen.Acolors[90], DFT_COLOR("rgb:55/00/55")),
+COLOR_RES("color91", screen.Acolors[91], DFT_COLOR("rgb:55/00/7f")),
+COLOR_RES("color92", screen.Acolors[92], DFT_COLOR("rgb:55/00/aa")),
+COLOR_RES("color93", screen.Acolors[93], DFT_COLOR("rgb:55/00/d4")),
+COLOR_RES("color94", screen.Acolors[94], DFT_COLOR("rgb:55/2a/00")),
+COLOR_RES("color95", screen.Acolors[95], DFT_COLOR("rgb:55/2a/2a")),
+COLOR_RES("color96", screen.Acolors[96], DFT_COLOR("rgb:55/2a/55")),
+COLOR_RES("color97", screen.Acolors[97], DFT_COLOR("rgb:55/2a/7f")),
+COLOR_RES("color98", screen.Acolors[98], DFT_COLOR("rgb:55/2a/aa")),
+COLOR_RES("color99", screen.Acolors[99], DFT_COLOR("rgb:55/2a/d4")),
+COLOR_RES("color100", screen.Acolors[100], DFT_COLOR("rgb:55/55/00")),
+COLOR_RES("color101", screen.Acolors[101], DFT_COLOR("rgb:55/55/2a")),
+COLOR_RES("color102", screen.Acolors[102], DFT_COLOR("rgb:55/55/55")),
+COLOR_RES("color103", screen.Acolors[103], DFT_COLOR("rgb:55/55/7f")),
+COLOR_RES("color104", screen.Acolors[104], DFT_COLOR("rgb:55/55/aa")),
+COLOR_RES("color105", screen.Acolors[105], DFT_COLOR("rgb:55/55/d4")),
+COLOR_RES("color106", screen.Acolors[106], DFT_COLOR("rgb:55/7f/00")),
+COLOR_RES("color107", screen.Acolors[107], DFT_COLOR("rgb:55/7f/2a")),
+COLOR_RES("color108", screen.Acolors[108], DFT_COLOR("rgb:55/7f/55")),
+COLOR_RES("color109", screen.Acolors[109], DFT_COLOR("rgb:55/7f/7f")),
+COLOR_RES("color110", screen.Acolors[110], DFT_COLOR("rgb:55/7f/aa")),
+COLOR_RES("color111", screen.Acolors[111], DFT_COLOR("rgb:55/7f/d4")),
+COLOR_RES("color112", screen.Acolors[112], DFT_COLOR("rgb:55/aa/00")),
+COLOR_RES("color113", screen.Acolors[113], DFT_COLOR("rgb:55/aa/2a")),
+COLOR_RES("color114", screen.Acolors[114], DFT_COLOR("rgb:55/aa/55")),
+COLOR_RES("color115", screen.Acolors[115], DFT_COLOR("rgb:55/aa/7f")),
+COLOR_RES("color116", screen.Acolors[116], DFT_COLOR("rgb:55/aa/aa")),
+COLOR_RES("color117", screen.Acolors[117], DFT_COLOR("rgb:55/aa/d4")),
+COLOR_RES("color118", screen.Acolors[118], DFT_COLOR("rgb:55/d4/00")),
+COLOR_RES("color119", screen.Acolors[119], DFT_COLOR("rgb:55/d4/2a")),
+COLOR_RES("color120", screen.Acolors[120], DFT_COLOR("rgb:55/d4/55")),
+COLOR_RES("color121", screen.Acolors[121], DFT_COLOR("rgb:55/d4/7f")),
+COLOR_RES("color122", screen.Acolors[122], DFT_COLOR("rgb:55/d4/aa")),
+COLOR_RES("color123", screen.Acolors[123], DFT_COLOR("rgb:55/d4/d4")),
+COLOR_RES("color124", screen.Acolors[124], DFT_COLOR("rgb:7f/00/00")),
+COLOR_RES("color125", screen.Acolors[125], DFT_COLOR("rgb:7f/00/2a")),
+COLOR_RES("color126", screen.Acolors[126], DFT_COLOR("rgb:7f/00/55")),
+COLOR_RES("color127", screen.Acolors[127], DFT_COLOR("rgb:7f/00/7f")),
+COLOR_RES("color128", screen.Acolors[128], DFT_COLOR("rgb:7f/00/aa")),
+COLOR_RES("color129", screen.Acolors[129], DFT_COLOR("rgb:7f/00/d4")),
+COLOR_RES("color130", screen.Acolors[130], DFT_COLOR("rgb:7f/2a/00")),
+COLOR_RES("color131", screen.Acolors[131], DFT_COLOR("rgb:7f/2a/2a")),
+COLOR_RES("color132", screen.Acolors[132], DFT_COLOR("rgb:7f/2a/55")),
+COLOR_RES("color133", screen.Acolors[133], DFT_COLOR("rgb:7f/2a/7f")),
+COLOR_RES("color134", screen.Acolors[134], DFT_COLOR("rgb:7f/2a/aa")),
+COLOR_RES("color135", screen.Acolors[135], DFT_COLOR("rgb:7f/2a/d4")),
+COLOR_RES("color136", screen.Acolors[136], DFT_COLOR("rgb:7f/55/00")),
+COLOR_RES("color137", screen.Acolors[137], DFT_COLOR("rgb:7f/55/2a")),
+COLOR_RES("color138", screen.Acolors[138], DFT_COLOR("rgb:7f/55/55")),
+COLOR_RES("color139", screen.Acolors[139], DFT_COLOR("rgb:7f/55/7f")),
+COLOR_RES("color140", screen.Acolors[140], DFT_COLOR("rgb:7f/55/aa")),
+COLOR_RES("color141", screen.Acolors[141], DFT_COLOR("rgb:7f/55/d4")),
+COLOR_RES("color142", screen.Acolors[142], DFT_COLOR("rgb:7f/7f/00")),
+COLOR_RES("color143", screen.Acolors[143], DFT_COLOR("rgb:7f/7f/2a")),
+COLOR_RES("color144", screen.Acolors[144], DFT_COLOR("rgb:7f/7f/55")),
+COLOR_RES("color145", screen.Acolors[145], DFT_COLOR("rgb:7f/7f/7f")),
+COLOR_RES("color146", screen.Acolors[146], DFT_COLOR("rgb:7f/7f/aa")),
+COLOR_RES("color147", screen.Acolors[147], DFT_COLOR("rgb:7f/7f/d4")),
+COLOR_RES("color148", screen.Acolors[148], DFT_COLOR("rgb:7f/aa/00")),
+COLOR_RES("color149", screen.Acolors[149], DFT_COLOR("rgb:7f/aa/2a")),
+COLOR_RES("color150", screen.Acolors[150], DFT_COLOR("rgb:7f/aa/55")),
+COLOR_RES("color151", screen.Acolors[151], DFT_COLOR("rgb:7f/aa/7f")),
+COLOR_RES("color152", screen.Acolors[152], DFT_COLOR("rgb:7f/aa/aa")),
+COLOR_RES("color153", screen.Acolors[153], DFT_COLOR("rgb:7f/aa/d4")),
+COLOR_RES("color154", screen.Acolors[154], DFT_COLOR("rgb:7f/d4/00")),
+COLOR_RES("color155", screen.Acolors[155], DFT_COLOR("rgb:7f/d4/2a")),
+COLOR_RES("color156", screen.Acolors[156], DFT_COLOR("rgb:7f/d4/55")),
+COLOR_RES("color157", screen.Acolors[157], DFT_COLOR("rgb:7f/d4/7f")),
+COLOR_RES("color158", screen.Acolors[158], DFT_COLOR("rgb:7f/d4/aa")),
+COLOR_RES("color159", screen.Acolors[159], DFT_COLOR("rgb:7f/d4/d4")),
+COLOR_RES("color160", screen.Acolors[160], DFT_COLOR("rgb:aa/00/00")),
+COLOR_RES("color161", screen.Acolors[161], DFT_COLOR("rgb:aa/00/2a")),
+COLOR_RES("color162", screen.Acolors[162], DFT_COLOR("rgb:aa/00/55")),
+COLOR_RES("color163", screen.Acolors[163], DFT_COLOR("rgb:aa/00/7f")),
+COLOR_RES("color164", screen.Acolors[164], DFT_COLOR("rgb:aa/00/aa")),
+COLOR_RES("color165", screen.Acolors[165], DFT_COLOR("rgb:aa/00/d4")),
+COLOR_RES("color166", screen.Acolors[166], DFT_COLOR("rgb:aa/2a/00")),
+COLOR_RES("color167", screen.Acolors[167], DFT_COLOR("rgb:aa/2a/2a")),
+COLOR_RES("color168", screen.Acolors[168], DFT_COLOR("rgb:aa/2a/55")),
+COLOR_RES("color169", screen.Acolors[169], DFT_COLOR("rgb:aa/2a/7f")),
+COLOR_RES("color170", screen.Acolors[170], DFT_COLOR("rgb:aa/2a/aa")),
+COLOR_RES("color171", screen.Acolors[171], DFT_COLOR("rgb:aa/2a/d4")),
+COLOR_RES("color172", screen.Acolors[172], DFT_COLOR("rgb:aa/55/00")),
+COLOR_RES("color173", screen.Acolors[173], DFT_COLOR("rgb:aa/55/2a")),
+COLOR_RES("color174", screen.Acolors[174], DFT_COLOR("rgb:aa/55/55")),
+COLOR_RES("color175", screen.Acolors[175], DFT_COLOR("rgb:aa/55/7f")),
+COLOR_RES("color176", screen.Acolors[176], DFT_COLOR("rgb:aa/55/aa")),
+COLOR_RES("color177", screen.Acolors[177], DFT_COLOR("rgb:aa/55/d4")),
+COLOR_RES("color178", screen.Acolors[178], DFT_COLOR("rgb:aa/7f/00")),
+COLOR_RES("color179", screen.Acolors[179], DFT_COLOR("rgb:aa/7f/2a")),
+COLOR_RES("color180", screen.Acolors[180], DFT_COLOR("rgb:aa/7f/55")),
+COLOR_RES("color181", screen.Acolors[181], DFT_COLOR("rgb:aa/7f/7f")),
+COLOR_RES("color182", screen.Acolors[182], DFT_COLOR("rgb:aa/7f/aa")),
+COLOR_RES("color183", screen.Acolors[183], DFT_COLOR("rgb:aa/7f/d4")),
+COLOR_RES("color184", screen.Acolors[184], DFT_COLOR("rgb:aa/aa/00")),
+COLOR_RES("color185", screen.Acolors[185], DFT_COLOR("rgb:aa/aa/2a")),
+COLOR_RES("color186", screen.Acolors[186], DFT_COLOR("rgb:aa/aa/55")),
+COLOR_RES("color187", screen.Acolors[187], DFT_COLOR("rgb:aa/aa/7f")),
+COLOR_RES("color188", screen.Acolors[188], DFT_COLOR("rgb:aa/aa/aa")),
+COLOR_RES("color189", screen.Acolors[189], DFT_COLOR("rgb:aa/aa/d4")),
+COLOR_RES("color190", screen.Acolors[190], DFT_COLOR("rgb:aa/d4/00")),
+COLOR_RES("color191", screen.Acolors[191], DFT_COLOR("rgb:aa/d4/2a")),
+COLOR_RES("color192", screen.Acolors[192], DFT_COLOR("rgb:aa/d4/55")),
+COLOR_RES("color193", screen.Acolors[193], DFT_COLOR("rgb:aa/d4/7f")),
+COLOR_RES("color194", screen.Acolors[194], DFT_COLOR("rgb:aa/d4/aa")),
+COLOR_RES("color195", screen.Acolors[195], DFT_COLOR("rgb:aa/d4/d4")),
+COLOR_RES("color196", screen.Acolors[196], DFT_COLOR("rgb:d4/00/00")),
+COLOR_RES("color197", screen.Acolors[197], DFT_COLOR("rgb:d4/00/2a")),
+COLOR_RES("color198", screen.Acolors[198], DFT_COLOR("rgb:d4/00/55")),
+COLOR_RES("color199", screen.Acolors[199], DFT_COLOR("rgb:d4/00/7f")),
+COLOR_RES("color200", screen.Acolors[200], DFT_COLOR("rgb:d4/00/aa")),
+COLOR_RES("color201", screen.Acolors[201], DFT_COLOR("rgb:d4/00/d4")),
+COLOR_RES("color202", screen.Acolors[202], DFT_COLOR("rgb:d4/2a/00")),
+COLOR_RES("color203", screen.Acolors[203], DFT_COLOR("rgb:d4/2a/2a")),
+COLOR_RES("color204", screen.Acolors[204], DFT_COLOR("rgb:d4/2a/55")),
+COLOR_RES("color205", screen.Acolors[205], DFT_COLOR("rgb:d4/2a/7f")),
+COLOR_RES("color206", screen.Acolors[206], DFT_COLOR("rgb:d4/2a/aa")),
+COLOR_RES("color207", screen.Acolors[207], DFT_COLOR("rgb:d4/2a/d4")),
+COLOR_RES("color208", screen.Acolors[208], DFT_COLOR("rgb:d4/55/00")),
+COLOR_RES("color209", screen.Acolors[209], DFT_COLOR("rgb:d4/55/2a")),
+COLOR_RES("color210", screen.Acolors[210], DFT_COLOR("rgb:d4/55/55")),
+COLOR_RES("color211", screen.Acolors[211], DFT_COLOR("rgb:d4/55/7f")),
+COLOR_RES("color212", screen.Acolors[212], DFT_COLOR("rgb:d4/55/aa")),
+COLOR_RES("color213", screen.Acolors[213], DFT_COLOR("rgb:d4/55/d4")),
+COLOR_RES("color214", screen.Acolors[214], DFT_COLOR("rgb:d4/7f/00")),
+COLOR_RES("color215", screen.Acolors[215], DFT_COLOR("rgb:d4/7f/2a")),
+COLOR_RES("color216", screen.Acolors[216], DFT_COLOR("rgb:d4/7f/55")),
+COLOR_RES("color217", screen.Acolors[217], DFT_COLOR("rgb:d4/7f/7f")),
+COLOR_RES("color218", screen.Acolors[218], DFT_COLOR("rgb:d4/7f/aa")),
+COLOR_RES("color219", screen.Acolors[219], DFT_COLOR("rgb:d4/7f/d4")),
+COLOR_RES("color220", screen.Acolors[220], DFT_COLOR("rgb:d4/aa/00")),
+COLOR_RES("color221", screen.Acolors[221], DFT_COLOR("rgb:d4/aa/2a")),
+COLOR_RES("color222", screen.Acolors[222], DFT_COLOR("rgb:d4/aa/55")),
+COLOR_RES("color223", screen.Acolors[223], DFT_COLOR("rgb:d4/aa/7f")),
+COLOR_RES("color224", screen.Acolors[224], DFT_COLOR("rgb:d4/aa/aa")),
+COLOR_RES("color225", screen.Acolors[225], DFT_COLOR("rgb:d4/aa/d4")),
+COLOR_RES("color226", screen.Acolors[226], DFT_COLOR("rgb:d4/d4/00")),
+COLOR_RES("color227", screen.Acolors[227], DFT_COLOR("rgb:d4/d4/2a")),
+COLOR_RES("color228", screen.Acolors[228], DFT_COLOR("rgb:d4/d4/55")),
+COLOR_RES("color229", screen.Acolors[229], DFT_COLOR("rgb:d4/d4/7f")),
+COLOR_RES("color230", screen.Acolors[230], DFT_COLOR("rgb:d4/d4/aa")),
+COLOR_RES("color231", screen.Acolors[231], DFT_COLOR("rgb:d4/d4/d4")),
+COLOR_RES("color232", screen.Acolors[232], DFT_COLOR("rgb:08/08/08")),
+COLOR_RES("color233", screen.Acolors[233], DFT_COLOR("rgb:12/12/12")),
+COLOR_RES("color234", screen.Acolors[234], DFT_COLOR("rgb:1c/1c/1c")),
+COLOR_RES("color235", screen.Acolors[235], DFT_COLOR("rgb:26/26/26")),
+COLOR_RES("color236", screen.Acolors[236], DFT_COLOR("rgb:30/30/30")),
+COLOR_RES("color237", screen.Acolors[237], DFT_COLOR("rgb:3a/3a/3a")),
+COLOR_RES("color238", screen.Acolors[238], DFT_COLOR("rgb:44/44/44")),
+COLOR_RES("color239", screen.Acolors[239], DFT_COLOR("rgb:4e/4e/4e")),
+COLOR_RES("color240", screen.Acolors[240], DFT_COLOR("rgb:58/58/58")),
+COLOR_RES("color241", screen.Acolors[241], DFT_COLOR("rgb:62/62/62")),
+COLOR_RES("color242", screen.Acolors[242], DFT_COLOR("rgb:6c/6c/6c")),
+COLOR_RES("color243", screen.Acolors[243], DFT_COLOR("rgb:76/76/76")),
+COLOR_RES("color244", screen.Acolors[244], DFT_COLOR("rgb:80/80/80")),
+COLOR_RES("color245", screen.Acolors[245], DFT_COLOR("rgb:8a/8a/8a")),
+COLOR_RES("color246", screen.Acolors[246], DFT_COLOR("rgb:94/94/94")),
+COLOR_RES("color247", screen.Acolors[247], DFT_COLOR("rgb:9e/9e/9e")),
+COLOR_RES("color248", screen.Acolors[248], DFT_COLOR("rgb:a8/a8/a8")),
+COLOR_RES("color249", screen.Acolors[249], DFT_COLOR("rgb:b2/b2/b2")),
+COLOR_RES("color250", screen.Acolors[250], DFT_COLOR("rgb:bc/bc/bc")),
+COLOR_RES("color251", screen.Acolors[251], DFT_COLOR("rgb:c6/c6/c6")),
+COLOR_RES("color252", screen.Acolors[252], DFT_COLOR("rgb:d0/d0/d0")),
+COLOR_RES("color253", screen.Acolors[253], DFT_COLOR("rgb:da/da/da")),
+COLOR_RES("color254", screen.Acolors[254], DFT_COLOR("rgb:e4/e4/e4")),
+COLOR_RES("color255", screen.Acolors[255], DFT_COLOR("rgb:ee/ee/ee")),
Index: 256colres.pl
--- xterm-125+/256colres.pl Sun Jul 18 16:29:08 1999
+++ xterm-126/256colres.pl Tue Feb 8 19:24:31 2000
@@ -16,9 +16,9 @@
/* \$XFree86\$ */
EOF
-$line1="{\"color%d\", XtCForeground, XtRPixel, sizeof(Pixel),\n";
-$line2="\tXtOffsetOf(XtermWidgetRec, screen.Acolors[%d]),\n";
-$line3="\tXtRString, DFT_COLOR(\"rgb:%2.2x/%2.2x/%2.2x\")},\n";
+$line1="COLOR_RES(\"color%d\",";
+$line2="\tscreen.Acolors[%d],";
+$line3="\tDFT_COLOR(\"rgb:%2.2x/%2.2x/%2.2x\")),\n";
# colors 16-231 are a 6x6x6 color cube
for ($red = 0; $red < 6; $red++) {
Index: 88colres.h
--- xterm-125+/88colres.h Mon Sep 27 16:12:18 1999
+++ xterm-126/88colres.h Tue Feb 8 19:23:37 2000
@@ -1,220 +1,76 @@
/*
* This header file was generated by ./88colres.pl
*/
-/* $XFree86: xc/programs/xterm/88colres.h,v 1.1 1999/09/25 14:38:23 dawes Exp $ */
-{"color16", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[16]),
- XtRString, DFT_COLOR("rgb:00/00/00")},
-{"color17", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[17]),
- XtRString, DFT_COLOR("rgb:00/00/8b")},
-{"color18", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[18]),
- XtRString, DFT_COLOR("rgb:00/00/cd")},
-{"color19", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[19]),
- XtRString, DFT_COLOR("rgb:00/00/ff")},
-{"color20", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[20]),
- XtRString, DFT_COLOR("rgb:00/8b/00")},
-{"color21", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[21]),
- XtRString, DFT_COLOR("rgb:00/8b/8b")},
-{"color22", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[22]),
- XtRString, DFT_COLOR("rgb:00/8b/cd")},
-{"color23", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[23]),
- XtRString, DFT_COLOR("rgb:00/8b/ff")},
-{"color24", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[24]),
- XtRString, DFT_COLOR("rgb:00/cd/00")},
-{"color25", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[25]),
- XtRString, DFT_COLOR("rgb:00/cd/8b")},
-{"color26", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[26]),
- XtRString, DFT_COLOR("rgb:00/cd/cd")},
-{"color27", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[27]),
- XtRString, DFT_COLOR("rgb:00/cd/ff")},
-{"color28", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[28]),
- XtRString, DFT_COLOR("rgb:00/ff/00")},
-{"color29", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[29]),
- XtRString, DFT_COLOR("rgb:00/ff/8b")},
-{"color30", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[30]),
- XtRString, DFT_COLOR("rgb:00/ff/cd")},
-{"color31", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[31]),
- XtRString, DFT_COLOR("rgb:00/ff/ff")},
-{"color32", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[32]),
- XtRString, DFT_COLOR("rgb:8b/00/00")},
-{"color33", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[33]),
- XtRString, DFT_COLOR("rgb:8b/00/8b")},
-{"color34", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[34]),
- XtRString, DFT_COLOR("rgb:8b/00/cd")},
-{"color35", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[35]),
- XtRString, DFT_COLOR("rgb:8b/00/ff")},
-{"color36", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[36]),
- XtRString, DFT_COLOR("rgb:8b/8b/00")},
-{"color37", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[37]),
- XtRString, DFT_COLOR("rgb:8b/8b/8b")},
-{"color38", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[38]),
- XtRString, DFT_COLOR("rgb:8b/8b/cd")},
-{"color39", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[39]),
- XtRString, DFT_COLOR("rgb:8b/8b/ff")},
-{"color40", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[40]),
- XtRString, DFT_COLOR("rgb:8b/cd/00")},
-{"color41", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[41]),
- XtRString, DFT_COLOR("rgb:8b/cd/8b")},
-{"color42", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[42]),
- XtRString, DFT_COLOR("rgb:8b/cd/cd")},
-{"color43", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[43]),
- XtRString, DFT_COLOR("rgb:8b/cd/ff")},
-{"color44", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[44]),
- XtRString, DFT_COLOR("rgb:8b/ff/00")},
-{"color45", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[45]),
- XtRString, DFT_COLOR("rgb:8b/ff/8b")},
-{"color46", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[46]),
- XtRString, DFT_COLOR("rgb:8b/ff/cd")},
-{"color47", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[47]),
- XtRString, DFT_COLOR("rgb:8b/ff/ff")},
-{"color48", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[48]),
- XtRString, DFT_COLOR("rgb:cd/00/00")},
-{"color49", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[49]),
- XtRString, DFT_COLOR("rgb:cd/00/8b")},
-{"color50", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[50]),
- XtRString, DFT_COLOR("rgb:cd/00/cd")},
-{"color51", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[51]),
- XtRString, DFT_COLOR("rgb:cd/00/ff")},
-{"color52", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[52]),
- XtRString, DFT_COLOR("rgb:cd/8b/00")},
-{"color53", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[53]),
- XtRString, DFT_COLOR("rgb:cd/8b/8b")},
-{"color54", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[54]),
- XtRString, DFT_COLOR("rgb:cd/8b/cd")},
-{"color55", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[55]),
- XtRString, DFT_COLOR("rgb:cd/8b/ff")},
-{"color56", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[56]),
- XtRString, DFT_COLOR("rgb:cd/cd/00")},
-{"color57", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[57]),
- XtRString, DFT_COLOR("rgb:cd/cd/8b")},
-{"color58", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[58]),
- XtRString, DFT_COLOR("rgb:cd/cd/cd")},
-{"color59", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[59]),
- XtRString, DFT_COLOR("rgb:cd/cd/ff")},
-{"color60", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[60]),
- XtRString, DFT_COLOR("rgb:cd/ff/00")},
-{"color61", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[61]),
- XtRString, DFT_COLOR("rgb:cd/ff/8b")},
-{"color62", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[62]),
- XtRString, DFT_COLOR("rgb:cd/ff/cd")},
-{"color63", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[63]),
- XtRString, DFT_COLOR("rgb:cd/ff/ff")},
-{"color64", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[64]),
- XtRString, DFT_COLOR("rgb:ff/00/00")},
-{"color65", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[65]),
- XtRString, DFT_COLOR("rgb:ff/00/8b")},
-{"color66", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[66]),
- XtRString, DFT_COLOR("rgb:ff/00/cd")},
-{"color67", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[67]),
- XtRString, DFT_COLOR("rgb:ff/00/ff")},
-{"color68", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[68]),
- XtRString, DFT_COLOR("rgb:ff/8b/00")},
-{"color69", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[69]),
- XtRString, DFT_COLOR("rgb:ff/8b/8b")},
-{"color70", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[70]),
- XtRString, DFT_COLOR("rgb:ff/8b/cd")},
-{"color71", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[71]),
- XtRString, DFT_COLOR("rgb:ff/8b/ff")},
-{"color72", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[72]),
- XtRString, DFT_COLOR("rgb:ff/cd/00")},
-{"color73", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[73]),
- XtRString, DFT_COLOR("rgb:ff/cd/8b")},
-{"color74", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[74]),
- XtRString, DFT_COLOR("rgb:ff/cd/cd")},
-{"color75", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[75]),
- XtRString, DFT_COLOR("rgb:ff/cd/ff")},
-{"color76", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[76]),
- XtRString, DFT_COLOR("rgb:ff/ff/00")},
-{"color77", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[77]),
- XtRString, DFT_COLOR("rgb:ff/ff/8b")},
-{"color78", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[78]),
- XtRString, DFT_COLOR("rgb:ff/ff/cd")},
-{"color79", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[79]),
- XtRString, DFT_COLOR("rgb:ff/ff/ff")},
-{"color80", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[80]),
- XtRString, DFT_COLOR("rgb:2e/2e/2e")},
-{"color81", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[81]),
- XtRString, DFT_COLOR("rgb:5c/5c/5c")},
-{"color82", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[82]),
- XtRString, DFT_COLOR("rgb:73/73/73")},
-{"color83", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[83]),
- XtRString, DFT_COLOR("rgb:8b/8b/8b")},
-{"color84", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[84]),
- XtRString, DFT_COLOR("rgb:a2/a2/a2")},
-{"color85", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[85]),
- XtRString, DFT_COLOR("rgb:b9/b9/b9")},
-{"color86", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[86]),
- XtRString, DFT_COLOR("rgb:d0/d0/d0")},
-{"color87", XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[87]),
- XtRString, DFT_COLOR("rgb:e7/e7/e7")},
+/* $XFree86$ */
+COLOR_RES("color16", screen.Acolors[16], DFT_COLOR("rgb:00/00/00")),
+COLOR_RES("color17", screen.Acolors[17], DFT_COLOR("rgb:00/00/8b")),
+COLOR_RES("color18", screen.Acolors[18], DFT_COLOR("rgb:00/00/cd")),
+COLOR_RES("color19", screen.Acolors[19], DFT_COLOR("rgb:00/00/ff")),
+COLOR_RES("color20", screen.Acolors[20], DFT_COLOR("rgb:00/8b/00")),
+COLOR_RES("color21", screen.Acolors[21], DFT_COLOR("rgb:00/8b/8b")),
+COLOR_RES("color22", screen.Acolors[22], DFT_COLOR("rgb:00/8b/cd")),
+COLOR_RES("color23", screen.Acolors[23], DFT_COLOR("rgb:00/8b/ff")),
+COLOR_RES("color24", screen.Acolors[24], DFT_COLOR("rgb:00/cd/00")),
+COLOR_RES("color25", screen.Acolors[25], DFT_COLOR("rgb:00/cd/8b")),
+COLOR_RES("color26", screen.Acolors[26], DFT_COLOR("rgb:00/cd/cd")),
+COLOR_RES("color27", screen.Acolors[27], DFT_COLOR("rgb:00/cd/ff")),
+COLOR_RES("color28", screen.Acolors[28], DFT_COLOR("rgb:00/ff/00")),
+COLOR_RES("color29", screen.Acolors[29], DFT_COLOR("rgb:00/ff/8b")),
+COLOR_RES("color30", screen.Acolors[30], DFT_COLOR("rgb:00/ff/cd")),
+COLOR_RES("color31", screen.Acolors[31], DFT_COLOR("rgb:00/ff/ff")),
+COLOR_RES("color32", screen.Acolors[32], DFT_COLOR("rgb:8b/00/00")),
+COLOR_RES("color33", screen.Acolors[33], DFT_COLOR("rgb:8b/00/8b")),
+COLOR_RES("color34", screen.Acolors[34], DFT_COLOR("rgb:8b/00/cd")),
+COLOR_RES("color35", screen.Acolors[35], DFT_COLOR("rgb:8b/00/ff")),
+COLOR_RES("color36", screen.Acolors[36], DFT_COLOR("rgb:8b/8b/00")),
+COLOR_RES("color37", screen.Acolors[37], DFT_COLOR("rgb:8b/8b/8b")),
+COLOR_RES("color38", screen.Acolors[38], DFT_COLOR("rgb:8b/8b/cd")),
+COLOR_RES("color39", screen.Acolors[39], DFT_COLOR("rgb:8b/8b/ff")),
+COLOR_RES("color40", screen.Acolors[40], DFT_COLOR("rgb:8b/cd/00")),
+COLOR_RES("color41", screen.Acolors[41], DFT_COLOR("rgb:8b/cd/8b")),
+COLOR_RES("color42", screen.Acolors[42], DFT_COLOR("rgb:8b/cd/cd")),
+COLOR_RES("color43", screen.Acolors[43], DFT_COLOR("rgb:8b/cd/ff")),
+COLOR_RES("color44", screen.Acolors[44], DFT_COLOR("rgb:8b/ff/00")),
+COLOR_RES("color45", screen.Acolors[45], DFT_COLOR("rgb:8b/ff/8b")),
+COLOR_RES("color46", screen.Acolors[46], DFT_COLOR("rgb:8b/ff/cd")),
+COLOR_RES("color47", screen.Acolors[47], DFT_COLOR("rgb:8b/ff/ff")),
+COLOR_RES("color48", screen.Acolors[48], DFT_COLOR("rgb:cd/00/00")),
+COLOR_RES("color49", screen.Acolors[49], DFT_COLOR("rgb:cd/00/8b")),
+COLOR_RES("color50", screen.Acolors[50], DFT_COLOR("rgb:cd/00/cd")),
+COLOR_RES("color51", screen.Acolors[51], DFT_COLOR("rgb:cd/00/ff")),
+COLOR_RES("color52", screen.Acolors[52], DFT_COLOR("rgb:cd/8b/00")),
+COLOR_RES("color53", screen.Acolors[53], DFT_COLOR("rgb:cd/8b/8b")),
+COLOR_RES("color54", screen.Acolors[54], DFT_COLOR("rgb:cd/8b/cd")),
+COLOR_RES("color55", screen.Acolors[55], DFT_COLOR("rgb:cd/8b/ff")),
+COLOR_RES("color56", screen.Acolors[56], DFT_COLOR("rgb:cd/cd/00")),
+COLOR_RES("color57", screen.Acolors[57], DFT_COLOR("rgb:cd/cd/8b")),
+COLOR_RES("color58", screen.Acolors[58], DFT_COLOR("rgb:cd/cd/cd")),
+COLOR_RES("color59", screen.Acolors[59], DFT_COLOR("rgb:cd/cd/ff")),
+COLOR_RES("color60", screen.Acolors[60], DFT_COLOR("rgb:cd/ff/00")),
+COLOR_RES("color61", screen.Acolors[61], DFT_COLOR("rgb:cd/ff/8b")),
+COLOR_RES("color62", screen.Acolors[62], DFT_COLOR("rgb:cd/ff/cd")),
+COLOR_RES("color63", screen.Acolors[63], DFT_COLOR("rgb:cd/ff/ff")),
+COLOR_RES("color64", screen.Acolors[64], DFT_COLOR("rgb:ff/00/00")),
+COLOR_RES("color65", screen.Acolors[65], DFT_COLOR("rgb:ff/00/8b")),
+COLOR_RES("color66", screen.Acolors[66], DFT_COLOR("rgb:ff/00/cd")),
+COLOR_RES("color67", screen.Acolors[67], DFT_COLOR("rgb:ff/00/ff")),
+COLOR_RES("color68", screen.Acolors[68], DFT_COLOR("rgb:ff/8b/00")),
+COLOR_RES("color69", screen.Acolors[69], DFT_COLOR("rgb:ff/8b/8b")),
+COLOR_RES("color70", screen.Acolors[70], DFT_COLOR("rgb:ff/8b/cd")),
+COLOR_RES("color71", screen.Acolors[71], DFT_COLOR("rgb:ff/8b/ff")),
+COLOR_RES("color72", screen.Acolors[72], DFT_COLOR("rgb:ff/cd/00")),
+COLOR_RES("color73", screen.Acolors[73], DFT_COLOR("rgb:ff/cd/8b")),
+COLOR_RES("color74", screen.Acolors[74], DFT_COLOR("rgb:ff/cd/cd")),
+COLOR_RES("color75", screen.Acolors[75], DFT_COLOR("rgb:ff/cd/ff")),
+COLOR_RES("color76", screen.Acolors[76], DFT_COLOR("rgb:ff/ff/00")),
+COLOR_RES("color77", screen.Acolors[77], DFT_COLOR("rgb:ff/ff/8b")),
+COLOR_RES("color78", screen.Acolors[78], DFT_COLOR("rgb:ff/ff/cd")),
+COLOR_RES("color79", screen.Acolors[79], DFT_COLOR("rgb:ff/ff/ff")),
+COLOR_RES("color80", screen.Acolors[80], DFT_COLOR("rgb:2e/2e/2e")),
+COLOR_RES("color81", screen.Acolors[81], DFT_COLOR("rgb:5c/5c/5c")),
+COLOR_RES("color82", screen.Acolors[82], DFT_COLOR("rgb:73/73/73")),
+COLOR_RES("color83", screen.Acolors[83], DFT_COLOR("rgb:8b/8b/8b")),
+COLOR_RES("color84", screen.Acolors[84], DFT_COLOR("rgb:a2/a2/a2")),
+COLOR_RES("color85", screen.Acolors[85], DFT_COLOR("rgb:b9/b9/b9")),
+COLOR_RES("color86", screen.Acolors[86], DFT_COLOR("rgb:d0/d0/d0")),
+COLOR_RES("color87", screen.Acolors[87], DFT_COLOR("rgb:e7/e7/e7")),
Index: 88colres.pl
--- xterm-125+/88colres.pl Mon Sep 27 16:12:18 1999
+++ xterm-126/88colres.pl Tue Feb 8 19:23:36 2000
@@ -17,9 +17,9 @@
/* \$XFree86\$ */
EOF
-$line1="{\"color%d\", XtCForeground, XtRPixel, sizeof(Pixel),\n";
-$line2="\tXtOffsetOf(XtermWidgetRec, screen.Acolors[%d]),\n";
-$line3="\tXtRString, DFT_COLOR(\"rgb:%2.2x/%2.2x/%2.2x\")},\n";
+$line1="COLOR_RES(\"color%d\",";
+$line2="\tscreen.Acolors[%d],";
+$line3="\tDFT_COLOR(\"rgb:%2.2x/%2.2x/%2.2x\")),\n";
@steps=(0,139,205,255);
# colors 16-79 are a 4x4x4 color cube
Index: MANIFEST
--- xterm-125+/MANIFEST Mon Jan 31 20:35:21 2000
+++ xterm-126/MANIFEST Tue Feb 8 22:58:26 2000
@@ -1,4 +1,4 @@
-MANIFEST for xterm-125, version xterm-125
+MANIFEST for xterm-126, version xterm-126
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
Index: XTerm.ad
--- xterm-125+/XTerm.ad Thu Dec 30 05:01:00 1999
+++ xterm-126/XTerm.ad Tue Feb 8 06:48:11 2000
@@ -25,9 +25,11 @@
*mainMenu*backarrow key*Label: Backarrow Key
*mainMenu*num-lock*Label: Alt/NumLock Modifiers
*mainMenu*meta-esc*Label: Meta Sends Escape
+*mainMenu*old function-keys*Label: Old Function-Keys
*mainMenu*sun function-keys*Label: Sun Function-Keys
*mainMenu*sun keyboard*Label: VT220 Keyboard
*mainMenu*hp function-keys*Label: HP Function-Keys
+*mainMenu*sco function-keys*Label: SCO Function-Keys
*mainMenu*suspend*Label: Send STOP Signal
*mainMenu*continue*Label: Send CONT Signal
*mainMenu*interrupt*Label: Send INT Signal
Index: button.c
--- xterm-125+/button.c Sun Jan 30 14:25:05 2000
+++ xterm-126/button.c Tue Feb 8 22:15:04 2000
@@ -91,11 +91,11 @@
#define KeyModifiers (event->xbutton.state & OurModifiers)
-#define KeyState(x) (((x) & ControlMask) + (((x) & Mod1Mask) ? 2 : 0))
+#define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0))
/* adds together the bits:
- (1 used to be for shift, is now used for buttons 4 and 5)
- meta key -> 2
- control key -> 4 */
+ shift key -> 1
+ meta key -> 2
+ control key -> 4 */
#define Coordinate(r,c) ((r) * (term->screen.max_col+1) + (c))
@@ -2308,9 +2308,18 @@
static int
BtnCode(XButtonEvent *event, int button)
{
- if (button < 0 || button > 5)
- button = 3;
- return ' ' + (KeyState(event->state) << 2) + button;
+ int result = 32 + (KeyState(event->state) << 2);
+
+ if (button < 0 || button > 5) {
+ result += 3;
+ } else {
+ if (button > 3)
+ result += (64 - 4);
+ if (event->type == MotionNotify)
+ result += 32;
+ result += button;
+ }
+ return result;
}
#define MOUSE_LIMIT (255 - 32)
@@ -2385,7 +2394,7 @@
if ((row == screen->mouse_row)
&& (col == screen->mouse_col))
return;
- line[count++] = BtnCode(event, screen->mouse_button) + 32;
+ line[count++] = BtnCode(event, screen->mouse_button);
break;
default:
return;
Index: charproc.c
--- xterm-125+/charproc.c Mon Jan 31 19:22:53 2000
+++ xterm-126/charproc.c Tue Feb 8 19:33:32 2000
@@ -303,6 +303,7 @@
{ "set-backarrow", HandleBackarrow },
{ "set-cursesemul", HandleCursesEmul },
{ "set-jumpscroll", HandleJumpscroll },
+ { "set-old-function-keys", HandleOldFunctionKeys },
{ "set-marginbell", HandleMarginBell },
{ "set-reverse-video", HandleReverseVideo },
{ "set-reversewrap", HandleReverseWrap },
@@ -344,6 +345,9 @@
#if OPT_NUM_LOCK
{ "set-num-lock", HandleNumLock },
#endif
+#if OPT_SCO_FUNC_KEYS
+ { "set-sco-function-keys", HandleScoFunctionKeys },
+#endif
#if OPT_SHIFT_KEYS
{ "larger-vt-font", HandleLargerFont },
{ "smaller-vt-font", HandleSmallerFont },
@@ -406,12 +410,8 @@
{XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
XtOffsetOf(XtermWidgetRec, core.background_pixel),
XtRString, "XtDefaultBackground"},
-{XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.foreground),
- XtRString, "XtDefaultForeground"},
-{XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.cursorcolor),
- XtRString, "XtDefaultForeground"},
+COLOR_RES(XtNforeground, screen.foreground, "XtDefaultForeground"),
+COLOR_RES(XtNcursorColor, screen.cursorcolor, "XtDefaultForeground"),
#if OPT_BLINK_CURS
{XtNcursorBlink, XtCCursorBlink, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.cursor_blink),
@@ -485,9 +485,7 @@
{XtNmarginBell, XtCMarginBell, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.marginbell),
XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNpointerColor, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.mousecolor),
- XtRString, "XtDefaultForeground"},
+COLOR_RES(XtNpointerColor, screen.mousecolor, "XtDefaultForeground"),
{XtNpointerColorBackground, XtCBackground, XtRPixel, sizeof(Pixel),
XtOffsetOf(XtermWidgetRec, screen.mousecolorback),
XtRString, "XtDefaultBackground"},
@@ -637,68 +635,30 @@
XtRImmediate, (XtPointer)TRUE},
#endif
#if OPT_ISO_COLORS
-{XtNcolor0, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_0]),
- XtRString, DFT_COLOR("black")},
-{XtNcolor1, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_1]),
- XtRString, DFT_COLOR("red3")},
-{XtNcolor2, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_2]),
- XtRString, DFT_COLOR("green3")},
-{XtNcolor3, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_3]),
- XtRString, DFT_COLOR("yellow3")},
-{XtNcolor4, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_4]),
- XtRString, DFT_COLOR("blue3")},
-{XtNcolor5, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_5]),
- XtRString, DFT_COLOR("magenta3")},
-{XtNcolor6, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_6]),
- XtRString, DFT_COLOR("cyan3")},
-{XtNcolor7, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_7]),
- XtRString, DFT_COLOR("gray90")},
-{XtNcolor8, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_8]),
- XtRString, DFT_COLOR("gray30")},
-{XtNcolor9, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_9]),
- XtRString, DFT_COLOR("red")},
-{XtNcolor10, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_10]),
- XtRString, DFT_COLOR("green")},
-{XtNcolor11, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_11]),
- XtRString, DFT_COLOR("yellow")},
-{XtNcolor12, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_12]),
- XtRString, DFT_COLOR("blue")},
-{XtNcolor13, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_13]),
- XtRString, DFT_COLOR("magenta")},
-{XtNcolor14, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_14]),
- XtRString, DFT_COLOR("cyan")},
-{XtNcolor15, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_15]),
- XtRString, DFT_COLOR("white")},
+COLOR_RES(XtNcolor0, screen.Acolors[COLOR_0], DFT_COLOR("black")),
+COLOR_RES(XtNcolor1, screen.Acolors[COLOR_1], DFT_COLOR("red3")),
+COLOR_RES(XtNcolor2, screen.Acolors[COLOR_2], DFT_COLOR("green3")),
+COLOR_RES(XtNcolor3, screen.Acolors[COLOR_3], DFT_COLOR("yellow3")),
+COLOR_RES(XtNcolor4, screen.Acolors[COLOR_4], DFT_COLOR("blue3")),
+COLOR_RES(XtNcolor5, screen.Acolors[COLOR_5], DFT_COLOR("magenta3")),
+COLOR_RES(XtNcolor6, screen.Acolors[COLOR_6], DFT_COLOR("cyan3")),
+COLOR_RES(XtNcolor7, screen.Acolors[COLOR_7], DFT_COLOR("gray90")),
+COLOR_RES(XtNcolor8, screen.Acolors[COLOR_8], DFT_COLOR("gray30")),
+COLOR_RES(XtNcolor9, screen.Acolors[COLOR_9], DFT_COLOR("red")),
+COLOR_RES(XtNcolor10, screen.Acolors[COLOR_10], DFT_COLOR("green")),
+COLOR_RES(XtNcolor11, screen.Acolors[COLOR_11], DFT_COLOR("yellow")),
+COLOR_RES(XtNcolor12, screen.Acolors[COLOR_12], DFT_COLOR("blue")),
+COLOR_RES(XtNcolor13, screen.Acolors[COLOR_13], DFT_COLOR("magenta")),
+COLOR_RES(XtNcolor14, screen.Acolors[COLOR_14], DFT_COLOR("cyan")),
+COLOR_RES(XtNcolor15, screen.Acolors[COLOR_15], DFT_COLOR("white")),
#if OPT_256_COLORS
# include <256colres.h>
#elif OPT_88_COLORS
# include <88colres.h>
#endif
-{XtNcolorBD, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_BD]),
- XtRString, DFT_COLOR("XtDefaultForeground")},
-{XtNcolorBL, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_BL]),
- XtRString, DFT_COLOR("XtDefaultForeground")},
-{XtNcolorUL, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.Acolors[COLOR_UL]),
- XtRString, DFT_COLOR("XtDefaultForeground")},
+COLOR_RES(XtNcolorBD, screen.Acolors[COLOR_BD], DFT_COLOR("XtDefaultForeground")),
+COLOR_RES(XtNcolorBL, screen.Acolors[COLOR_BL], DFT_COLOR("XtDefaultForeground")),
+COLOR_RES(XtNcolorUL, screen.Acolors[COLOR_UL], DFT_COLOR("XtDefaultForeground")),
{XtNcolorMode, XtCColorMode, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.colorMode),
XtRBoolean, (XtPointer) &defaultCOLORMODE},
@@ -722,9 +682,7 @@
XtOffsetOf(XtermWidgetRec, misc.dynamicColors),
XtRBoolean, (XtPointer) &defaultTRUE},
#if OPT_HIGHLIGHT_COLOR
-{XtNhighlightColor, XtCForeground, XtRPixel, sizeof(Pixel),
- XtOffsetOf(XtermWidgetRec, screen.highlightcolor),
- XtRString, "XtDefaultForeground"},
+COLOR_RES(XtNhighlightColor, screen.highlightcolor, "XtDefaultForeground"),
#endif /* OPT_HIGHLIGHT_COLOR */
{XtNboldMode, XtCBoldMode, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.bold_mode),
@@ -760,7 +718,7 @@
#if OPT_WIDE_CHARS
{XtNutf8, XtCUtf8, XtRInt, sizeof(int),
XtOffsetOf(XtermWidgetRec, screen.utf8_mode),
- XtRString, "0"},
+ XtRString, defaultUTF8},
{XtNwideChars, XtCWideChars, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.wide_chars),
XtRBoolean, (XtPointer) &defaultFALSE},
@@ -3327,6 +3285,14 @@
set_keyboard_type(keyboardIsHP, func == bitset);
break;
#endif
+#if OPT_SCO_FUNC_KEYS
+ case 1053:
+ set_keyboard_type(keyboardIsHP, func == bitset);
+ break;
+#endif
+ case 1060:
+ set_keyboard_type(keyboardIsLegacy, func == bitset);
+ break;
#if OPT_SUNPC_KBD
case 1061:
set_keyboard_type(keyboardIsVT220, func == bitset);
@@ -4216,6 +4182,7 @@
wnew->screen.border = request->screen.border;
wnew->screen.jumpscroll = request->screen.jumpscroll;
wnew->screen.old_fkeys = request->screen.old_fkeys;
+ init_keyboard_type(keyboardIsLegacy, wnew->screen.old_fkeys);
#ifdef ALLOWLOGGING
wnew->screen.logfile = request->screen.logfile;
#endif
Index: ctlseqs.ms
--- xterm-125+/ctlseqs.ms Mon Jan 31 10:52:38 2000
+++ xterm-126/ctlseqs.ms Tue Feb 8 20:58:29 2000
@@ -4,7 +4,7 @@
.\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.32 1999/12/30 03:46:12 robin Exp $
.\"
.\"
-.\" Copyright 1999 by Thomas E. Dickey <dickey@clark.net>
+.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey <dickey@clark.net>
.\"
.\" All Rights Reserved
.\"
@@ -749,6 +749,7 @@
disabled by the \fBtiteInhibit\fP resource)
\*(Ps = \*1\*0\*5\*1 \(-> Set Sun function-key mode.
\*(Ps = \*1\*0\*5\*2 \(-> Set HP function-key mode.
+ \*(Ps = \*1\*0\*6\*0 \(-> Set legacy keyboard emulation (X11R6).
\*(Ps = \*1\*0\*6\*1 \(-> Set Sun/PC keyboard emulation of VT220 keyboard.
.
.IP \\*(Cs\\*(Pm\\*s\\*i
@@ -819,6 +820,7 @@
disabled by the \fBtiteInhibit\fP resource)
\*(Ps = \*1\*0\*5\*1 \(-> Reset Sun function-key mode.
\*(Ps = \*1\*0\*5\*2 \(-> Reset HP function-key mode.
+ \*(Ps = \*1\*0\*6\*0 \(-> Reset legacy keyboard emulation (X11R6).
\*(Ps = \*1\*0\*6\*1 \(-> Reset Sun/PC keyboard emulation of VT220 keyboard.
.
.IP \\*(Cs\\*(Pm\\*s\\*m
@@ -1406,22 +1408,21 @@
It is enabled by specifying parameter 1000 to DECSET.
On button press or release, \fIxterm\fP sends
\*(Cs\*M\*(Cb\*(Cx\*(Cy.
-The low three bits of \*(Cb encode button information:
-0=MB1 pressed, 1=MB2 pressed, 2=MB3 pressed, 3=release,
-4=MB4 pressed, 5=MB5 pressed.
-The next two bits are reserved for future use, i.e., sending
-state information on the Meta and Control modifiers which are in effect
-when the button is pressed.
-.\" The upper bits encode the modifiers which were down when the button was
-.\" pressed and are added together: 4=Shift, 8=Meta, 16=Control.
-.\" Note however that the shift and control bits are normally unavailable
-.\" because \fIxterm\fP uses the control modifier with mouse for popup menus,
-.\" and the shift modifier is used in the default translations for button events.
-.\" The \fIMeta\fP modifier recognized by \fIxterm\fP is the \fImod1\fP mask,
-.\" and is not necessarily the "Meta" key (see \fIxmodmap\fP).
+The low two bits of \*(Cb encode button information:
+0=MB1 pressed, 1=MB2 pressed, 2=MB3 pressed, 3=release.
+The next three bits encode the modifiers which were down when the button was
+pressed and are added together: 4=Shift, 8=Meta, 16=Control.
+Note however that the shift and control bits are normally unavailable
+because \fIxterm\fP uses the control modifier with mouse for popup menus,
+and the shift modifier is used in the default translations for button events.
+The \fIMeta\fP modifier recognized by \fIxterm\fP is the \fImod1\fP mask,
+and is not necessarily the "Meta" key (see \fIxmodmap\fP).
\*(Cx and \*(Cy are the x and y coordinates of the mouse event, encoded as
in X10 mode.
+Wheel mice may return buttons 4 and 5.
+Those buttons are represented by adding 64 to the event code.
+
Mouse hilite tracking notifies a program of a button press, receives a
range of lines from the program, highlights the region covered by
the mouse within that range until button release, and then sends the
@@ -1461,8 +1462,7 @@
On button press or release, \fIxterm\fP sends the same codes used by normal
tracking mode. On button-motion events, \fIxterm\fP adds 32 to the event code
(the third character, \*(Cb).
-The low three bits of the event code encode the button information;
-additional bits specify modifier keys as in normal mode.
+The other bits of the event code specify button and modifier keys as in normal mode.
For example, motion into cell x,y with button 1
down is reported as \*(Cs\*M\*@\*(Cx\*(Cy.
( \*@ = 32 + 0 (button 1) + 32 (motion indicator) ).
Index: data.c
--- xterm-125+/data.c Mon Jan 31 11:31:18 2000
+++ xterm-126/data.c Tue Feb 8 05:31:13 2000
@@ -94,6 +94,8 @@
EventMode eventMode = NORMAL;
#if OPT_WIDE_CHARS
+char defaultUTF8[2] = { '0', 0 };
+
const unsigned short dec2ucs[32] = {
0x25ae /* black vertical rectangle */,
0x25c6 /* black diamond */,
Index: data.h
--- xterm-125+/data.h Mon Jan 31 11:31:23 2000
+++ xterm-126/data.h Tue Feb 8 05:31:39 2000
@@ -120,6 +120,7 @@
#endif
#if OPT_WIDE_CHARS
+extern char defaultUTF8[];
extern const unsigned short dec2ucs[32];
#endif
Index: input.c
--- xterm-125+/input.c Mon Jan 31 11:32:37 2000
+++ xterm-126/input.c Tue Feb 8 19:54:43 2000
@@ -515,7 +515,6 @@
key = TRUE;
#if 0 /* OPT_SUNPC_KBD should suppress - but only for vt220 compatibility */
} else if (term->keyboard.type == keyboardIsVT220
- && screen->old_fkeys == False
&& screen->ansi_level <= 1
&& IsEditFunctionKey(keysym)) {
key = FALSE; /* ignore editing-keypad in vt100 mode */
@@ -540,8 +539,11 @@
|| IsMiscFunctionKey(keysym)
|| IsEditFunctionKey(keysym)
|| (keysym == XK_Delete
- && term->keyboard.type != keyboardIsSun
- && !screen->old_fkeys)) {
+ && ((modify_parm > 1)
+#if OPT_SUNPC_KBD
+ || term->keyboard.type == keyboardIsVT220)
+#endif
+ )) {
#if OPT_SUNPC_KBD
if (term->keyboard.type == keyboardIsVT220) {
if ((event->state & ControlMask)
@@ -564,7 +566,7 @@
* Interpret F1-F4 as PF1-PF4 for VT52, VT100
*/
else if (term->keyboard.type != keyboardIsSun
- && screen->old_fkeys == False
+ && term->keyboard.type != keyboardIsLegacy
&& (dec_code >= 11 && dec_code <= 14))
{
reply.a_type = SS3;
Index: main.c
--- xterm-125+/main.c Mon Jan 31 19:50:37 2000
+++ xterm-126/main.c Tue Feb 8 05:31:41 2000
@@ -1718,6 +1718,20 @@
break;
}
+#if OPT_WIDE_CHARS
+ /* Test whether UTF-8 mode should be active by default */
+ {
+ char *s;
+
+ if ((s = getenv("LC_ALL")) ||
+ (s = getenv("LC_CTYPE")) ||
+ (s = getenv("LANG"))) {
+ if (strstr(s, "UTF-8"))
+ defaultUTF8[0] = '2';
+ }
+ }
+#endif
+
SetupMenus(toplevel, &form_top, &menu_top);
term = (XtermWidget) XtVaCreateManagedWidget(
Index: menu.c
--- xterm-125+/menu.c Mon Jan 31 11:40:11 2000
+++ xterm-126/menu.c Tue Feb 8 06:44:07 2000
@@ -94,6 +94,7 @@
static void do_jumpscroll PROTO_XT_CALLBACK_ARGS;
static void do_kill PROTO_XT_CALLBACK_ARGS;
static void do_marginbell PROTO_XT_CALLBACK_ARGS;
+static void do_old_fkeys PROTO_XT_CALLBACK_ARGS;
static void do_print PROTO_XT_CALLBACK_ARGS;
static void do_quit PROTO_XT_CALLBACK_ARGS;
static void do_redraw PROTO_XT_CALLBACK_ARGS;
@@ -140,6 +141,10 @@
static void do_meta_esc PROTO_XT_CALLBACK_ARGS;
#endif
+#if OPT_SCO_FUNC_KEYS
+static void do_sco_fkeys PROTO_XT_CALLBACK_ARGS;
+#endif
+
#if OPT_SUNPC_KBD
static void do_sun_kbd PROTO_XT_CALLBACK_ARGS;
#endif
@@ -182,9 +187,13 @@
{ "num-lock", do_num_lock, NULL },
{ "meta-esc", do_meta_esc, NULL },
#endif
+ { "old function-keys",do_old_fkeys, NULL },
#if OPT_HP_FUNC_KEYS
{ "hp function-keys",do_hp_fkeys, NULL },
#endif
+#if OPT_SCO_FUNC_KEYS
+ { "sco function-keys",do_sco_fkeys, NULL },
+#endif
{ "sun function-keys",do_sun_fkeys, NULL },
#if OPT_SUNPC_KBD
{ "sun keyboard", do_sun_kbd, NULL },
@@ -467,14 +476,12 @@
update_decbkm();
update_num_lock();
update_meta_esc();
- update_sun_kbd();
+ update_keyboard_type();
if (screen->terminal_id < 200) {
set_sensitivity (mw,
mainMenuEntries[mainMenu_8bit_ctrl].widget,
FALSE);
}
- update_sun_fkeys();
- update_hp_fkeys();
#if !defined(SIGTSTP) || defined(AMOEBA)
set_sensitivity (mw,
mainMenuEntries[mainMenu_suspend].widget, FALSE);
@@ -737,6 +744,14 @@
}
#endif
+static void do_old_fkeys (
+ Widget gw GCC_UNUSED,
+ XtPointer closure GCC_UNUSED,
+ XtPointer data GCC_UNUSED)
+{
+ toggle_keyboard_type(keyboardIsLegacy);
+}
+
#if OPT_HP_FUNC_KEYS
static void do_hp_fkeys (
Widget gw GCC_UNUSED,
@@ -747,6 +762,16 @@
}
#endif
+#if OPT_SCO_FUNC_KEYS
+static void do_sco_fkeys (
+ Widget gw GCC_UNUSED,
+ XtPointer closure GCC_UNUSED,
+ XtPointer data GCC_UNUSED)
+{
+ toggle_keyboard_type(keyboardIsSCO);
+}
+#endif
+
static void do_sun_fkeys (
Widget gw GCC_UNUSED,
XtPointer closure GCC_UNUSED,
@@ -1499,6 +1524,15 @@
}
#endif
+void HandleOldFunctionKeys(
+ Widget w,
+ XEvent *event GCC_UNUSED,
+ String *params,
+ Cardinal *param_count)
+{
+ handle_toggle (do_old_fkeys, term->keyboard.type == keyboardIsLegacy,
+ params, *param_count, w, (XtPointer)0, (XtPointer)0);
+}
#if OPT_SUNPC_KBD
void HandleSunKeyboard(
Widget w,
@@ -1519,6 +1553,18 @@
Cardinal *param_count)
{
handle_toggle (do_hp_fkeys, term->keyboard.type == keyboardIsHP,
+ params, *param_count, w, (XtPointer)0, (XtPointer)0);
+}
+#endif
+
+#if OPT_SCO_FUNC_KEYS
+void HandleScoFunctionKeys(
+ Widget w,
+ XEvent *event GCC_UNUSED,
+ String *params,
+ Cardinal *param_count)
+{
+ handle_toggle (do_sco_fkeys, term->keyboard.type == keyboardIsSCO,
params, *param_count, w, (XtPointer)0, (XtPointer)0);
}
#endif
Index: menu.h
--- xterm-125+/menu.h Mon Jan 31 11:16:37 2000
+++ xterm-126/menu.h Tue Feb 8 06:40:38 2000
@@ -93,15 +93,17 @@
extern void HandleHpFunctionKeys PROTO_XT_ACTIONS_ARGS;
extern void HandleJumpscroll PROTO_XT_ACTIONS_ARGS;
extern void HandleLogging PROTO_XT_ACTIONS_ARGS;
+extern void HandleMarginBell PROTO_XT_ACTIONS_ARGS;
extern void HandleMetaEsc PROTO_XT_ACTIONS_ARGS;
extern void HandleNumLock PROTO_XT_ACTIONS_ARGS;
-extern void HandleMarginBell PROTO_XT_ACTIONS_ARGS;
extern void HandlePopupMenu PROTO_XT_ACTIONS_ARGS;
extern void HandlePrint PROTO_XT_ACTIONS_ARGS;
extern void HandleQuit PROTO_XT_ACTIONS_ARGS;
extern void HandleRedraw PROTO_XT_ACTIONS_ARGS;
extern void HandleReverseVideo PROTO_XT_ACTIONS_ARGS;
extern void HandleReverseWrap PROTO_XT_ACTIONS_ARGS;
+extern void HandleOldFunctionKeys PROTO_XT_ACTIONS_ARGS;
+extern void HandleScoFunctionKeys PROTO_XT_ACTIONS_ARGS;
extern void HandleScrollKey PROTO_XT_ACTIONS_ARGS;
extern void HandleScrollTtyOutput PROTO_XT_ACTIONS_ARGS;
extern void HandleScrollbar PROTO_XT_ACTIONS_ARGS;
@@ -144,9 +146,13 @@
mainMenu_num_lock,
mainMenu_meta_esc,
#endif
+ mainMenu_old_fkeys,
#if OPT_HP_FUNC_KEYS
mainMenu_hp_fkeys,
#endif
+#if OPT_SCO_FUNC_KEYS
+ mainMenu_sco_kbd,
+#endif
mainMenu_sun_fkeys,
#if OPT_SUNPC_KBD
mainMenu_sun_kbd,
@@ -317,6 +323,11 @@
mainMenuEntries[mainMenu_sun_fkeys].widget, \
term->keyboard.type == keyboardIsSun)
+#define update_old_fkeys() \
+ update_menu_item (term->screen.mainMenu, \
+ mainMenuEntries[mainMenu_old_fkeys].widget, \
+ term->keyboard.type == keyboardIsLegacy)
+
#if OPT_SUNPC_KBD
#define update_sun_kbd() \
update_menu_item (term->screen.mainMenu, \
@@ -331,6 +342,15 @@
term->keyboard.type == keyboardIsHP)
#else
#define update_hp_fkeys() /*nothing*/
+#endif
+
+#if OPT_SCO_FUNC_KEYS
+#define update_sco_fkeys() \
+ update_menu_item (term->screen.mainMenu, \
+ mainMenuEntries[mainMenu_sco_fkeys].widget, \
+ term->keyboard.type == keyboardIsSCO)
+#else
+#define update_sco_fkeys() /*nothing*/
#endif
#define update_scrollbar() \
Index: ptyx.h
--- xterm-125+/ptyx.h Mon Jan 31 11:00:33 2000
+++ xterm-126/ptyx.h Tue Feb 8 22:55:20 2000
@@ -318,6 +318,10 @@
((n)==TEK_FG?TEK_BG:\
((n)==TEXT_BG?TEK_FG:(n))))))))
+#define COLOR_RES(name,offset,value) \
+ {name, XtCForeground, XtRPixel, sizeof(Pixel), \
+ XtOffsetOf(XtermWidgetRec, offset), XtRString, value}
+
typedef struct {
unsigned which; /* must have NCOLORS bits */
Pixel colors[NCOLORS];
@@ -428,6 +432,10 @@
#define OPT_PRINT_COLORS 1 /* true if we print color information */
#endif
+#ifndef OPT_SCO_FUNC_KEYS
+#define OPT_SCO_FUNC_KEYS 0 /* true if xterm supports SCO-style function keys */
+#endif
+
#ifndef OPT_SHIFT_KEYS
#define OPT_SHIFT_KEYS 1 /* true if xterm interprets shifted special-keys */
#endif
@@ -1106,10 +1114,12 @@
#define MULTICLICKTIME 250 /* milliseconds */
typedef enum {
+ keyboardIsLegacy, /* bogus vt220 codes for F1-F4, etc. */
keyboardIsDefault,
keyboardIsHP,
+ keyboardIsSCO,
keyboardIsSun,
- keyboardIsVT220,
+ keyboardIsVT220
} xtermKeyboardType;
typedef struct
Index: util.c
--- xterm-125+/util.c Mon Jan 31 11:54:14 2000
+++ xterm-126/util.c Tue Feb 8 06:41:45 2000
@@ -1893,6 +1893,15 @@
return ch;
}
+void update_keyboard_type(void)
+{
+ update_old_fkeys();
+ update_hp_fkeys();
+ update_sco_fkeys();
+ update_sun_fkeys();
+ update_sun_kbd();
+}
+
void set_keyboard_type(xtermKeyboardType type, Bool set)
{
xtermKeyboardType save = term->keyboard.type;
@@ -1904,9 +1913,7 @@
}
if (save != term->keyboard.type) {
- update_hp_fkeys();
- update_sun_fkeys();
- update_sun_kbd();
+ update_keyboard_type();
}
}
@@ -1921,9 +1928,7 @@
}
if (save != term->keyboard.type) {
- update_hp_fkeys();
- update_sun_fkeys();
- update_sun_kbd();
+ update_keyboard_type();
}
}
@@ -1933,7 +1938,8 @@
if (set) {
if (wasSet) {
- fprintf(stderr, "Conflicting keyboard type option\n");
+ fprintf(stderr, "Conflicting keyboard type option (%d/%d)\n",
+ term->keyboard.type, type);
}
term->keyboard.type = type;
wasSet = True;
Index: version.h
--- xterm-125+/version.h Mon Jan 31 20:34:27 2000
+++ xterm-126/version.h Tue Feb 8 17:31:26 2000
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 125
+#define XTERM_PATCH 126
#define XFREE86_VERSION "XFree86 3.9.17c"
Index: xterm.h
--- xterm-125+/xterm.h Mon Jan 31 19:50:44 2000
+++ xterm-126/xterm.h Tue Feb 8 06:34:04 2000
@@ -684,6 +684,7 @@
extern void scrolling_copy_area (TScreen *screen, int firstline, int nlines, int amount);
extern void set_keyboard_type (xtermKeyboardType type, Bool set);
extern void toggle_keyboard_type (xtermKeyboardType type);
+extern void update_keyboard_type (void);
extern void xtermScroll (TScreen *screen, int amount);
#if OPT_ISO_COLORS
Index: xterm.log.html
--- xterm-125+/xterm.log.html Mon Jan 31 19:55:24 2000
+++ xterm-126/xterm.log.html Tue Feb 8 22:23:33 2000
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<!--
*****************************************************************************
- * Copyright 1997-2000 by Thomas E. Dickey (dickey@clark.net) *
+ * Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey (dickey@clark.net) *
* All Rights Reserved. *
* *
* Permission to use, copy, modify, and distribute this software and its *
@@ -29,7 +29,7 @@
</HEAD>
<BODY>
<HR>
-Copyright 1997-2000 by Thomas E. Dickey
+Copyright 1997,1998,1999,2000 by Thomas E. Dickey
<HR>
<H1>Contents</H1>
This file contains a list of the changes that I have made for XFree86 xterm,
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_126">Patch #126 - 2000/2/8 - XFree86 3.9.17c</A>
<LI><A HREF="#xterm_125">Patch #125 - 2000/1/31 - XFree86 3.9.17c</A>
<LI><A HREF="#xterm_124">Patch #124 - 2000/1/27 - XFree86 3.9.17b</A>
<LI><A HREF="#xterm_123">Patch #123 - 2000/1/22 - XFree86 3.9.17a</A>
@@ -168,6 +169,29 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_126">Patch #126 - 2000/2/8 - XFree86 3.9.17c</A></H1>
+<ul>
+ <li>patch by Markus Kuhn:
+ ensure that xterm will automatically activate the UTF-8 mode whenever
+ the name of the locale environment variable suggests that a UTF-8
+ locale is in use. This will help that by simply setting LC_CTYPE an
+ entire system can be switched over to UTF-8, without users having to
+ remember the UTF-8 command line options ("-u8", etc.) of the various
+ applications. Command line options and X resource entries can still
+ be used to override this default choice.
+
+ <li>add old function-keys control sequences and popup menu entry, for
+ compatibility with legacy X11R6 xterm.
+
+ <li>revert translation of editing keypad "Delete" key to legacy \177.
+
+ <li>simplify the color-resource data expressions with macro COLOR_RES,
+ for later use in restructuring color initialization.
+
+ <li>change encoding of wheel mouse (buttons 4 and 5) to avoid conflict
+ with legacy mouse modifiers (suggested by Bram Moolenaar).
+</ul>
<H1><A NAME="xterm_125">Patch #125 - 2000/1/31 - XFree86 3.9.17c</A></H1>
<ul>
Index: xterm.man
--- xterm-125+/xterm.man Mon Jan 31 12:03:54 2000
+++ xterm-126/xterm.man Tue Feb 8 17:38:29 2000
@@ -2,7 +2,7 @@
.\" $XFree86: xc/programs/xterm/xterm.man,v 3.55 2000/01/29 18:58:43 dawes Exp $
.\"
.\"
-.\" Copyright 1999-2000 by Thomas E. Dickey <dickey@clark.net>
+.\" Copyright 1996,1997,1998,1999,2000 by Thomas E. Dickey <dickey@clark.net>
.\"
.\" All Rights Reserved
.\"
@@ -1228,7 +1228,6 @@
If ``true'', xterm will use old-style control sequences for function keys F1 to F4,
for compatibility with X Consortium xterm. Otherwise, it uses the VT100-style
codes for PF1 to PF4.
-Also, if ``true'', the Delete key sends DEL (127).
The default is ``false.''
.TP 8
.B "pointerColor (\fPclass\fB Foreground)"
@@ -1462,12 +1461,18 @@
.B "8-bit-control (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-8-bit-control(toggle)\fP action.
.TP 8
-.B "backarrow key (\fPclass\fB SmeBSB)"
+.B "backarrow\ key (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-backarrow(toggle)\fP action.
.TP 8
.B "num-lock (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-num-lock(toggle)\fP action.
.TP 8
+.B "old\ function-keys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBold\ function-keys(toggle)\fP action.
+.TP 8
+.B "hp\ function-keys (\fPclass\fB SmeBSB)"
+This entry invokes the \fBhp\ function-keys(toggle)\fP action.
+.TP 8
.B "sun\ function-keys (\fPclass\fB SmeBSB)"
This entry invokes the \fBsun\ function-keys(toggle)\fP action.
.TP 8
@@ -2180,7 +2185,7 @@
.\" This action toggles the \fBfontLoadable\fP resource and is also invoked by
.\" the \fBfont-loadable\fP entry in \fIfontMenu\fP.
.TP 8
-.B "set-hp-functionkeys(\fIon/off/toggle\fP)"
+.B "set-hp-function-keys(\fIon/off/toggle\fP)"
This action toggles the \fBhpFunctionKeys\fP resource and is also invoked by
the \fBhp function-keys\fP entry in \fImainMenu\fP.
.TP 8
@@ -2191,6 +2196,10 @@
.B "set-logging()"
This action toggles the state of the logging option.
.TP 8
+.B "set-old-function-keys(\fIon/off/toggle\fP)"
+This action toggles the state of legacy function keys and is also invoked by
+the \fBold function-keys\fP entry in \fImainMenu\fP.
+.TP 8
.B "set-marginbell(\fIon/off/toggle\fP)"
This action toggles the \fBmarginBell\fP resource and is also invoked from
the \fBmarginbell\fP entry in \fIvtMenu\fP.
@@ -2218,7 +2227,7 @@
This action toggles the \fBscrollbar\fP resource and is also invoked by
the \fBscrollbar\fP entry in \fIvtMenu\fP.
.TP 8
-.B "set-sun-functionkeys(\fIon/off/toggle\fP)"
+.B "set-sun-function-keys(\fIon/off/toggle\fP)"
This action toggles the \fBsunFunctionKeys\fP resource and is also invoked by
the \fBsun function-keys\fP entry in \fImainMenu\fP.
.TP 8