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.79 by root, Mon Jan 16 09:28:17 2006 UTC vs.
Revision 1.118 by ayin, Fri Oct 26 18:30:37 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 ENABLE_TRANSPARENCY
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 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115# if TINTING
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117# endif 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
118#endif 117#endif
119#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
120 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"),
121 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"),
122#endif 121#endif
123#if TINTING
124 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
125#endif
126 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
127#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS
125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
126# endif
128 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 127 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
129# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 128# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
130 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 129 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
131# endif 130# endif
132#endif 131#endif
133#ifdef META8_OPTION 132#ifdef META8_OPTION
134 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 133 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
135#endif 134#endif
136#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
137 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
138#endif 137#endif
139#if ENABLE_FRILLS 138#if ENABLE_FRILLS
140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 139 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"), 140 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 141 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
143#endif 142#endif
144#if CURSOR_BLINK 143#if CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 144 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
146#endif 145#endif
147#ifdef POINTER_BLANK 146#ifdef POINTER_BLANK
148 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 147 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"),
149#endif 148#endif
150 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 149 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
151 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 150 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
152 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 151 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
153 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 152 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 187#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 191#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
194#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
195#ifdef XPM_BACKGROUND
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197#endif /* XPM_BACKGROUND */
198#if (MENUBAR_MAX)
199 RSTRG (Rs_menu, "menu", "name[;tag]"),
200#endif 194#endif
201 /* fonts: command-line option = resource name */ 195 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 197#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), 201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
208#endif 202#endif
209#ifdef USE_XIM 203#ifdef USE_XIM
210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
211 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
212 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
… …
218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
220#if ENABLE_XEMBED 214#if ENABLE_XEMBED
221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222#endif 216#endif
217#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219#endif
223#if ENABLE_FRILLS 220#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 224 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), 230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
234#endif 232#endif
235#ifdef POINTER_BLANK 233#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 235#endif
… …
249#ifdef CUTCHAR_RESOURCE 247#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */ 249#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 250 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 251#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 254#endif
257#if ENABLE_PERL 255#if ENABLE_PERL
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 256 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),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_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 260#endif
261#if ISO_14755
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif
263#ifndef NO_RESOURCES 268#ifndef NO_RESOURCES
264 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
265#endif 270#endif
266 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
267 }; 272 };
… …
269#undef INFO 274#undef INFO
270#undef STRG 275#undef STRG
271#undef RSTRG 276#undef RSTRG
272#undef SWCH 277#undef SWCH
273#undef BOOL 278#undef BOOL
274/*}}} */
275 279
276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 280static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277static const char optionsstring[] = "options: " 281static const char optionsstring[] = "options: "
278#if ENABLE_PERL 282#if ENABLE_PERL
279 "perl," 283 "perl,"
… …
314#endif 318#endif
315 "," 319 ","
316#if OFF_FOCUS_FADING 320#if OFF_FOCUS_FADING
317 "fade," 321 "fade,"
318#endif 322#endif
319#if defined(XPM_BACKGROUND)
320 "XPM,"
321#endif
322#if defined(TRANSPARENT) 323#if defined(ENABLE_TRANSPARENCY)
323 "transparent," 324 "transparent,"
324#endif
325#if TINTING
326 "tint," 325 "tint,"
327#endif 326#endif
328#if defined(UTMP_SUPPORT) 327#if HAVE_AFTERIMAGE
329 "utmp," 328 "afterimage,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif 329#endif
334#if defined(USE_XIM) 330#if defined(USE_XIM)
335 "XIM," 331 "XIM,"
332#endif
333#if defined(NO_BACKSPACE_KEY)
334 "no_backspace,"
335#endif
336#if defined(NO_DELETE_KEY)
337 "no_delete,"
338#endif
339#if EIGHT_BIT_CONTROLS
340 "8bitctrls,"
341#endif
342#if defined(ENABLE_FRILLS)
343 "frills,"
344#endif
345#if defined(SELECTION_SCROLLING)
346 "selectionscrolling,"
347#endif
348#if MOUSE_WHEEL
349 "wheel,"
350#endif
351#if MOUSE_SLIP_WHEELING
352 "slipwheel,"
353#endif
354#if defined(SMART_RESIZE)
355 "smart-resize,"
356#endif
357#if defined(CURSOR_BLINK)
358 "cursorBlink,"
359#endif
360#if defined(POINTER_BLANK)
361 "pointerBlank,"
362#endif
363#if defined(NO_RESOURCES)
364 "NoResources,"
336#endif 365#endif
337 "scrollbars=" 366 "scrollbars="
338#if !defined(HAVE_SCROLLBARS) 367#if !defined(HAVE_SCROLLBARS)
339 "NONE" 368 "NONE"
340#else 369#else
… …
358# endif 387# endif
359# if defined(XTERM_SCROLLBAR) 388# if defined(XTERM_SCROLLBAR)
360 "xterm" 389 "xterm"
361# endif 390# endif
362#endif 391#endif
363 ","
364#if defined(NO_BACKSPACE_KEY)
365 "no_backspace,"
366#endif
367#if defined(NO_DELETE_KEY)
368 "no_delete,"
369#endif
370#if EIGHT_BIT_CONTROLS
371 "8bitctrls,"
372#endif
373#if defined(ENABLE_FRILLS)
374 "frills,"
375#endif
376#if defined(PREFER_24BIT)
377 "24bit,"
378#endif
379#if defined(SELECTION_SCROLLING)
380 "selectionscrolling,"
381#endif
382#if MOUSE_WHEEL
383 "wheel,"
384#endif
385#if MOUSE_SLIP_WHEELING
386 "slipwheel,"
387#endif
388#if defined(SMART_RESIZE)
389 "smart-resize,"
390#endif
391#if defined(CURSOR_BLINK)
392 "cursorBlink,"
393#endif
394#if defined(POINTER_BLANK)
395 "pointerBlank,"
396#endif
397#if defined(NO_RESOURCES)
398 "NoResources"
399#endif
400 "\nUsage: "; /* Usage */ 392 "\nUsage: "; /* Usage */
401 393
402#define INDENT 18 394#define INDENT 18
395
396const char rxvt_term::resval_undef [] = "<undef>";
397const char rxvt_term::resval_on [] = "on";
398const char rxvt_term::resval_off [] = "off";
403 399
404/*{{{ usage: */ 400/*{{{ usage: */
405/*----------------------------------------------------------------------*/ 401/*----------------------------------------------------------------------*/
406static void 402static void
407rxvt_usage (int type) 403rxvt_usage (int type)
… …
416 rxvt_log (" [-help] [--help]\n"); 412 rxvt_log (" [-help] [--help]\n");
417 413
418 for (col = 1, i = 0; i < optList_size; i++) 414 for (col = 1, i = 0; i < optList_size; i++)
419 if (optList[i].desc != NULL) 415 if (optList[i].desc != NULL)
420 { 416 {
421 int len = 0; 417 int len = 0;
422 418
423 if (!optList_isBool (i)) 419 if (!optList_isBool (i))
424 { 420 {
425 len = optList_strlen (i); 421 len = optList_strlen (i);
426 if (len > 0) 422 if (len > 0)
… …
493 489
494/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
495void 491void
496rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
497{ 493{
498 int i, bad_option = 0; 494 int i, bad_option = 0;
499 static const char On[3] = "ON", Off[4] = "OFF";
500 495
501 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
502 { 497 {
503 unsigned int entry, longopt = 0; 498 unsigned int entry, longopt = 0;
504 const char *flag, *opt; 499 const char *flag, *opt;
505 500
506 opt = argv[i]; 501 opt = argv[i];
507#ifdef DEBUG_RESOURCES 502
508 fprintf (stderr, "argv[%d] = %s: ", i, opt);
509#endif
510 if (*opt == '-') 503 if (*opt == '-')
511 { 504 {
512 flag = On; 505 flag = resval_on;
506
513 if (*++opt == '-') 507 if (*++opt == '-')
514 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
515 } 509 }
516 else if (*opt == '+') 510 else if (*opt == '+')
517 { 511 {
518 flag = Off; 512 flag = resval_off;
513
519 if (*++opt == '+') 514 if (*++opt == '+')
520 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
521 } 516 }
522 else 517 else
523 { 518 {
… …
526 continue; 521 continue;
527 } 522 }
528 523
529 if (!strcmp (opt, "help")) 524 if (!strcmp (opt, "help"))
530 rxvt_usage (longopt ? 2 : 1); 525 rxvt_usage (longopt ? 2 : 1);
526
531 if (!strcmp (opt, "h")) 527 if (!strcmp (opt, "h"))
532 rxvt_usage (0); 528 rxvt_usage (0);
533 529
534 /* feature: always try to match long-options */ 530 /* feature: always try to match long-options */
535 for (entry = 0; entry < optList_size; entry++) 531 for (entry = 0; entry < optList_size; entry++)
… …
539 break; 535 break;
540 536
541 if (entry < optList_size) 537 if (entry < optList_size)
542 { 538 {
543 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
544 flag = flag == On ? Off : On; 540 flag = flag == resval_on ? resval_off : resval_on;
545 541
546 if (optList_strlen (entry)) 542 if (optList_strlen (entry))
547 { 543 {
548 /* 544 /*
549 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
550 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
551 * default values 547 * default values
552 */ 548 */
553 549
554 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 {
552 if (flag == resval_on && i+1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
554
555 rs[optList[entry].doff] = flag == On && argv[i+1] 555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
556 ? argv[++i] : 0; 556 }
557 } 557 }
558 else 558 else
559 { /* boolean value */ 559 { /* boolean value */
560#ifdef DEBUG_RESOURCES 560 set_option (optList[entry].index, flag == resval_on);
561 fprintf (stderr, "boolean (%s,%s) = %s\n",
562 optList[entry].opt, optList[entry].kw, flag);
563#endif
564 set_option (optList[entry].flag & Optflag_mask, flag == On);
565 561
566 if (optList[entry].doff != -1) 562 if (optList[entry].doff != -1)
567 rs[optList[entry].doff] = flag; 563 rs[optList[entry].doff] = flag;
568 } 564 }
569 } 565 }
570 else 566 else
571#ifdef KEYSYM_RESOURCE 567#ifdef KEYSYM_RESOURCE
572 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
573 if (rxvt_Str_match (opt, "keysym."))
574 { 569 {
575 const char *str = argv[++i]; 570 if (i+1 < argc)
576
577 if (str != NULL)
578 parse_keysym (opt + sizeof ("keysym.") - 1, str); 571 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
579 } 572 }
580 else 573 else
581#endif 574#endif
582 { 575 {
583 bad_option = 1; 576 bad_option = 1;
… …
601 * "rxvt" "keysym" "0xFF01" 594 * "rxvt" "keysym" "0xFF01"
602 * value will be a string 595 * value will be a string
603 */ 596 */
604/* ARGSUSED */ 597/* ARGSUSED */
605int 598int
606rxvt_define_key (XrmDatabase *database __attribute__((unused)), 599rxvt_define_key (XrmDatabase *database UNUSED,
607 XrmBindingList bindings __attribute__((unused)), 600 XrmBindingList bindings UNUSED,
608 XrmQuarkList quarks, 601 XrmQuarkList quarks,
609 XrmRepresentation *type __attribute__((unused)), 602 XrmRepresentation *type UNUSED,
610 XrmValue *value, 603 XrmValue *value,
611 XPointer closure __attribute__((unused))) 604 XPointer closure UNUSED)
612{ 605{
613 int last; 606 int last;
614 607
615 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
616 ; 609 ;
… …
674 char *newarg = NULL; 667 char *newarg = NULL;
675 char newargstr[NEWARGLIM]; 668 char newargstr[NEWARGLIM];
676 669
677 if (arg == NULL) 670 if (arg == NULL)
678 { 671 {
679 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 672 n = sizeof ("keysym.") - 1;
673 if (strncmp (str, "keysym.", n))
680 return 0; 674 return 0;
681 675
682 str += n; /* skip `keysym.' */ 676 str += n; /* skip `keysym.' */
683 if (!(pmodend = strchr (str, ':'))) 677 if (!(pmodend = strchr (str, ':')))
684 return -1; 678 return -1;
… …
757 strncpy (newargstr, arg, NEWARGLIM - 1); 751 strncpy (newargstr, arg, NEWARGLIM - 1);
758 newargstr[NEWARGLIM - 1] = '\0'; 752 newargstr[NEWARGLIM - 1] = '\0';
759 newarg = newargstr; 753 newarg = newargstr;
760 } 754 }
761 755
762 rxvt_Str_trim (newarg); 756 if (*newarg == '\0')
763 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
764 return -1; 757 return -1;
765 758
766 keyboard->register_user_translation (sym, state, newarg); 759 keyboard->register_user_translation (sym, state, newarg);
767 return 1; 760 return 1;
768} 761}
… …
784} 777}
785 778
786const char * 779const char *
787rxvt_term::x_resource (const char *name) 780rxvt_term::x_resource (const char *name)
788{ 781{
789 XrmDatabase database = XrmGetDatabase (display->display); 782 XrmDatabase database = XrmGetDatabase (dpy);
790 783
791 const char *p = get_res (database, rs[Rs_name], name); 784 const char *p = get_res (database, rs[Rs_name], name);
792 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
793 786
794 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 787 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
837 || strcasecmp (p, "1") == 0; 830 || strcasecmp (p, "1") == 0;
838 831
839 if (optList_isReverse (entry)) 832 if (optList_isReverse (entry))
840 s = !s; 833 s = !s;
841 834
842 set_option (optList[entry].flag & Optflag_mask, s); 835 set_option (optList[entry].index, s);
843 } 836 }
844 } 837 }
845 } 838 }
846 839
847 /* 840 /*
848 * [R5 or later]: enumerate the resource database 841 * [R5 or later]: enumerate the resource database
849 */ 842 */
850# ifdef KEYSYM_RESOURCE 843# ifdef KEYSYM_RESOURCE
851 XrmDatabase database = XrmGetDatabase (display->display); 844 XrmDatabase database = XrmGetDatabase (dpy);
852 XrmName name_prefix[3]; 845 XrmName name_prefix[3];
853 XrmClass class_prefix[3]; 846 XrmClass class_prefix[3];
854 847
855 name_prefix[0] = XrmStringToName (rs[Rs_name]); 848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
856 name_prefix[1] = XrmStringToName ("keysym"); 849 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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