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.89 by root, Sun Jan 29 22:27:04 2006 UTC vs.
Revision 1.106 by ayin, Sun Jun 10 14:27:58 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>
… …
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h"
27#include "rxvt.h" /* NECESSARY */ 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 37#define Optflag_Switch 4
38 38
39/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
40/* 40/*
41 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
43 * if there's no desc (ription), it won't appear in rxvt_usage () 43 * if there's no desc (ription), it won't appear in rxvt_usage ()
44 */ 44 */
45 45
46/* INFO () - descriptive information only */ 46/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 47#define INFO(opt, arg, desc) \
48 {0, -1, NULL, (opt), (arg), (desc)} 48 {0, 0, -1, NULL, (opt), (arg), (desc)}
49 49
50/* STRG () - command-line option, with/without resource */ 50/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 51#define STRG(rsp, kw, opt, arg, desc) \
52 {0, (rsp), (kw), (opt), (arg), (desc)} 52 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 53
54/* RSTRG () - resource/long-option */ 54/* RSTRG () - resource/long-option */
55#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 56 {0, 0, (rsp), (kw), NULL, (arg), NULL}
57 57
58/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
60 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 61
62/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 65
66/* convenient macros */ 66/* convenient macros */
67#define optList_strlen(i) \ 67#define optList_strlen(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
69#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
73#define optList_size \ 73#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 74 (sizeof (optList) / sizeof (optList[0]))
75 75
76static const struct 76static const struct
77 { 77 {
78 const uint8_t index; /* Option index */
78 const unsigned long flag; /* Option flag */ 79 const uint8_t flag; /* Option flag */
79 const int doff; /* data offset */ 80 const int16_t doff; /* resource value index or -1 */
80 const char *kw; /* keyword */ 81 const char *kw; /* keyword */
81 const char *opt; /* option */ 82 const char *opt; /* option */
82 const char *arg; /* argument */ 83 const char *arg; /* argument */
83 const char *desc; /* description */ 84 const char *desc; /* description */
84 } 85 }
… …
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 87 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 88 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"), 89 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, "intercept console messages"), 92 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, "start iconic"), 93 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 98 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS 99#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 102 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"), 103 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 104 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 105 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif 106#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 108 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"), 109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 111#if TRANSPARENT
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, NULL), 113 SWCH ("tr", Opt_transparent, 0, NULL),
113# if TINTING 114# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 116# endif
116#endif 117#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 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"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif 121#endif
121#if TINTING 122#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 123 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 124#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 125 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 126#ifndef NO_BELL
127# if ENABLE_FRILLS
128 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
129# endif
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 130 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 131# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 132 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 133# endif
130#endif 134#endif
131#ifdef META8_OPTION 135#ifdef META8_OPTION
132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 136 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
133#endif 137#endif
134#ifdef MOUSE_WHEEL 138#ifdef MOUSE_WHEEL
135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 139 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
136#endif 140#endif
137#if ENABLE_FRILLS 141#if ENABLE_FRILLS
138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 142 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"), 143 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 144 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
141#endif 145#endif
142#if CURSOR_BLINK 146#if CURSOR_BLINK
143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 147 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
144#endif 148#endif
145#ifdef POINTER_BLANK 149#ifdef POINTER_BLANK
146 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 150 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
147#endif 151#endif
148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 152 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 153 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 154 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 155 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 200#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 205#endif
202#ifdef USE_XIM 206#ifdef USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 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"), 209 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
216#if XFT 220#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif 222#endif
219#if ENABLE_FRILLS 223#if ENABLE_FRILLS
220 RSTRG (Rs_transient_for, "transient-for", "windowid"), 224 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"), 225 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"), 226 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"), 227 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"), 228 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 231 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 232 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
229 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), 233 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"), 234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
231#endif 235#endif
232#ifdef POINTER_BLANK 236#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 238#endif
… …
246#ifdef CUTCHAR_RESOURCE 250#ifdef CUTCHAR_RESOURCE
247 RSTRG (Rs_cutchars, "cutchars", "string"), 251 RSTRG (Rs_cutchars, "cutchars", "string"),
248#endif /* CUTCHAR_RESOURCE */ 252#endif /* CUTCHAR_RESOURCE */
249 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 253 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
250#ifndef NO_SECONDARY_SCREEN 254#ifndef NO_SECONDARY_SCREEN
251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
253#endif 257#endif
254#if ENABLE_PERL 258#if ENABLE_PERL
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 259 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 260 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 261 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"), 262 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 263#endif
264#if ISO_14755
265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266#endif
267#ifdef HAVE_AFTERIMAGE
268 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
269 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
270#endif
260#ifndef NO_RESOURCES 271#ifndef NO_RESOURCES
261 INFO ("xrm", "string", "X resource"), 272 INFO ("xrm", "string", "X resource"),
262#endif 273#endif
263 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
264 }; 275 };
… …
266#undef INFO 277#undef INFO
267#undef STRG 278#undef STRG
268#undef RSTRG 279#undef RSTRG
269#undef SWCH 280#undef SWCH
270#undef BOOL 281#undef BOOL
271/*}}} */
272 282
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 283static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 284static const char optionsstring[] = "options: "
275#if ENABLE_PERL 285#if ENABLE_PERL
276 "perl," 286 "perl,"
… …
386#endif 396#endif
387 "\nUsage: "; /* Usage */ 397 "\nUsage: "; /* Usage */
388 398
389#define INDENT 18 399#define INDENT 18
390 400
401const char rxvt_term::resval_undef [] = "<undef>";
402const char rxvt_term::resval_on [] = "on";
403const char rxvt_term::resval_off [] = "off";
404
391/*{{{ usage: */ 405/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 406/*----------------------------------------------------------------------*/
393static void 407static void
394rxvt_usage (int type) 408rxvt_usage (int type)
395{ 409{
… …
403 rxvt_log (" [-help] [--help]\n"); 417 rxvt_log (" [-help] [--help]\n");
404 418
405 for (col = 1, i = 0; i < optList_size; i++) 419 for (col = 1, i = 0; i < optList_size; i++)
406 if (optList[i].desc != NULL) 420 if (optList[i].desc != NULL)
407 { 421 {
408 int len = 0; 422 int len = 0;
409 423
410 if (!optList_isBool (i)) 424 if (!optList_isBool (i))
411 { 425 {
412 len = optList_strlen (i); 426 len = optList_strlen (i);
413 if (len > 0) 427 if (len > 0)
… …
480 494
481/*{{{ get command-line options before getting resources */ 495/*{{{ get command-line options before getting resources */
482void 496void
483rxvt_term::get_options (int argc, const char *const *argv) 497rxvt_term::get_options (int argc, const char *const *argv)
484{ 498{
485 int i, bad_option = 0; 499 int i, bad_option = 0;
486 static const char On[3] = "ON", Off[4] = "OFF";
487 500
488 for (i = 1; i < argc; i++) 501 for (i = 1; i < argc; i++)
489 { 502 {
490 unsigned int entry, longopt = 0; 503 unsigned int entry, longopt = 0;
491 const char *flag, *opt; 504 const char *flag, *opt;
492 505
493 opt = argv[i]; 506 opt = argv[i];
494 507
495 if (*opt == '-') 508 if (*opt == '-')
496 { 509 {
497 flag = On; 510 flag = resval_on;
511
498 if (*++opt == '-') 512 if (*++opt == '-')
499 longopt = *opt++; /* long option */ 513 longopt = *opt++; /* long option */
500 } 514 }
501 else if (*opt == '+') 515 else if (*opt == '+')
502 { 516 {
503 flag = Off; 517 flag = resval_off;
518
504 if (*++opt == '+') 519 if (*++opt == '+')
505 longopt = *opt++; /* long option */ 520 longopt = *opt++; /* long option */
506 } 521 }
507 else 522 else
508 { 523 {
… …
511 continue; 526 continue;
512 } 527 }
513 528
514 if (!strcmp (opt, "help")) 529 if (!strcmp (opt, "help"))
515 rxvt_usage (longopt ? 2 : 1); 530 rxvt_usage (longopt ? 2 : 1);
531
516 if (!strcmp (opt, "h")) 532 if (!strcmp (opt, "h"))
517 rxvt_usage (0); 533 rxvt_usage (0);
518 534
519 /* feature: always try to match long-options */ 535 /* feature: always try to match long-options */
520 for (entry = 0; entry < optList_size; entry++) 536 for (entry = 0; entry < optList_size; entry++)
… …
524 break; 540 break;
525 541
526 if (entry < optList_size) 542 if (entry < optList_size)
527 { 543 {
528 if (optList_isReverse (entry)) 544 if (optList_isReverse (entry))
529 flag = flag == On ? Off : On; 545 flag = flag == resval_on ? resval_off : resval_on;
530 546
531 if (optList_strlen (entry)) 547 if (optList_strlen (entry))
532 { 548 {
533 /* 549 /*
534 * special cases are handled in main.c:main () to allow 550 * special cases are handled in main.c:main () to allow
535 * X resources to set these values before we settle for 551 * X resources to set these values before we settle for
536 * default values 552 * default values
537 */ 553 */
538 554
539 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
556 {
557 if (flag == resval_on && !argv [i+1])
558 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
559
540 rs[optList[entry].doff] = flag == On && argv[i+1] 560 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
541 ? argv[++i] : 0; 561 }
542 } 562 }
543 else 563 else
544 { /* boolean value */ 564 { /* boolean value */
545 set_option (optList[entry].flag & Optflag_mask, flag == On); 565 set_option (optList[entry].index, flag == resval_on);
546 566
547 if (optList[entry].doff != -1) 567 if (optList[entry].doff != -1)
548 rs[optList[entry].doff] = flag; 568 rs[optList[entry].doff] = flag;
549 } 569 }
550 } 570 }
… …
765} 785}
766 786
767const char * 787const char *
768rxvt_term::x_resource (const char *name) 788rxvt_term::x_resource (const char *name)
769{ 789{
770 XrmDatabase database = XrmGetDatabase (xdisp); 790 XrmDatabase database = XrmGetDatabase (dpy);
771 791
772 const char *p = get_res (database, rs[Rs_name], name); 792 const char *p = get_res (database, rs[Rs_name], name);
773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 793 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
774 794
775 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 795 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
818 || strcasecmp (p, "1") == 0; 838 || strcasecmp (p, "1") == 0;
819 839
820 if (optList_isReverse (entry)) 840 if (optList_isReverse (entry))
821 s = !s; 841 s = !s;
822 842
823 set_option (optList[entry].flag & Optflag_mask, s); 843 set_option (optList[entry].index, s);
824 } 844 }
825 } 845 }
826 } 846 }
827 847
828 /* 848 /*
829 * [R5 or later]: enumerate the resource database 849 * [R5 or later]: enumerate the resource database
830 */ 850 */
831# ifdef KEYSYM_RESOURCE 851# ifdef KEYSYM_RESOURCE
832 XrmDatabase database = XrmGetDatabase (xdisp); 852 XrmDatabase database = XrmGetDatabase (dpy);
833 XrmName name_prefix[3]; 853 XrmName name_prefix[3];
834 XrmClass class_prefix[3]; 854 XrmClass class_prefix[3];
835 855
836 name_prefix[0] = XrmStringToName (rs[Rs_name]); 856 name_prefix[0] = XrmStringToName (rs[Rs_name]);
837 name_prefix[1] = XrmStringToName ("keysym"); 857 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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