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.85 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.105 by ayin, Sat Jun 9 09:05:38 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
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"),
… …
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 215 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 216#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 217 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 218#endif
219#if XFT
220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
221#endif
216#if ENABLE_FRILLS 222#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 223 RSTRG (Rs_transient_for, "transient-for", "windowid"),
218 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"),
219 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"),
220 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"),
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
227 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"),
228 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"),
229#endif 234#endif
230#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
232#endif 237#endif
… …
244#ifdef CUTCHAR_RESOURCE 249#ifdef CUTCHAR_RESOURCE
245 RSTRG (Rs_cutchars, "cutchars", "string"), 250 RSTRG (Rs_cutchars, "cutchars", "string"),
246#endif /* CUTCHAR_RESOURCE */ 251#endif /* CUTCHAR_RESOURCE */
247 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
248#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
251#endif 256#endif
252#if ENABLE_PERL 257#if ENABLE_PERL
253 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
254 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
255 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
256 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"),
257#endif 262#endif
263#if ISO_14755
264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif
266#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
269#endif
258#ifndef NO_RESOURCES 270#ifndef NO_RESOURCES
259 INFO ("xrm", "string", "X resource"), 271 INFO ("xrm", "string", "X resource"),
260#endif 272#endif
261 INFO ("e", "command arg ...", "command to execute") 273 INFO ("e", "command arg ...", "command to execute")
262 }; 274 };
… …
264#undef INFO 276#undef INFO
265#undef STRG 277#undef STRG
266#undef RSTRG 278#undef RSTRG
267#undef SWCH 279#undef SWCH
268#undef BOOL 280#undef BOOL
269/*}}} */
270 281
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 282static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 283static const char optionsstring[] = "options: "
273#if ENABLE_PERL 284#if ENABLE_PERL
274 "perl," 285 "perl,"
… …
320#if TINTING 331#if TINTING
321 "tint," 332 "tint,"
322#endif 333#endif
323#if defined(USE_XIM) 334#if defined(USE_XIM)
324 "XIM," 335 "XIM,"
336#endif
337#if defined(NO_BACKSPACE_KEY)
338 "no_backspace,"
339#endif
340#if defined(NO_DELETE_KEY)
341 "no_delete,"
342#endif
343#if EIGHT_BIT_CONTROLS
344 "8bitctrls,"
345#endif
346#if defined(ENABLE_FRILLS)
347 "frills,"
348#endif
349#if defined(SELECTION_SCROLLING)
350 "selectionscrolling,"
351#endif
352#if MOUSE_WHEEL
353 "wheel,"
354#endif
355#if MOUSE_SLIP_WHEELING
356 "slipwheel,"
357#endif
358#if defined(SMART_RESIZE)
359 "smart-resize,"
360#endif
361#if defined(CURSOR_BLINK)
362 "cursorBlink,"
363#endif
364#if defined(POINTER_BLANK)
365 "pointerBlank,"
366#endif
367#if defined(NO_RESOURCES)
368 "NoResources,"
325#endif 369#endif
326 "scrollbars=" 370 "scrollbars="
327#if !defined(HAVE_SCROLLBARS) 371#if !defined(HAVE_SCROLLBARS)
328 "NONE" 372 "NONE"
329#else 373#else
… …
347# endif 391# endif
348# if defined(XTERM_SCROLLBAR) 392# if defined(XTERM_SCROLLBAR)
349 "xterm" 393 "xterm"
350# endif 394# endif
351#endif 395#endif
352 ","
353#if defined(NO_BACKSPACE_KEY)
354 "no_backspace,"
355#endif
356#if defined(NO_DELETE_KEY)
357 "no_delete,"
358#endif
359#if EIGHT_BIT_CONTROLS
360 "8bitctrls,"
361#endif
362#if defined(ENABLE_FRILLS)
363 "frills,"
364#endif
365#if defined(SELECTION_SCROLLING)
366 "selectionscrolling,"
367#endif
368#if MOUSE_WHEEL
369 "wheel,"
370#endif
371#if MOUSE_SLIP_WHEELING
372 "slipwheel,"
373#endif
374#if defined(SMART_RESIZE)
375 "smart-resize,"
376#endif
377#if defined(CURSOR_BLINK)
378 "cursorBlink,"
379#endif
380#if defined(POINTER_BLANK)
381 "pointerBlank,"
382#endif
383#if defined(NO_RESOURCES)
384 "NoResources"
385#endif
386 "\nUsage: "; /* Usage */ 396 "\nUsage: "; /* Usage */
387 397
388#define INDENT 18 398#define INDENT 18
399
400const char rxvt_term::resval_undef [] = "<undef>";
401const char rxvt_term::resval_on [] = "on";
402const char rxvt_term::resval_off [] = "off";
389 403
390/*{{{ usage: */ 404/*{{{ usage: */
391/*----------------------------------------------------------------------*/ 405/*----------------------------------------------------------------------*/
392static void 406static void
393rxvt_usage (int type) 407rxvt_usage (int type)
… …
402 rxvt_log (" [-help] [--help]\n"); 416 rxvt_log (" [-help] [--help]\n");
403 417
404 for (col = 1, i = 0; i < optList_size; i++) 418 for (col = 1, i = 0; i < optList_size; i++)
405 if (optList[i].desc != NULL) 419 if (optList[i].desc != NULL)
406 { 420 {
407 int len = 0; 421 int len = 0;
408 422
409 if (!optList_isBool (i)) 423 if (!optList_isBool (i))
410 { 424 {
411 len = optList_strlen (i); 425 len = optList_strlen (i);
412 if (len > 0) 426 if (len > 0)
… …
479 493
480/*{{{ get command-line options before getting resources */ 494/*{{{ get command-line options before getting resources */
481void 495void
482rxvt_term::get_options (int argc, const char *const *argv) 496rxvt_term::get_options (int argc, const char *const *argv)
483{ 497{
484 int i, bad_option = 0; 498 int i, bad_option = 0;
485 static const char On[3] = "ON", Off[4] = "OFF";
486 499
487 for (i = 1; i < argc; i++) 500 for (i = 1; i < argc; i++)
488 { 501 {
489 unsigned int entry, longopt = 0; 502 unsigned int entry, longopt = 0;
490 const char *flag, *opt; 503 const char *flag, *opt;
491 504
492 opt = argv[i]; 505 opt = argv[i];
493 506
494 if (*opt == '-') 507 if (*opt == '-')
495 { 508 {
496 flag = On; 509 flag = resval_on;
510
497 if (*++opt == '-') 511 if (*++opt == '-')
498 longopt = *opt++; /* long option */ 512 longopt = *opt++; /* long option */
499 } 513 }
500 else if (*opt == '+') 514 else if (*opt == '+')
501 { 515 {
502 flag = Off; 516 flag = resval_off;
517
503 if (*++opt == '+') 518 if (*++opt == '+')
504 longopt = *opt++; /* long option */ 519 longopt = *opt++; /* long option */
505 } 520 }
506 else 521 else
507 { 522 {
… …
510 continue; 525 continue;
511 } 526 }
512 527
513 if (!strcmp (opt, "help")) 528 if (!strcmp (opt, "help"))
514 rxvt_usage (longopt ? 2 : 1); 529 rxvt_usage (longopt ? 2 : 1);
530
515 if (!strcmp (opt, "h")) 531 if (!strcmp (opt, "h"))
516 rxvt_usage (0); 532 rxvt_usage (0);
517 533
518 /* feature: always try to match long-options */ 534 /* feature: always try to match long-options */
519 for (entry = 0; entry < optList_size; entry++) 535 for (entry = 0; entry < optList_size; entry++)
… …
523 break; 539 break;
524 540
525 if (entry < optList_size) 541 if (entry < optList_size)
526 { 542 {
527 if (optList_isReverse (entry)) 543 if (optList_isReverse (entry))
528 flag = flag == On ? Off : On; 544 flag = flag == resval_on ? resval_off : resval_on;
529 545
530 if (optList_strlen (entry)) 546 if (optList_strlen (entry))
531 { 547 {
532 /* 548 /*
533 * special cases are handled in main.c:main () to allow 549 * special cases are handled in main.c:main () to allow
534 * X resources to set these values before we settle for 550 * X resources to set these values before we settle for
535 * default values 551 * default values
536 */ 552 */
537 553
538 if (optList[entry].doff != -1) 554 if (optList[entry].doff != -1)
555 {
556 if (flag == resval_on && !argv [i+1])
557 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
558
539 rs[optList[entry].doff] = flag == On && argv[i+1] 559 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
540 ? argv[++i] : 0; 560 }
541 } 561 }
542 else 562 else
543 { /* boolean value */ 563 { /* boolean value */
544 set_option (optList[entry].flag & Optflag_mask, flag == On); 564 set_option (optList[entry].index, flag == resval_on);
545 565
546 if (optList[entry].doff != -1) 566 if (optList[entry].doff != -1)
547 rs[optList[entry].doff] = flag; 567 rs[optList[entry].doff] = flag;
548 } 568 }
549 } 569 }
… …
764} 784}
765 785
766const char * 786const char *
767rxvt_term::x_resource (const char *name) 787rxvt_term::x_resource (const char *name)
768{ 788{
769 XrmDatabase database = XrmGetDatabase (display->display); 789 XrmDatabase database = XrmGetDatabase (dpy);
770 790
771 const char *p = get_res (database, rs[Rs_name], name); 791 const char *p = get_res (database, rs[Rs_name], name);
772 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 792 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
773 793
774 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 794 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
817 || strcasecmp (p, "1") == 0; 837 || strcasecmp (p, "1") == 0;
818 838
819 if (optList_isReverse (entry)) 839 if (optList_isReverse (entry))
820 s = !s; 840 s = !s;
821 841
822 set_option (optList[entry].flag & Optflag_mask, s); 842 set_option (optList[entry].index, s);
823 } 843 }
824 } 844 }
825 } 845 }
826 846
827 /* 847 /*
828 * [R5 or later]: enumerate the resource database 848 * [R5 or later]: enumerate the resource database
829 */ 849 */
830# ifdef KEYSYM_RESOURCE 850# ifdef KEYSYM_RESOURCE
831 XrmDatabase database = XrmGetDatabase (display->display); 851 XrmDatabase database = XrmGetDatabase (dpy);
832 XrmName name_prefix[3]; 852 XrmName name_prefix[3];
833 XrmClass class_prefix[3]; 853 XrmClass class_prefix[3];
834 854
835 name_prefix[0] = XrmStringToName (rs[Rs_name]); 855 name_prefix[0] = XrmStringToName (rs[Rs_name]);
836 name_prefix[1] = XrmStringToName ("keysym"); 856 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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