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.82 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.107 by root, Mon Jun 18 12:53:26 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/* #define DEBUG_RESOURCES */
40
41/*{{{ monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
42/* 40/*
43 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
44 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
45 * 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 ()
46 */ 44 */
47 45
48/* INFO () - descriptive information only */ 46/* INFO () - descriptive information only */
49#define INFO(opt, arg, desc) \ 47#define INFO(opt, arg, desc) \
50 {0, -1, NULL, (opt), (arg), (desc)} 48 {0, 0, -1, NULL, (opt), (arg), (desc)}
51 49
52/* STRG () - command-line option, with/without resource */ 50/* STRG () - command-line option, with/without resource */
53#define STRG(rsp, kw, opt, arg, desc) \ 51#define STRG(rsp, kw, opt, arg, desc) \
54 {0, (rsp), (kw), (opt), (arg), (desc)} 52 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
55 53
56/* RSTRG () - resource/long-option */ 54/* RSTRG () - resource/long-option */
57#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
58 {0, (rsp), (kw), NULL, (arg), NULL} 56 {0, 0, (rsp), (kw), NULL, (arg), NULL}
59 57
60/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
61#define BOOL(rsp, kw, opt, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
62 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
63 61
64/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
65#define SWCH(opt, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
66 { (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
67 65
68/* convenient macros */ 66/* convenient macros */
69#define optList_strlen(i) \ 67#define optList_strlen(i) \
70 (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))
71#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
75#define optList_size \ 73#define optList_size \
76 (sizeof (optList) / sizeof (optList[0])) 74 (sizeof (optList) / sizeof (optList[0]))
77 75
78static const struct 76static const struct
79 { 77 {
78 const uint8_t index; /* Option index */
80 const unsigned long flag; /* Option flag */ 79 const uint8_t flag; /* Option flag */
81 const int doff; /* data offset */ 80 const int16_t doff; /* resource value index or -1 */
82 const char *kw; /* keyword */ 81 const char *kw; /* keyword */
83 const char *opt; /* option */ 82 const char *opt; /* option */
84 const char *arg; /* argument */ 83 const char *arg; /* argument */
85 const char *desc; /* description */ 84 const char *desc; /* description */
86 } 85 }
… …
88 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 87 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
89 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 88 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
90 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"),
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, "intercept console messages"), 92 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 93 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100#if HAVE_SCROLLBARS 100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107#endif 107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if TRANSPARENT 112#if TRANSPARENT
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, NULL), 114 SWCH ("tr", Opt_transparent, 0, NULL),
115# if TINTING 115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117# endif 117# endif
118#endif 118#endif
119#if OFF_FOCUS_FADING 119#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 120 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif 122#endif
123#if TINTING 123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
125#endif 125#endif
126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
127#ifndef NO_BELL 127#ifndef NO_BELL
128# if ENABLE_FRILLS
129 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
130# endif
128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 131 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 132# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 133 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
131# endif 134# endif
132#endif 135#endif
133#ifdef META8_OPTION 136#ifdef META8_OPTION
134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 137 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
135#endif 138#endif
136#ifdef MOUSE_WHEEL 139#ifdef MOUSE_WHEEL
137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 140 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
138#endif 141#endif
139#if ENABLE_FRILLS 142#if ENABLE_FRILLS
140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 143 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 144 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 145 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
143#endif 146#endif
144#if CURSOR_BLINK 147#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 148 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 149#endif
147#ifdef POINTER_BLANK 150#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 151 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
149#endif 152#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 153 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 154 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 155 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 156 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 201#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
200 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 203 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
201 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 204 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
202 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 205 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
203#endif 206#endif
204#ifdef USE_XIM 207#ifdef USE_XIM
205 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
206 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 209 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
207 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 210 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 216 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
214 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 217 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
215#if ENABLE_XEMBED 218#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 219 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 220#endif
221#if XFT
222 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
223#endif
218#if ENABLE_FRILLS 224#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), 226 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
221 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
222 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 228 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
228 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), 234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
229 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
230#endif 236#endif
231#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
232 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
233#endif 239#endif
… …
245#ifdef CUTCHAR_RESOURCE 251#ifdef CUTCHAR_RESOURCE
246 RSTRG (Rs_cutchars, "cutchars", "string"), 252 RSTRG (Rs_cutchars, "cutchars", "string"),
247#endif /* CUTCHAR_RESOURCE */ 253#endif /* CUTCHAR_RESOURCE */
248 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
250 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
251 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
252#endif 258#endif
253#if ENABLE_PERL 259#if ENABLE_PERL
254 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 260 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
255 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 261 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
256 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 262 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
257 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 263 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
258#endif 264#endif
265#if ISO_14755
266 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
267#endif
268#ifdef HAVE_AFTERIMAGE
269 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
270 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
271#endif
259#ifndef NO_RESOURCES 272#ifndef NO_RESOURCES
260 INFO ("xrm", "string", "X resource"), 273 INFO ("xrm", "string", "X resource"),
261#endif 274#endif
262 INFO ("e", "command arg ...", "command to execute") 275 INFO ("e", "command arg ...", "command to execute")
263 }; 276 };
… …
265#undef INFO 278#undef INFO
266#undef STRG 279#undef STRG
267#undef RSTRG 280#undef RSTRG
268#undef SWCH 281#undef SWCH
269#undef BOOL 282#undef BOOL
270/*}}} */
271 283
272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
273static const char optionsstring[] = "options: " 285static const char optionsstring[] = "options: "
274#if ENABLE_PERL 286#if ENABLE_PERL
275 "perl," 287 "perl,"
… …
319 "transparent," 331 "transparent,"
320#endif 332#endif
321#if TINTING 333#if TINTING
322 "tint," 334 "tint,"
323#endif 335#endif
324#if defined(UTMP_SUPPORT)
325 "utmp,"
326#endif
327#if defined(USE_XIM) 336#if defined(USE_XIM)
328 "XIM," 337 "XIM,"
338#endif
339#if defined(NO_BACKSPACE_KEY)
340 "no_backspace,"
341#endif
342#if defined(NO_DELETE_KEY)
343 "no_delete,"
344#endif
345#if EIGHT_BIT_CONTROLS
346 "8bitctrls,"
347#endif
348#if defined(ENABLE_FRILLS)
349 "frills,"
350#endif
351#if defined(SELECTION_SCROLLING)
352 "selectionscrolling,"
353#endif
354#if MOUSE_WHEEL
355 "wheel,"
356#endif
357#if MOUSE_SLIP_WHEELING
358 "slipwheel,"
359#endif
360#if defined(SMART_RESIZE)
361 "smart-resize,"
362#endif
363#if defined(CURSOR_BLINK)
364 "cursorBlink,"
365#endif
366#if defined(POINTER_BLANK)
367 "pointerBlank,"
368#endif
369#if defined(NO_RESOURCES)
370 "NoResources,"
329#endif 371#endif
330 "scrollbars=" 372 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 373#if !defined(HAVE_SCROLLBARS)
332 "NONE" 374 "NONE"
333#else 375#else
… …
351# endif 393# endif
352# if defined(XTERM_SCROLLBAR) 394# if defined(XTERM_SCROLLBAR)
353 "xterm" 395 "xterm"
354# endif 396# endif
355#endif 397#endif
356 ","
357#if defined(NO_BACKSPACE_KEY)
358 "no_backspace,"
359#endif
360#if defined(NO_DELETE_KEY)
361 "no_delete,"
362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
366#if defined(ENABLE_FRILLS)
367 "frills,"
368#endif
369#if defined(PREFER_24BIT)
370 "24bit,"
371#endif
372#if defined(SELECTION_SCROLLING)
373 "selectionscrolling,"
374#endif
375#if MOUSE_WHEEL
376 "wheel,"
377#endif
378#if MOUSE_SLIP_WHEELING
379 "slipwheel,"
380#endif
381#if defined(SMART_RESIZE)
382 "smart-resize,"
383#endif
384#if defined(CURSOR_BLINK)
385 "cursorBlink,"
386#endif
387#if defined(POINTER_BLANK)
388 "pointerBlank,"
389#endif
390#if defined(NO_RESOURCES)
391 "NoResources"
392#endif
393 "\nUsage: "; /* Usage */ 398 "\nUsage: "; /* Usage */
394 399
395#define INDENT 18 400#define INDENT 18
401
402const char rxvt_term::resval_undef [] = "<undef>";
403const char rxvt_term::resval_on [] = "on";
404const char rxvt_term::resval_off [] = "off";
396 405
397/*{{{ usage: */ 406/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 407/*----------------------------------------------------------------------*/
399static void 408static void
400rxvt_usage (int type) 409rxvt_usage (int type)
… …
409 rxvt_log (" [-help] [--help]\n"); 418 rxvt_log (" [-help] [--help]\n");
410 419
411 for (col = 1, i = 0; i < optList_size; i++) 420 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 421 if (optList[i].desc != NULL)
413 { 422 {
414 int len = 0; 423 int len = 0;
415 424
416 if (!optList_isBool (i)) 425 if (!optList_isBool (i))
417 { 426 {
418 len = optList_strlen (i); 427 len = optList_strlen (i);
419 if (len > 0) 428 if (len > 0)
… …
486 495
487/*{{{ get command-line options before getting resources */ 496/*{{{ get command-line options before getting resources */
488void 497void
489rxvt_term::get_options (int argc, const char *const *argv) 498rxvt_term::get_options (int argc, const char *const *argv)
490{ 499{
491 int i, bad_option = 0; 500 int i, bad_option = 0;
492 static const char On[3] = "ON", Off[4] = "OFF";
493 501
494 for (i = 1; i < argc; i++) 502 for (i = 1; i < argc; i++)
495 { 503 {
496 unsigned int entry, longopt = 0; 504 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 505 const char *flag, *opt;
498 506
499 opt = argv[i]; 507 opt = argv[i];
500#ifdef DEBUG_RESOURCES 508
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 509 if (*opt == '-')
504 { 510 {
505 flag = On; 511 flag = resval_on;
512
506 if (*++opt == '-') 513 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 514 longopt = *opt++; /* long option */
508 } 515 }
509 else if (*opt == '+') 516 else if (*opt == '+')
510 { 517 {
511 flag = Off; 518 flag = resval_off;
519
512 if (*++opt == '+') 520 if (*++opt == '+')
513 longopt = *opt++; /* long option */ 521 longopt = *opt++; /* long option */
514 } 522 }
515 else 523 else
516 { 524 {
… …
519 continue; 527 continue;
520 } 528 }
521 529
522 if (!strcmp (opt, "help")) 530 if (!strcmp (opt, "help"))
523 rxvt_usage (longopt ? 2 : 1); 531 rxvt_usage (longopt ? 2 : 1);
532
524 if (!strcmp (opt, "h")) 533 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 534 rxvt_usage (0);
526 535
527 /* feature: always try to match long-options */ 536 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 537 for (entry = 0; entry < optList_size; entry++)
… …
532 break; 541 break;
533 542
534 if (entry < optList_size) 543 if (entry < optList_size)
535 { 544 {
536 if (optList_isReverse (entry)) 545 if (optList_isReverse (entry))
537 flag = flag == On ? Off : On; 546 flag = flag == resval_on ? resval_off : resval_on;
538 547
539 if (optList_strlen (entry)) 548 if (optList_strlen (entry))
540 { 549 {
541 /* 550 /*
542 * special cases are handled in main.c:main () to allow 551 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 552 * X resources to set these values before we settle for
544 * default values 553 * default values
545 */ 554 */
546 555
547 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
557 {
558 if (flag == resval_on && !argv [i+1])
559 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
560
548 rs[optList[entry].doff] = flag == On && argv[i+1] 561 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
549 ? argv[++i] : 0; 562 }
550 } 563 }
551 else 564 else
552 { /* boolean value */ 565 { /* boolean value */
553#ifdef DEBUG_RESOURCES 566 set_option (optList[entry].index, flag == resval_on);
554 fprintf (stderr, "boolean (%s,%s) = %s\n",
555 optList[entry].opt, optList[entry].kw, flag);
556#endif
557 set_option (optList[entry].flag & Optflag_mask, flag == On);
558 567
559 if (optList[entry].doff != -1) 568 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 569 rs[optList[entry].doff] = flag;
561 } 570 }
562 } 571 }
… …
777} 786}
778 787
779const char * 788const char *
780rxvt_term::x_resource (const char *name) 789rxvt_term::x_resource (const char *name)
781{ 790{
782 XrmDatabase database = XrmGetDatabase (display->display); 791 XrmDatabase database = XrmGetDatabase (dpy);
783 792
784 const char *p = get_res (database, rs[Rs_name], name); 793 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 794 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786 795
787 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 796 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
830 || strcasecmp (p, "1") == 0; 839 || strcasecmp (p, "1") == 0;
831 840
832 if (optList_isReverse (entry)) 841 if (optList_isReverse (entry))
833 s = !s; 842 s = !s;
834 843
835 set_option (optList[entry].flag & Optflag_mask, s); 844 set_option (optList[entry].index, s);
836 } 845 }
837 } 846 }
838 } 847 }
839 848
840 /* 849 /*
841 * [R5 or later]: enumerate the resource database 850 * [R5 or later]: enumerate the resource database
842 */ 851 */
843# ifdef KEYSYM_RESOURCE 852# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display); 853 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 854 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 855 XrmClass class_prefix[3];
847 856
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 857 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 858 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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