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.92 by root, Tue Jan 31 19:55:05 2006 UTC vs.
Revision 1.103 by sasha, Fri Jun 8 20:40:07 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xdefaults.C 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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>
… …
26#include "../config.h" 26#include "../config.h"
27#include "rxvt.h" 27#include "rxvt.h"
28#include "version.h" 28#include "version.h"
29 29
30#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
31#include "keyboard.h" 31# include "keyboard.h"
32#endif 32#endif
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 1
36#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 2
37#define Optflag_mask 0x3fffffffUL
38 37
39/*{{{ monolithic option/resource structure: */ 38/* monolithic option/resource structure: */
40/* 39/*
41 * `string' options MUST have a usage argument 40 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 41 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 42 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 43 */
45 44
46/* INFO () - descriptive information only */ 45/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 46#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 47 {0, 0, -1, NULL, (opt), (arg), (desc)}
49 48
50/* STRG () - command-line option, with/without resource */ 49/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 50#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 51 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 52
54/* RSTRG () - resource/long-option */ 53/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 54#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 55 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 56
58/* BOOL () - regular boolean `-/+' flag */ 57/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 58#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 60
62/* SWCH () - `-' flag */ 61/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 62#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 63 { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)}
65 64
66/* convenient macros */ 65/* convenient macros */
67#define optList_strlen(i) \ 66#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 68#define optList_isBool(i) \
… …
73#define optList_size \ 72#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 73 (sizeof (optList) / sizeof (optList[0]))
75 74
76static const struct 75static const struct
77 { 76 {
77 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 78 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 79 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 80 const char *kw; /* keyword */
81 const char *opt; /* option */ 81 const char *opt; /* option */
82 const char *arg; /* argument */ 82 const char *arg; /* argument */
83 const char *desc; /* description */ 83 const char *desc; /* description */
84 } 84 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), 88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 91 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 92 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif 105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 110#if TRANSPARENT
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 112 SWCH ("tr", Opt_transparent, 0, NULL),
113# if TINTING 113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 115# endif
116#endif 116#endif
117#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif 120#endif
121#if TINTING 121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 123#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 125#ifndef NO_BELL
126# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
128# endif
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 129 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 130# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 131 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 132# endif
130#endif 133#endif
131#ifdef META8_OPTION 134#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 135 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 136#endif
134#ifdef MOUSE_WHEEL 137#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 139#endif
137#if ENABLE_FRILLS 140#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
139 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 142 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 143 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 144#endif
142#if CURSOR_BLINK 145#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 146 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 147#endif
145#ifdef POINTER_BLANK 148#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 149 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 150#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 151 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 152 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 153 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 154 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 199#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 200 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 201 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 202 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 203 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 204#endif
202#ifdef USE_XIM 205#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 207 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 208 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
216#if XFT 219#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif 221#endif
219#if ENABLE_FRILLS 222#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
221 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
222 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 226 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), 232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif 234#endif
232#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 237#endif
… …
246#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 256#endif
254#if ENABLE_PERL 257#if ENABLE_PERL
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 262#endif
263
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
267#endif
260#ifndef NO_RESOURCES 268#ifndef NO_RESOURCES
261 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
262#endif 270#endif
263 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
264 }; 272 };
… …
266#undef INFO 274#undef INFO
267#undef STRG 275#undef STRG
268#undef RSTRG 276#undef RSTRG
269#undef SWCH 277#undef SWCH
270#undef BOOL 278#undef BOOL
271/*}}} */
272 279
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
275#if ENABLE_PERL 282#if ENABLE_PERL
276 "perl," 283 "perl,"
… …
484 491
485/*{{{ get command-line options before getting resources */ 492/*{{{ get command-line options before getting resources */
486void 493void
487rxvt_term::get_options (int argc, const char *const *argv) 494rxvt_term::get_options (int argc, const char *const *argv)
488{ 495{
489 int i, bad_option = 0; 496 int i, bad_option = 0;
490 497
491 for (i = 1; i < argc; i++) 498 for (i = 1; i < argc; i++)
492 { 499 {
493 unsigned int entry, longopt = 0; 500 unsigned int entry, longopt = 0;
494 const char *flag, *opt; 501 const char *flag, *opt;
… …
531 538
532 if (entry < optList_size) 539 if (entry < optList_size)
533 { 540 {
534 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
535 flag = flag == resval_on ? resval_off : resval_on; 542 flag = flag == resval_on ? resval_off : resval_on;
543fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on );
536 544
537 if (optList_strlen (entry)) 545 if (optList_strlen (entry))
538 { 546 {
539 /* 547 /*
540 * special cases are handled in main.c:main () to allow 548 * special cases are handled in main.c:main () to allow
541 * X resources to set these values before we settle for 549 * X resources to set these values before we settle for
542 * default values 550 * default values
543 */ 551 */
544 552fprintf( stderr, "string\n");
545 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
554 {
555 if (flag == resval_on && !argv [i+1])
556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
557
546 rs[optList[entry].doff] = flag == resval_on && argv[i+1] 558 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
547 ? argv[++i] : resval_undef; 559 }
548 } 560 }
549 else 561 else
550 { /* boolean value */ 562 { /* boolean value */
551 set_option (optList[entry].flag & Optflag_mask, flag == resval_on); 563 set_option (optList[entry].index, flag == resval_on);
552 564
553 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
554 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag;
555 } 567 }
556 } 568 }
… …
771} 783}
772 784
773const char * 785const char *
774rxvt_term::x_resource (const char *name) 786rxvt_term::x_resource (const char *name)
775{ 787{
776 XrmDatabase database = XrmGetDatabase (xdisp); 788 XrmDatabase database = XrmGetDatabase (dpy);
777 789
778 const char *p = get_res (database, rs[Rs_name], name); 790 const char *p = get_res (database, rs[Rs_name], name);
779 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 791 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
780 792
781 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 793 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
824 || strcasecmp (p, "1") == 0; 836 || strcasecmp (p, "1") == 0;
825 837
826 if (optList_isReverse (entry)) 838 if (optList_isReverse (entry))
827 s = !s; 839 s = !s;
828 840
829 set_option (optList[entry].flag & Optflag_mask, s); 841 set_option (optList[entry].index, s);
830 } 842 }
831 } 843 }
832 } 844 }
833 845
834 /* 846 /*
835 * [R5 or later]: enumerate the resource database 847 * [R5 or later]: enumerate the resource database
836 */ 848 */
837# ifdef KEYSYM_RESOURCE 849# ifdef KEYSYM_RESOURCE
838 XrmDatabase database = XrmGetDatabase (xdisp); 850 XrmDatabase database = XrmGetDatabase (dpy);
839 XrmName name_prefix[3]; 851 XrmName name_prefix[3];
840 XrmClass class_prefix[3]; 852 XrmClass class_prefix[3];
841 853
842 name_prefix[0] = XrmStringToName (rs[Rs_name]); 854 name_prefix[0] = XrmStringToName (rs[Rs_name]);
843 name_prefix[1] = XrmStringToName ("keysym"); 855 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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