ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.67 by root, Mon Jan 2 20:40:20 2006 UTC vs.
Revision 1.74 by root, Sun Jan 8 01:02:15 2006 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
166#ifndef NO_BRIGHTCOLOR
167 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 168 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 169 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
171 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 170 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 171 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
175#endif /* NO_BRIGHTCOLOR */
176#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
177 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
179 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
180 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
… …
227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 225 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
228#if ENABLE_XEMBED 226#if ENABLE_XEMBED
229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
230#endif 228#endif
231#if ENABLE_FRILLS 229#if ENABLE_FRILLS
230 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
233 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 239 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
240#endif 240#endif
241#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 243#endif
… …
259#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
262#endif 262#endif
263#if ENABLE_PERL 263#if ENABLE_PERL
264 STRG (Rs_perl_lib, "perl-lib", 0, "string", "colon-separated directories with extension scripts"), 264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 STRG (Rs_perl_eval, "perl-eval", 0, "string", "code to be evaluated after all extensions have been loaded"), 265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
266 STRG (Rs_perl_ext, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable"), 267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
267#endif 268#endif
268#if 0 && TODO 269#if 0 && TODO
269#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
270 INFO ("xrm", "string", "X resource"), 271 INFO ("xrm", "string", "X resource"),
271#endif 272#endif
… …
572 { /* boolean value */ 573 { /* boolean value */
573#ifdef DEBUG_RESOURCES 574#ifdef DEBUG_RESOURCES
574 fprintf (stderr, "boolean (%s,%s) = %s\n", 575 fprintf (stderr, "boolean (%s,%s) = %s\n",
575 optList[entry].opt, optList[entry].kw, flag); 576 optList[entry].opt, optList[entry].kw, flag);
576#endif 577#endif
577 if (flag == On)
578 SET_OPTION (optList[entry].flag & Optflag_mask); 578 set_option (optList[entry].flag & Optflag_mask, flag == On);
579 else
580 CLR_OPTION (optList[entry].flag & Optflag_mask);
581 579
582 if (optList[entry].doff != -1) 580 if (optList[entry].doff != -1)
583 rs[optList[entry].doff] = flag; 581 rs[optList[entry].doff] = flag;
584 } 582 }
585 } 583 }
… …
866 || strcmp (str, "1") == 0; 864 || strcmp (str, "1") == 0;
867 865
868 if (optList_isReverse (entry)) 866 if (optList_isReverse (entry))
869 s = !s; 867 s = !s;
870 868
871 if (s)
872 SET_OPTION (optList[entry].flag & Optflag_mask); 869 set_option (optList[entry].flag & Optflag_mask, s);
873 else
874 CLR_OPTION (optList[entry].flag & Optflag_mask);
875 } 870 }
876 } 871 }
877 872
878 break; 873 break;
879 } 874 }
… …
1038 || strcasecmp (p, "1") == 0; 1033 || strcasecmp (p, "1") == 0;
1039 1034
1040 if (optList_isReverse (entry)) 1035 if (optList_isReverse (entry))
1041 s = !s; 1036 s = !s;
1042 1037
1043 if (s)
1044 SET_OPTION (optList[entry].flag & Optflag_mask); 1038 set_option (optList[entry].flag & Optflag_mask, s);
1045 else
1046 CLR_OPTION (optList[entry].flag & Optflag_mask);
1047 } 1039 }
1048 } 1040 }
1049 } 1041 }
1050 1042
1051 /* 1043 /*

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines