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.104 by sasha, Fri Jun 8 20:41:01 2007 UTC vs.
Revision 1.166 by root, Tue Jun 5 19:32:29 2012 UTC

… …
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>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
32#endif 33#endif
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 36#define Optflag_Reverse 1
36#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4
39#define Optflag_Info 8
37 40
38/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
39/* 42/*
40 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
42 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
43 */ 46 */
44 47
45/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
46#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
47 {0, 0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
48 54
49/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
50#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
51 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
52 58
… …
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 65 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 66
61/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
63 { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 70
65/* convenient macros */ 71/* convenient macros */
66#define optList_strlen(i) \ 72#define optList_isString(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
68#define optList_isBool(i) \ 74#define optList_isBool(i) \
69 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
70#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
71 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
72#define optList_size \ 78#define optList_isInfo(i) \
73 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
74 80
75static const struct 81static const struct
76 { 82 {
77 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
78 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 108 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 109 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT 116#if ENABLE_TRANSPARENCY
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif 120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
116#endif 122#endif
117#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 126#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 128#ifndef NO_BELL
126# if ENABLE_FRILLS 129# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 130 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
169#ifndef NO_BOLD_UNDERLINE_REVERSE 172#ifndef NO_BOLD_UNDERLINE_REVERSE
170 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 173 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 174 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 175 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#if ENABLE_FRILLS 178#if ENABLE_FRILLS
176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
177#endif 180#endif
178#ifdef KEEP_SCROLLCOLOR
179 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
180 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
181#endif /* KEEP_SCROLLCOLOR */ 184#endif
182#ifdef OPTION_HC 185#ifdef OPTION_HC
183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
187 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
184#endif 188#endif
185#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
187 /* command-line option = resource name */ 191 /* command-line option = resource name */
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef XPM_BACKGROUND 197#if BG_IMAGE_FROM_FILE
194 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200# if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
196#endif 203#endif
197 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
199#if ENABLE_STYLES 206#if ENABLE_STYLES
200 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
201 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
202 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
203 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
204#endif 211#endif
205#ifdef USE_XIM 212#if USE_XIM
206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
207 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
208 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
209 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
210#endif /* USE_XIM */ 217#endif /* USE_XIM */
211 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 218 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
212 STRG (Rs_title, "title", "title", "string", "title name for window"), 219 STRG (Rs_title, "title", "title", "string", "title name for window"),
213 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 220 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 221 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
215 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
216#if ENABLE_XEMBED 223#if ENABLE_XEMBED
217 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
218#endif 225#endif
219#if XFT 226#if XFT
220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
221#endif 229#endif
222#if ENABLE_FRILLS 230#if ENABLE_FRILLS
223 RSTRG (Rs_transient_for, "transient-for", "windowid"), 231 RSTRG (Rs_transient_for, "transient-for", "windowid"),
224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 232 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"), 233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif
243#ifdef BUILTIN_GLYPHS
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 244 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"),
234#endif 245#endif
235#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 248#endif
238#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 251#endif
241#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 254#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 255#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 257#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 264#endif
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 266 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 267 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 268 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"), 269 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 270#endif
263 271#if ISO_14755
264#ifdef HAVE_AFTERIMAGE 272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
267#endif 274#endif
268#ifndef NO_RESOURCES 275#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"), 276 RINFO ("xrm", "string"),
277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
270#endif 280#endif
271 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
272 }; 282 };
273 283
274#undef INFO 284#undef INFO
285#undef RINFO
275#undef STRG 286#undef STRG
276#undef RSTRG 287#undef RSTRG
277#undef SWCH 288#undef SWCH
278#undef BOOL 289#undef BOOL
279 290
… …
318#endif 329#endif
319 "," 330 ","
320#if OFF_FOCUS_FADING 331#if OFF_FOCUS_FADING
321 "fade," 332 "fade,"
322#endif 333#endif
323#if defined(XPM_BACKGROUND)
324 "XPM,"
325#endif
326#if defined(TRANSPARENT) 334#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 335 "transparent,"
328#endif
329#if TINTING
330 "tint," 336 "tint,"
337#endif
338#if HAVE_PIXBUF
339 "pixbuf,"
331#endif 340#endif
332#if defined(USE_XIM) 341#if defined(USE_XIM)
333 "XIM," 342 "XIM,"
334#endif 343#endif
335#if defined(NO_BACKSPACE_KEY) 344#if defined(NO_BACKSPACE_KEY)
… …
363 "pointerBlank," 372 "pointerBlank,"
364#endif 373#endif
365#if defined(NO_RESOURCES) 374#if defined(NO_RESOURCES)
366 "NoResources," 375 "NoResources,"
367#endif 376#endif
368 "scrollbars=" 377 "scrollbars=plain"
369#if !defined(HAVE_SCROLLBARS)
370 "NONE"
371#else
372# if defined(PLAIN_SCROLLBAR)
373 "plain"
374# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
375 "+"
376# endif
377# endif
378# if defined(RXVT_SCROLLBAR) 378#if defined(RXVT_SCROLLBAR)
379 "rxvt" 379 "+rxvt"
380# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
381 "+"
382# endif
383# endif 380#endif
384# if defined(NEXT_SCROLLBAR) 381#if defined(NEXT_SCROLLBAR)
385 "NeXT" 382 "+NeXT"
386# if defined(XTERM_SCROLLBAR)
387 "+"
388# endif
389# endif 383#endif
390# if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
391 "xterm" 385 "+xterm"
392# endif
393#endif 386#endif
394 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
395 388
396#define INDENT 18 389#define INDENT 18
397 390
… …
399const char rxvt_term::resval_on [] = "on"; 392const char rxvt_term::resval_on [] = "on";
400const char rxvt_term::resval_off [] = "off"; 393const char rxvt_term::resval_off [] = "off";
401 394
402/*{{{ usage: */ 395/*{{{ usage: */
403/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
404static void 397void
405rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
406{ 399{
407 unsigned int i, col; 400 unsigned int i, col;
408 401
409 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
410 403
411 switch (type) 404 switch (type)
412 { 405 {
413 case 0: /* brief listing */ 406 case 0: /* brief listing */
414 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
415 408
416 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
417 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
418 { 411 {
419 int len = 0; 412 int len = 0;
420 413
421 if (!optList_isBool (i)) 414 if (optList[i].arg)
415 len = strlen (optList[i].arg) + 1;
416
417 assert (optList[i].opt != NULL);
418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
419 col += len;
420
421 if (col > 79)
422 { 422 {
423 len = optList_strlen (i);
424 if (len > 0)
425 len++; /* account for space */
426 }
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL);
429#endif
430 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
431 col += len;
432 if (col > 79)
433 { /* assume regular width */ 423 /* assume regular width */
434 rxvt_log ("\n"); 424 rxvt_log ("\n");
435 col = 1 + len; 425 col = 1 + len;
436 } 426 }
437 427
438 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
439 if (optList_strlen (i)) 430 if (optList[i].arg)
440 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
441 else 432 else
442 rxvt_log ("]"); 433 rxvt_log ("]");
443 } 434 }
444 break; 435 break;
445 436
446 case 1: /* full command-line listing */ 437 case 1: /* full command-line listing */
447 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 438 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
448 439
449 for (i = 0; i < optList_size; i++) 440 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].desc != NULL) 441 if (optList[i].desc != NULL)
451 { 442 {
452#ifdef DEBUG_STRICT
453 assert (optList[i].opt != NULL); 443 assert (optList[i].opt != NULL);
454#endif
455 rxvt_log (" %s%s %-*s%s%s\n", 444 rxvt_log (" %s%s %-*s%s%s\n",
456 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 445 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
457 (INDENT - strlen (optList[i].opt) 446 (INDENT - strlen (optList[i].opt)
458 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
459 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
… …
465 454
466 case 2: /* full resource listing */ 455 case 2: /* full resource listing */
467 rxvt_log (" [options] [-e command args]\n\n" 456 rxvt_log (" [options] [-e command args]\n\n"
468 "where resources (long-options) include:\n"); 457 "where resources (long-options) include:\n");
469 458
470 for (i = 0; i < optList_size; i++) 459 for (i = 0; i < ecb_array_length (optList); i++)
471 if (optList[i].kw != NULL) 460 if (optList[i].kw != NULL)
472 rxvt_log (" %s: %*s%s\n", 461 rxvt_log (" %s: %*s%s\n",
473 optList[i].kw, 462 optList[i].kw,
474 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 463 (INDENT - strlen (optList[i].kw)), "", /* XXX */
475 (optList_isBool (i) ? "boolean" : optList[i].arg)); 464 (optList_isBool (i) ? "boolean" : optList[i].arg));
476#ifdef KEYSYM_RESOURCE
477 rxvt_log (" " "keysym.sym" ": %*s%s\n",
478 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
479 "keysym");
480#endif
481 rxvt_log ("\n -help to list options"); 465 rxvt_log ("\n -help to list options");
482 break; 466 break;
483 } 467 }
484 468
469#if ENABLE_PERL
470 if (type) // do not initialise perl for type == 0, as perl does not have "short" options
471 {
472 rxvt_perl.init (this);
473 rxvt_perl.usage (type);
474 }
475#endif
476
485 rxvt_log ("\n\n"); 477 rxvt_log ("\n\n");
486 rxvt_exit_failure (); 478 rxvt_exit_failure ();
487 /* NOTREACHED */
488} 479}
489 480
490/*}}} */ 481/*}}} */
491 482
492/*{{{ get command-line options before getting resources */ 483/*{{{ get command-line options before getting resources */
493void 484const char **
494rxvt_term::get_options (int argc, const char *const *argv) 485rxvt_term::get_options (int argc, const char *const *argv)
495{ 486{
496 int i, bad_option = 0; 487 int i, bad_option = 0;
497 488
498 for (i = 1; i < argc; i++) 489 for (i = 1; i < argc; i++)
499 { 490 {
500 unsigned int entry, longopt = 0; 491 unsigned int entry, longopt = 0;
501 const char *flag, *opt; 492 const char *opt;
493 int flag;
502 494
503 opt = argv[i]; 495 opt = argv[i];
504 496
505 if (*opt == '-') 497 if (*opt == '-')
506 { 498 {
507 flag = resval_on; 499 flag = 1;
508 500
509 if (*++opt == '-') 501 if (*++opt == '-')
510 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
511 } 503 }
512 else if (*opt == '+') 504 else if (*opt == '+')
513 { 505 {
514 flag = resval_off; 506 flag = 0;
515 507
516 if (*++opt == '+') 508 if (*++opt == '+')
517 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
518 } 510 }
519 else 511 else
… …
528 520
529 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
530 rxvt_usage (0); 522 rxvt_usage (0);
531 523
532 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
533 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < ecb_array_length (optList); entry++)
534 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 526 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
535 || (!longopt 527 || (!longopt
536 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 528 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
537 break; 529 break;
538 530
539 if (entry < optList_size) 531 if (entry < ecb_array_length (optList)
532 && !optList_isInfo (entry))
540 { 533 {
541 if (optList_isReverse (entry)) 534 if (optList_isReverse (entry))
542 flag = flag == resval_on ? resval_off : resval_on; 535 flag = !flag;
543 536
544 if (optList_strlen (entry)) 537 if (optList_isString (entry))
545 { 538 {
546 /* 539 /*
547 * special cases are handled in main.c:main () to allow 540 * special cases are handled in init_resources () to allow
548 * X resources to set these values before we settle for 541 * X resources to set these values before we settle for
549 * default values 542 * default values
550 */ 543 */
544
551 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
552 { 546 {
553 if (flag == resval_on && !argv [i+1]) 547 if (flag && i+1 == argc)
554 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 548 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
555 549
556 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 550 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
557 } 551 }
558 } 552 }
559 else 553 else
554 {
560 { /* boolean value */ 555 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 556 set_option (optList[entry].index, flag);
562 557
563 if (optList[entry].doff != -1) 558 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 559 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 560 }
566 } 561 }
562#ifndef NO_RESOURCES
563 else if (!strcmp (opt, "xrm"))
564 {
565 if (i+1 < argc)
566 XrmPutLineResource (&option_db, argv[++i]);
567 }
568#endif
569#ifdef KEYSYM_RESOURCE
570 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
571 {
572 if (i+1 < argc)
573 {
574 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
575 sprintf (res, "*.%s: %s\n", opt, argv[i]);
576 XrmPutLineResource (&option_db, res);
577 }
578 }
579#endif
580 else if (!strcmp (opt, "e"))
581 {
582 if (i+1 == argc)
583 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
584
585 return (const char **)argv + i + 1;
586 }
567 else 587 else
568#ifdef KEYSYM_RESOURCE 588 {
569 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 589#if ENABLE_PERL
570 if (rxvt_Str_match (opt, "keysym.")) 590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1]))
571 { 593 {
572 const char *str = argv[++i]; 594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN))
595 {
596 if (flag && i + 1 == argc)
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
573 598
574 if (str != NULL) 599 ++i;
575 parse_keysym (opt + sizeof ("keysym.") - 1, str); 600 }
576 } 601 }
577 else 602 else
578#endif 603#endif
579 { 604 {
580 bad_option = 1; 605 bad_option = 1;
581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
582 } 607 }
608 }
583 } 609 }
584 610
585 if (bad_option) 611 if (bad_option)
586 rxvt_usage (0); 612 rxvt_usage (0);
613
614 return 0;
587} 615}
588 616
589/*}}} */ 617/*}}} */
590 618
591#ifndef NO_RESOURCES 619#ifndef NO_RESOURCES
… …
596 * Define key from XrmEnumerateDatabase. 624 * Define key from XrmEnumerateDatabase.
597 * quarks will be something like 625 * quarks will be something like
598 * "rxvt" "keysym" "0xFF01" 626 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 627 * value will be a string
600 */ 628 */
601/* ARGSUSED */ 629static int
602int
603rxvt_define_key (XrmDatabase *database UNUSED, 630rxvt_define_key (XrmDatabase *database ecb_unused,
604 XrmBindingList bindings UNUSED, 631 XrmBindingList bindings ecb_unused,
605 XrmQuarkList quarks, 632 XrmQuarkList quarks,
606 XrmRepresentation *type UNUSED, 633 XrmRepresentation *type ecb_unused,
607 XrmValue *value, 634 XrmValue *value,
608 XPointer closure UNUSED) 635 XPointer closure ecb_unused)
609{ 636{
610 int last; 637 int last;
611 638
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 639 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
613 ; 640 ;
… …
618} 645}
619 646
620/* 647/*
621 * look for something like this (XK_Delete) 648 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 649 * rxvt*keysym.0xFFFF: "\177"
623 *
624 * arg will be
625 * NULL for ~/.Xdefaults and
626 * non-NULL for command-line options (need to allocate)
627 */ 650 */
628#define NEWARGLIM 500 /* `reasonable' size */
629 651
630struct keysym_vocabulary_t 652struct keysym_vocabulary_t
631{ 653{
632 const char *name; 654 const char *name;
633 unsigned short len; 655 unsigned short len;
634 unsigned short value; 656 unsigned short value;
635}; 657};
636keysym_vocabulary_t keysym_vocabulary[] = 658static const keysym_vocabulary_t keysym_vocabulary[] =
637{ 659{
638 { "ISOLevel3", 9, Level3Mask }, 660 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask }, 661 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask }, 662 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask }, 663 { "NumLock", 7, NumLockMask },
… …
663}; 685};
664 686
665int 687int
666rxvt_term::parse_keysym (const char *str, const char *arg) 688rxvt_term::parse_keysym (const char *str, const char *arg)
667{ 689{
668 int n, sym; 690 int sym;
669 unsigned int state = 0; 691 unsigned int state = 0;
670 const char *pmodend = NULL; 692 const char *key = strrchr (str, '-');
671 char *newarg = NULL;
672 char newargstr[NEWARGLIM];
673 693
674 if (arg == NULL) 694 if (!key)
675 { 695 key = str;
676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
677 return 0;
678
679 str += n; /* skip `keysym.' */
680 if (!(pmodend = strchr (str, ':')))
681 return -1;
682 }
683 else 696 else
684 pmodend = str + strlen(str); 697 key++;
685 698
686 for (--pmodend; str < pmodend; --pmodend) 699 // string or key is empty
687 if (*pmodend == '-') 700 if (*arg == '\0' || *key == '\0')
688 break; 701 return -1;
689 702
703 // parse modifiers
690 while (str < pmodend) 704 while (str < key)
691 { 705 {
692 unsigned int i; 706 unsigned int i;
693 707
694 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 708 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
695 { 709 {
696 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 710 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
697 { 711 {
698 state |= keysym_vocabulary[i].value; 712 state |= keysym_vocabulary[i].value;
699 str += keysym_vocabulary[i].len; 713 str += keysym_vocabulary[i].len;
700 break; 714 break;
701 } 715 }
702 } 716 }
703 717
704 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 718 if (i >= ecb_array_length (keysym_vocabulary))
705 return -1; 719 return -1;
706 720
707 if (*str == '-') 721 if (*str == '-')
708 ++str; 722 ++str;
709 } 723 }
710 724
711 /* some scanf () have trouble with a 0x prefix */ 725 // convert keysym name to keysym number
712 if (str[0] == '0' && toupper (str[1]) == 'X') 726 if ((sym = XStringToKeysym (str)) == None)
713 { 727 {
714 str += 2; 728 // fallback on hexadecimal parsing
715 729 char *end;
730 sym = strtol (str, &end, 16);
716 if (arg) 731 if (*end)
717 {
718 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
719 return -1;
720 }
721 else
722 {
723 if (sscanf (str, "%x:", &sym) != 1)
724 return -1;
725
726 /* cue to ':', it's there since sscanf () worked */
727 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
728 newargstr[NEWARGLIM - 1] = '\0';
729 newarg = newargstr;
730 }
731 }
732 else
733 {
734 /*
735 * convert keysym name to keysym number
736 */
737 strncpy (newargstr, str, NEWARGLIM - 1);
738 newargstr[NEWARGLIM - 1] = '\0';
739
740 if (arg == NULL)
741 {
742 if ((newarg = strchr (newargstr, ':')) == NULL)
743 return -1;
744
745 *newarg++ = '\0'; /* terminate keysym name */
746 }
747
748 if ((sym = XStringToKeysym (newargstr)) == None)
749 return -1; 732 return -1;
750 } 733 }
751 734
752 if (newarg == NULL) 735 wchar_t *ws = rxvt_mbstowcs (arg);
753 { 736 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
754 strncpy (newargstr, arg, NEWARGLIM - 1);
755 newargstr[NEWARGLIM - 1] = '\0';
756 newarg = newargstr;
757 }
758
759 rxvt_Str_trim (newarg);
760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
761 return -1;
762
763 keyboard->register_user_translation (sym, state, newarg); 737 keyboard->register_user_translation (sym, state, ws);
738 free (ws);
764 return 1; 739 return 1;
765} 740}
766 741
767# endif /* KEYSYM_RESOURCE */ 742# endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */ 743#endif /* NO_RESOURCES */
769 744
770static char * 745static char *
771get_res (XrmDatabase database, const char *program, const char *option) 746get_res (XrmDatabase database, const char *program, const char *option)
772{ 747{
773 char resource[512]; 748 char resource[512];
… …
805 780
806void 781void
807rxvt_term::extract_resources () 782rxvt_term::extract_resources ()
808{ 783{
809#ifndef NO_RESOURCES 784#ifndef NO_RESOURCES
785 XrmDatabase database = XrmGetDatabase (dpy);
786 XrmMergeDatabases (option_db, &database);
787 option_db = NULL;
810 /* 788 /*
811 * Query resources for options that affect us 789 * Query resources for options that affect us
812 */ 790 */
813 for (int entry = 0; entry < optList_size; entry++) 791 for (int entry = 0; entry < ecb_array_length (optList); entry++)
814 { 792 {
815 int s;
816 const char *kw = optList[entry].kw; 793 const char *kw = optList[entry].kw;
817 794
818 if (kw == NULL || rs[optList[entry].doff] != NULL) 795 if (kw == NULL || rs[optList[entry].doff] != NULL)
819 continue; // previously set 796 continue; // previously set
820 797
… …
826 allocated.push_back ((void *)p); 803 allocated.push_back ((void *)p);
827 rs[optList[entry].doff] = p; 804 rs[optList[entry].doff] = p;
828 805
829 if (optList_isBool (entry)) 806 if (optList_isBool (entry))
830 { 807 {
831 s = strcasecmp (p, "TRUE") == 0 808 bool s = parse_bool_resource (p);
832 || strcasecmp (p, "YES") == 0
833 || strcasecmp (p, "ON") == 0
834 || strcasecmp (p, "1") == 0;
835 809
836 if (optList_isReverse (entry)) 810 if (optList_isReverse (entry))
837 s = !s; 811 s = !s;
838 812
839 set_option (optList[entry].index, s); 813 set_option (optList[entry].index, s);
840 } 814 }
841 } 815 }
842 } 816 }
817#endif /* NO_RESOURCES */
818}
843 819
820void
821rxvt_term::extract_keysym_resources ()
822{
823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
824 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
825#endif
826}
827
828#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
829void
830rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
831 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
832{
844 /* 833 /*
845 * [R5 or later]: enumerate the resource database 834 * [R5 or later]: enumerate the resource database
846 */ 835 */
847# ifdef KEYSYM_RESOURCE
848 XrmDatabase database = XrmGetDatabase (dpy); 836 XrmDatabase database = XrmGetDatabase (dpy);
849 XrmName name_prefix[3]; 837 XrmName name_prefix[3];
850 XrmClass class_prefix[3]; 838 XrmClass class_prefix[3];
851 839
852 name_prefix[0] = XrmStringToName (rs[Rs_name]); 840 name_prefix[0] = XrmStringToName (rs[Rs_name]);
853 name_prefix[1] = XrmStringToName ("keysym"); 841 name_prefix[1] = XrmStringToName (n_prefix);
854 name_prefix[2] = NULLQUARK; 842 name_prefix[2] = NULLQUARK;
855 class_prefix[0] = XrmStringToName (RESCLASS); 843 class_prefix[0] = XrmStringToName (RESCLASS);
856 class_prefix[1] = XrmStringToName ("Keysym"); 844 class_prefix[1] = XrmStringToName (c_prefix);
857 class_prefix[2] = NULLQUARK; 845 class_prefix[2] = NULLQUARK;
858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
859 XrmEnumerateDatabase (database, name_prefix, class_prefix, 847 XrmEnumerateDatabase (database, name_prefix, class_prefix,
860 XrmEnumOneLevel, rxvt_define_key, NULL); 848 mode, proc, NULL);
861# ifdef RESFALLBACK 849# ifdef RESFALLBACK
862 name_prefix[0] = XrmStringToName (RESFALLBACK);
863 name_prefix[1] = XrmStringToName ("keysym");
864 class_prefix[0] = XrmStringToName (RESFALLBACK); 850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
865 class_prefix[1] = XrmStringToName ("Keysym");
866 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
867 XrmEnumerateDatabase (database, name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
868 XrmEnumOneLevel, rxvt_define_key, NULL); 853 mode, proc, NULL);
869# endif 854# endif
870# endif
871
872#endif /* NO_RESOURCES */
873} 855}
856#endif
874 857
875/*----------------------- end-of-file (C source) -----------------------*/ 858/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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