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.77 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.110 by root, Wed Aug 1 17:54:03 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 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"),
… …
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 190 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188#endif /* NO_CURSORCOLOR */ 191#endif /* NO_CURSORCOLOR */
189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 192 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 193 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 194 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 195#ifdef XPM_BACKGROUND
193 RSTRG (Rs_path, "path", "search path"), 196 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"), 197 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 198#endif
201 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 201#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 203 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 204 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 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"),
208#endif 206#endif
209#ifdef USE_XIM 207#ifdef USE_XIM
210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
211 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"),
212 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"),
… …
218 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 216 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
219 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"),
220#if ENABLE_XEMBED 218#if ENABLE_XEMBED
221 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"),
222#endif 220#endif
221#if XFT
222 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
223#endif
223#if ENABLE_FRILLS 224#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 RSTRG (Rs_transient_for, "transient-for", "windowid"),
226 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"), 227 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"), 228 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"), 229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
232 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"),
233 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"),
234#endif 236#endif
235#ifdef POINTER_BLANK 237#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 238 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 239#endif
… …
249#ifdef CUTCHAR_RESOURCE 251#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 252 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */ 253#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 258#endif
257#if ENABLE_PERL 259#if ENABLE_PERL
258 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
259 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
260 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
261 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"),
262#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", "HxV", "Gaussian Blur radii to apply to the root background"),
271#endif
263#ifndef NO_RESOURCES 272#ifndef NO_RESOURCES
264 INFO ("xrm", "string", "X resource"), 273 INFO ("xrm", "string", "X resource"),
265#endif 274#endif
266 INFO ("e", "command arg ...", "command to execute") 275 INFO ("e", "command arg ...", "command to execute")
267 }; 276 };
… …
269#undef INFO 278#undef INFO
270#undef STRG 279#undef STRG
271#undef RSTRG 280#undef RSTRG
272#undef SWCH 281#undef SWCH
273#undef BOOL 282#undef BOOL
274/*}}} */
275 283
276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277static const char optionsstring[] = "options: " 285static const char optionsstring[] = "options: "
278#if ENABLE_PERL 286#if ENABLE_PERL
279 "perl," 287 "perl,"
… …
317 "fade," 325 "fade,"
318#endif 326#endif
319#if defined(XPM_BACKGROUND) 327#if defined(XPM_BACKGROUND)
320 "XPM," 328 "XPM,"
321#endif 329#endif
322#if defined(TRANSPARENT) 330#if defined(ENABLE_TRANSPARENCY)
323 "transparent," 331 "transparent,"
332#endif
333#if HAVE_AFTERIMAGE
334 "afterimage,"
324#endif 335#endif
325#if TINTING 336#if TINTING
326 "tint," 337 "tint,"
327#endif 338#endif
328#if defined(UTMP_SUPPORT)
329 "utmp,"
330#endif
331#if defined(MENUBAR)
332 "menubar,"
333#endif
334#if defined(USE_XIM) 339#if defined(USE_XIM)
335 "XIM," 340 "XIM,"
341#endif
342#if defined(NO_BACKSPACE_KEY)
343 "no_backspace,"
344#endif
345#if defined(NO_DELETE_KEY)
346 "no_delete,"
347#endif
348#if EIGHT_BIT_CONTROLS
349 "8bitctrls,"
350#endif
351#if defined(ENABLE_FRILLS)
352 "frills,"
353#endif
354#if defined(SELECTION_SCROLLING)
355 "selectionscrolling,"
356#endif
357#if MOUSE_WHEEL
358 "wheel,"
359#endif
360#if MOUSE_SLIP_WHEELING
361 "slipwheel,"
362#endif
363#if defined(SMART_RESIZE)
364 "smart-resize,"
365#endif
366#if defined(CURSOR_BLINK)
367 "cursorBlink,"
368#endif
369#if defined(POINTER_BLANK)
370 "pointerBlank,"
371#endif
372#if defined(NO_RESOURCES)
373 "NoResources,"
336#endif 374#endif
337 "scrollbars=" 375 "scrollbars="
338#if !defined(HAVE_SCROLLBARS) 376#if !defined(HAVE_SCROLLBARS)
339 "NONE" 377 "NONE"
340#else 378#else
… …
358# endif 396# endif
359# if defined(XTERM_SCROLLBAR) 397# if defined(XTERM_SCROLLBAR)
360 "xterm" 398 "xterm"
361# endif 399# endif
362#endif 400#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(NO_STRINGS)
374 "strings,"
375#endif
376#if defined(ENABLE_FRILLS)
377 "frills,"
378#endif
379#if defined(PREFER_24BIT)
380 "24bit,"
381#endif
382#if defined(SELECTION_SCROLLING)
383 "selectionscrolling,"
384#endif
385#if MOUSE_WHEEL
386 "wheel,"
387#endif
388#if MOUSE_SLIP_WHEELING
389 "slipwheel,"
390#endif
391#if defined(SMART_RESIZE)
392 "smart-resize,"
393#endif
394#if defined(CURSOR_BLINK)
395 "cursorBlink,"
396#endif
397#if defined(POINTER_BLANK)
398 "pointerBlank,"
399#endif
400#if defined(NO_RESOURCES)
401 "NoResources"
402#endif
403 "\nUsage: "; /* Usage */ 401 "\nUsage: "; /* Usage */
404 402
405#define INDENT 18 403#define INDENT 18
404
405const char rxvt_term::resval_undef [] = "<undef>";
406const char rxvt_term::resval_on [] = "on";
407const char rxvt_term::resval_off [] = "off";
406 408
407/*{{{ usage: */ 409/*{{{ usage: */
408/*----------------------------------------------------------------------*/ 410/*----------------------------------------------------------------------*/
409static void 411static void
410rxvt_usage (int type) 412rxvt_usage (int type)
… …
419 rxvt_log (" [-help] [--help]\n"); 421 rxvt_log (" [-help] [--help]\n");
420 422
421 for (col = 1, i = 0; i < optList_size; i++) 423 for (col = 1, i = 0; i < optList_size; i++)
422 if (optList[i].desc != NULL) 424 if (optList[i].desc != NULL)
423 { 425 {
424 int len = 0; 426 int len = 0;
425 427
426 if (!optList_isBool (i)) 428 if (!optList_isBool (i))
427 { 429 {
428 len = optList_strlen (i); 430 len = optList_strlen (i);
429 if (len > 0) 431 if (len > 0)
… …
496 498
497/*{{{ get command-line options before getting resources */ 499/*{{{ get command-line options before getting resources */
498void 500void
499rxvt_term::get_options (int argc, const char *const *argv) 501rxvt_term::get_options (int argc, const char *const *argv)
500{ 502{
501 int i, bad_option = 0; 503 int i, bad_option = 0;
502 static const char On[3] = "ON", Off[4] = "OFF";
503 504
504 for (i = 1; i < argc; i++) 505 for (i = 1; i < argc; i++)
505 { 506 {
506 unsigned int entry, longopt = 0; 507 unsigned int entry, longopt = 0;
507 const char *flag, *opt; 508 const char *flag, *opt;
508 509
509 opt = argv[i]; 510 opt = argv[i];
510#ifdef DEBUG_RESOURCES 511
511 fprintf (stderr, "argv[%d] = %s: ", i, opt);
512#endif
513 if (*opt == '-') 512 if (*opt == '-')
514 { 513 {
515 flag = On; 514 flag = resval_on;
515
516 if (*++opt == '-') 516 if (*++opt == '-')
517 longopt = *opt++; /* long option */ 517 longopt = *opt++; /* long option */
518 } 518 }
519 else if (*opt == '+') 519 else if (*opt == '+')
520 { 520 {
521 flag = Off; 521 flag = resval_off;
522
522 if (*++opt == '+') 523 if (*++opt == '+')
523 longopt = *opt++; /* long option */ 524 longopt = *opt++; /* long option */
524 } 525 }
525 else 526 else
526 { 527 {
… …
529 continue; 530 continue;
530 } 531 }
531 532
532 if (!strcmp (opt, "help")) 533 if (!strcmp (opt, "help"))
533 rxvt_usage (longopt ? 2 : 1); 534 rxvt_usage (longopt ? 2 : 1);
535
534 if (!strcmp (opt, "h")) 536 if (!strcmp (opt, "h"))
535 rxvt_usage (0); 537 rxvt_usage (0);
536 538
537 /* feature: always try to match long-options */ 539 /* feature: always try to match long-options */
538 for (entry = 0; entry < optList_size; entry++) 540 for (entry = 0; entry < optList_size; entry++)
… …
542 break; 544 break;
543 545
544 if (entry < optList_size) 546 if (entry < optList_size)
545 { 547 {
546 if (optList_isReverse (entry)) 548 if (optList_isReverse (entry))
547 flag = flag == On ? Off : On; 549 flag = flag == resval_on ? resval_off : resval_on;
548 550
549 if (optList_strlen (entry)) 551 if (optList_strlen (entry))
550 { 552 {
551 /* 553 /*
552 * special cases are handled in main.c:main () to allow 554 * special cases are handled in main.c:main () to allow
553 * X resources to set these values before we settle for 555 * X resources to set these values before we settle for
554 * default values 556 * default values
555 */ 557 */
556 558
557 if (optList[entry].doff != -1) 559 if (optList[entry].doff != -1)
560 {
561 if (flag == resval_on && !argv [i+1])
562 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
563
558 rs[optList[entry].doff] = flag == On && argv[i+1] 564 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
559 ? argv[++i] : 0; 565 }
560 } 566 }
561 else 567 else
562 { /* boolean value */ 568 { /* boolean value */
563#ifdef DEBUG_RESOURCES 569 set_option (optList[entry].index, flag == resval_on);
564 fprintf (stderr, "boolean (%s,%s) = %s\n",
565 optList[entry].opt, optList[entry].kw, flag);
566#endif
567 set_option (optList[entry].flag & Optflag_mask, flag == On);
568 570
569 if (optList[entry].doff != -1) 571 if (optList[entry].doff != -1)
570 rs[optList[entry].doff] = flag; 572 rs[optList[entry].doff] = flag;
571 } 573 }
572 } 574 }
… …
604 * "rxvt" "keysym" "0xFF01" 606 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 607 * value will be a string
606 */ 608 */
607/* ARGSUSED */ 609/* ARGSUSED */
608int 610int
609rxvt_define_key (XrmDatabase *database __attribute__((unused)), 611rxvt_define_key (XrmDatabase *database UNUSED,
610 XrmBindingList bindings __attribute__((unused)), 612 XrmBindingList bindings UNUSED,
611 XrmQuarkList quarks, 613 XrmQuarkList quarks,
612 XrmRepresentation *type __attribute__((unused)), 614 XrmRepresentation *type UNUSED,
613 XrmValue *value, 615 XrmValue *value,
614 XPointer closure __attribute__((unused))) 616 XPointer closure UNUSED)
615{ 617{
616 int last; 618 int last;
617 619
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 620 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 621 ;
… …
771} 773}
772 774
773# endif /* KEYSYM_RESOURCE */ 775# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 776#endif /* NO_RESOURCES */
775 777
778static char *
776char *get_res (XrmDatabase database, const char *program, const char *option) 779get_res (XrmDatabase database, const char *program, const char *option)
777{ 780{
778 char resource[512]; 781 char resource[512];
779 char *type; 782 char *type;
780 XrmValue result; 783 XrmValue result;
781 784
… …
783 XrmGetResource (database, resource, resource, &type, &result); 786 XrmGetResource (database, resource, resource, &type, &result);
784 787
785 return result.addr; 788 return result.addr;
786} 789}
787 790
788/*{{{ read the resources files */ 791const char *
789/* 792rxvt_term::x_resource (const char *name)
790 * using XGetDefault () or the hand-rolled replacement 793{
791 */ 794 XrmDatabase database = XrmGetDatabase (dpy);
792/* ARGSUSED */ 795
796 const char *p = get_res (database, rs[Rs_name], name);
797 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
798
799 if (p == NULL || (p0 && strcmp (p, p0) == 0))
800 {
801 p = get_res (database, RESCLASS, name);
802#ifdef RESFALLBACK
803 if (p == NULL || (p0 && strcmp (p, p0) == 0))
804 p = get_res (database, RESFALLBACK, name);
805#endif
806 }
807
808 if (p == NULL && p0)
809 p = p0;
810
811 return p;
812}
813
793void 814void
794rxvt_term::extract_resources () 815rxvt_term::extract_resources ()
795{ 816{
796 dDisp;
797
798#ifndef NO_RESOURCES 817#ifndef NO_RESOURCES
799 XrmDatabase database = XrmGetDatabase (display->display);
800
801 /* 818 /*
802 * Query resources for options that affect us 819 * Query resources for options that affect us
803 */ 820 */
804 for (int entry = 0; entry < optList_size; entry++) 821 for (int entry = 0; entry < optList_size; entry++)
805 { 822 {
806 int s; 823 int s;
807 char *p, *p0;
808 const char *kw = optList[entry].kw; 824 const char *kw = optList[entry].kw;
809 825
810 if (kw == NULL || rs[optList[entry].doff] != NULL) 826 if (kw == NULL || rs[optList[entry].doff] != NULL)
811 continue; // previously set 827 continue; // previously set
812 828
813 p = get_res (database, rs[Rs_name], kw); 829 const char *p = x_resource (kw);
814 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
815 if (p == NULL || (p0 && strcmp (p, p0) == 0))
816 {
817 p = get_res (database, RESCLASS, kw);
818#ifdef RESFALLBACK
819 if (p == NULL || (p0 && strcmp (p, p0) == 0))
820 p = get_res (database, RESFALLBACK, kw);
821#endif
822 }
823
824 if (p == NULL && p0)
825 p = p0;
826 830
827 if (p) 831 if (p)
828 { 832 {
829 p = strdup (p); 833 p = strdup (p);
830 allocated.push_back (p); 834 allocated.push_back ((void *)p);
831 rs[optList[entry].doff] = p; 835 rs[optList[entry].doff] = p;
832 836
833 if (optList_isBool (entry)) 837 if (optList_isBool (entry))
834 { 838 {
835 s = strcasecmp (p, "TRUE") == 0 839 s = strcasecmp (p, "TRUE") == 0
… …
838 || strcasecmp (p, "1") == 0; 842 || strcasecmp (p, "1") == 0;
839 843
840 if (optList_isReverse (entry)) 844 if (optList_isReverse (entry))
841 s = !s; 845 s = !s;
842 846
843 set_option (optList[entry].flag & Optflag_mask, s); 847 set_option (optList[entry].index, s);
844 } 848 }
845 } 849 }
846 } 850 }
847 851
848 /* 852 /*
849 * [R5 or later]: enumerate the resource database 853 * [R5 or later]: enumerate the resource database
850 */ 854 */
851# ifdef KEYSYM_RESOURCE 855# ifdef KEYSYM_RESOURCE
856 XrmDatabase database = XrmGetDatabase (dpy);
852 XrmName name_prefix[3]; 857 XrmName name_prefix[3];
853 XrmClass class_prefix[3]; 858 XrmClass class_prefix[3];
854 859
855 name_prefix[0] = XrmStringToName (rs[Rs_name]); 860 name_prefix[0] = XrmStringToName (rs[Rs_name]);
856 name_prefix[1] = XrmStringToName ("keysym"); 861 name_prefix[1] = XrmStringToName ("keysym");
… …
873# endif 878# endif
874 879
875#endif /* NO_RESOURCES */ 880#endif /* NO_RESOURCES */
876} 881}
877 882
878/*}}} */
879/*----------------------- end-of-file (C source) -----------------------*/ 883/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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