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.192 by sf-exg, Thu Jul 14 05:33:26 2016 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,2015 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 3 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
15 * 16 *
16 * This program is distributed in the hope that it will be useful, 17 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 107 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 110 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"), 111 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 112 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 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"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif
116#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 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"), 120 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 121#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 123#ifndef NO_BELL
126# if ENABLE_FRILLS 124# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
169#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
170 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#if ENABLE_FRILLS 173#if ENABLE_FRILLS
176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
177#endif 175#endif
178#ifdef KEEP_SCROLLCOLOR
179 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
180 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
181#endif /* KEEP_SCROLLCOLOR */ 179#endif
182#ifdef OPTION_HC 180#ifdef OPTION_HC
183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
184#endif 183#endif
185#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
187 /* command-line option = resource name */ 186 /* command-line option = resource name */
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef XPM_BACKGROUND 192#if ENABLE_EWMH
194 RSTRG (Rs_path, "path", "search path"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
196#endif 197#endif
197 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
199#if ENABLE_STYLES 200#if ENABLE_STYLES
200 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
201 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
202 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
203 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
204#endif 205#endif
205#ifdef USE_XIM 206#if USE_XIM
206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
207 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 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"), 209 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"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
210#endif /* USE_XIM */ 211#endif /* USE_XIM */
211 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 212 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
212 STRG (Rs_title, "title", "title", "string", "title name for window"), 213 STRG (Rs_title, "title", "title", "string", "title name for window"),
213 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 214 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 215 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
215 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
216#if ENABLE_XEMBED 217#if ENABLE_XEMBED
217 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
218#endif 219#endif
219#if XFT 220#if XFT
221 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
222#endif
223#if ENABLE_FRILLS
220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
221#endif 225 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
222#if ENABLE_FRILLS
223 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 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"), 227 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"), 228 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 229 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"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
237#endif
238#ifdef BUILTIN_GLYPHS
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 239 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 240#endif
235#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 243#endif
238#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 246#endif
241#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 249#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 250#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 251 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 252#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 253 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 254 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 255 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 256#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 258 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 259#endif
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 261 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 262 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 263 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"), 264 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 265#endif
263 266#if ISO_14755
264#ifdef HAVE_AFTERIMAGE 267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 268 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 269#endif
268#ifndef NO_RESOURCES 270#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"), 271 RINFO ("xrm", "string"),
272#endif
273#ifdef KEYSYM_RESOURCE
274 RINFO ("keysym.sym", "keysym"),
270#endif 275#endif
271 INFO ("e", "command arg ...", "command to execute") 276 INFO ("e", "command arg ...", "command to execute")
272 }; 277 };
273 278
274#undef INFO 279#undef INFO
280#undef RINFO
275#undef STRG 281#undef STRG
276#undef RSTRG 282#undef RSTRG
277#undef SWCH 283#undef SWCH
278#undef BOOL 284#undef BOOL
279 285
… …
318#endif 324#endif
319 "," 325 ","
320#if OFF_FOCUS_FADING 326#if OFF_FOCUS_FADING
321 "fade," 327 "fade,"
322#endif 328#endif
323#if defined(XPM_BACKGROUND)
324 "XPM,"
325#endif
326#if defined(TRANSPARENT) 329#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 330 "transparent,"
328#endif
329#if TINTING
330 "tint," 331 "tint,"
332#endif
333#if HAVE_PIXBUF
334 "pixbuf,"
331#endif 335#endif
332#if defined(USE_XIM) 336#if defined(USE_XIM)
333 "XIM," 337 "XIM,"
334#endif 338#endif
335#if defined(NO_BACKSPACE_KEY) 339#if defined(NO_BACKSPACE_KEY)
… …
363 "pointerBlank," 367 "pointerBlank,"
364#endif 368#endif
365#if defined(NO_RESOURCES) 369#if defined(NO_RESOURCES)
366 "NoResources," 370 "NoResources,"
367#endif 371#endif
368 "scrollbars=" 372 "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) 373#if defined(RXVT_SCROLLBAR)
379 "rxvt" 374 "+rxvt"
380# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
381 "+"
382# endif
383# endif 375#endif
384# if defined(NEXT_SCROLLBAR) 376#if defined(NEXT_SCROLLBAR)
385 "NeXT" 377 "+NeXT"
386# if defined(XTERM_SCROLLBAR)
387 "+"
388# endif
389# endif 378#endif
390# if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
391 "xterm" 380 "+xterm"
392# endif
393#endif 381#endif
394 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
395 383
396#define INDENT 18 384#define INDENT 28
397 385
398const char rxvt_term::resval_undef [] = "<undef>"; 386const char rxvt_term::resval_undef [] = "<undef>";
399const char rxvt_term::resval_on [] = "on"; 387const char rxvt_term::resval_on [] = "on";
400const char rxvt_term::resval_off [] = "off"; 388const char rxvt_term::resval_off [] = "off";
401 389
402/*{{{ usage: */ 390/*{{{ usage: */
403/*----------------------------------------------------------------------*/ 391/*----------------------------------------------------------------------*/
404static void 392void
405rxvt_usage (int type) 393rxvt_term::rxvt_usage (int type)
406{ 394{
407 unsigned int i, col; 395 unsigned int i, col;
408 396
409 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 397 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
410 398
411 switch (type) 399 switch (type)
412 { 400 {
413 case 0: /* brief listing */ 401 case 0: /* brief listing */
414 rxvt_log (" [-help] [--help]\n"); 402 rxvt_log (" [-help] [--help]\n");
415 403
416 for (col = 1, i = 0; i < optList_size; i++) 404 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
417 if (optList[i].desc != NULL) 405 if (optList[i].desc != NULL)
418 { 406 {
419 int len = 0; 407 int len = 0;
420 408
421 if (!optList_isBool (i)) 409 if (optList[i].arg)
410 len = strlen (optList[i].arg) + 1;
411
412 assert (optList[i].opt != NULL);
413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
414 col += len;
415
416 if (col > 79)
422 { 417 {
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 */ 418 /* assume regular width */
434 rxvt_log ("\n"); 419 rxvt_log ("\n");
435 col = 1 + len; 420 col = 1 + len;
436 } 421 }
437 422
438 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 423 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
424
439 if (optList_strlen (i)) 425 if (optList[i].arg)
440 rxvt_log (" %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
441 else 427 else
442 rxvt_log ("]"); 428 rxvt_log ("]");
443 } 429 }
444 break; 430 break;
445 431
446 case 1: /* full command-line listing */ 432 case 1: /* full command-line listing */
447 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
448 434
449 for (i = 0; i < optList_size; i++) 435 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].desc != NULL) 436 if (optList[i].desc != NULL)
451 { 437 {
452#ifdef DEBUG_STRICT
453 assert (optList[i].opt != NULL); 438 assert (optList[i].opt != NULL);
454#endif
455 rxvt_log (" %s%s %-*s%s%s\n", 439 rxvt_log (" %s%s %-*s%s%s\n",
456 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 440 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
457 (INDENT - strlen (optList[i].opt) 441 (INDENT - strlen (optList[i].opt)
458 + (optList_isBool (i) ? 0 : 2)), 442 + (optList_isBool (i) ? 0 : 2)),
459 (optList[i].arg ? optList[i].arg : ""), 443 (optList[i].arg ? optList[i].arg : ""),
460 (optList_isBool (i) ? "turn on/off " : ""), 444 (optList_isBool (i) ? "turn on/off " : ""),
461 optList[i].desc); 445 optList[i].desc);
462 } 446 }
447
448#if ENABLE_PERL
449 rxvt_perl.init (this);
450 rxvt_perl.usage (this, 1);
451#endif
452
463 rxvt_log ("\n --help to list long-options"); 453 rxvt_log ("\n --help to list long-options");
464 break; 454 break;
465 455
466 case 2: /* full resource listing */ 456 case 2: /* full resource listing */
467 rxvt_log (" [options] [-e command args]\n\n" 457 rxvt_log (" [options] [-e command args]\n\n"
468 "where resources (long-options) include:\n"); 458 "where resources (long-options) include:\n");
469 459
470 for (i = 0; i < optList_size; i++) 460 for (i = 0; i < ecb_array_length (optList); i++)
471 if (optList[i].kw != NULL) 461 if (optList[i].kw != NULL)
472 rxvt_log (" %s: %*s%s\n", 462 rxvt_log (" %s: %*s%s\n",
473 optList[i].kw, 463 optList[i].kw,
474 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 464 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
475 (optList_isBool (i) ? "boolean" : optList[i].arg)); 465 (optList_isBool (i) ? "boolean" : optList[i].arg));
476#ifdef KEYSYM_RESOURCE 466
477 rxvt_log (" " "keysym.sym" ": %*s%s\n", 467#if ENABLE_PERL
478 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 468 rxvt_perl.init (this);
479 "keysym"); 469 rxvt_perl.usage (this, 2);
480#endif 470#endif
471
481 rxvt_log ("\n -help to list options"); 472 rxvt_log ("\n -help to list options");
482 break; 473 break;
483 } 474 }
484 475
485 rxvt_log ("\n\n"); 476 rxvt_log ("\n\n");
486 rxvt_exit_failure (); 477 rxvt_exit_failure ();
487 /* NOTREACHED */
488} 478}
489 479
490/*}}} */ 480/*}}} */
491 481
492/*{{{ get command-line options before getting resources */ 482/*{{{ get command-line options before getting resources */
493void 483const char **
494rxvt_term::get_options (int argc, const char *const *argv) 484rxvt_term::get_options (int argc, const char *const *argv)
495{ 485{
496 int i, bad_option = 0; 486 int i, bad_option = 0;
497 487
498 for (i = 1; i < argc; i++) 488 for (i = 1; i < argc; i++)
499 { 489 {
500 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
501 const char *flag, *opt; 491 const char *opt;
492 int flag;
502 493
503 opt = argv[i]; 494 opt = argv[i];
504 495
505 if (*opt == '-') 496 if (*opt == '-')
506 { 497 {
507 flag = resval_on; 498 flag = 1;
508 499
509 if (*++opt == '-') 500 if (*++opt == '-')
510 longopt = *opt++; /* long option */ 501 longopt = *opt++; /* long option */
511 } 502 }
512 else if (*opt == '+') 503 else if (*opt == '+')
513 { 504 {
514 flag = resval_off; 505 flag = 0;
515 506
516 if (*++opt == '+') 507 if (*++opt == '+')
517 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
518 } 509 }
519 else 510 else
… …
528 519
529 if (!strcmp (opt, "h")) 520 if (!strcmp (opt, "h"))
530 rxvt_usage (0); 521 rxvt_usage (0);
531 522
532 /* feature: always try to match long-options */ 523 /* feature: always try to match long-options */
533 for (entry = 0; entry < optList_size; entry++) 524 for (entry = 0; entry < ecb_array_length (optList); entry++)
534 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 525 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
535 || (!longopt 526 || (!longopt
536 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 527 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
537 break; 528 break;
538 529
539 if (entry < optList_size) 530 if (entry < ecb_array_length (optList)
531 && !optList_isInfo (entry))
540 { 532 {
541 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
542 flag = flag == resval_on ? resval_off : resval_on; 534 flag = !flag;
543 535
544 if (optList_strlen (entry)) 536 if (optList_isString (entry))
545 { 537 {
546 /* 538 /*
547 * special cases are handled in main.c:main () to allow 539 * special cases are handled in init_resources () to allow
548 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
549 * default values 541 * default values
550 */ 542 */
543
551 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
552 { 545 {
553 if (flag == resval_on && !argv [i+1]) 546 if (flag && i + 1 == argc)
554 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 547 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
555 548
556 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 549 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
557 } 550 }
558 } 551 }
559 else 552 else
553 {
560 { /* boolean value */ 554 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 555 set_option (optList[entry].index, flag);
562 556
563 if (optList[entry].doff != -1) 557 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 558 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 559 }
566 } 560 }
561#ifndef NO_RESOURCES
562 else if (!strcmp (opt, "xrm"))
563 {
564 if (i + 1 < argc)
565 XrmPutLineResource (&option_db, argv[++i]);
566 }
567#endif
568#ifdef KEYSYM_RESOURCE
569 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
570 {
571 if (i + 1 < argc)
572 {
573 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
574 sprintf (res, "*.%s: %s\n", opt, argv[i]);
575 XrmPutLineResource (&option_db, res);
576 }
577 }
578#endif
579 else if (!strcmp (opt, "e"))
580 {
581 if (i + 1 < argc)
582 return (const char **)argv + i + 1;
583
584 rxvt_warn ("option '-e' requires an argument, aborting.\n");
585 bad_option = 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.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
571 { 593 {
572 const char *str = argv[++i]; 594 if (flags & rxvt_perl.RESOURCE_ARG)
573 595 {
574 if (str != NULL) 596 if (i + 1 == argc)
575 parse_keysym (opt + sizeof ("keysym.") - 1, str); 597 {
598 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
599 bad_option = 1;
600 }
601 else
602 ++i;
603 }
576 } 604 }
577 else 605 else
578#endif 606#endif
579 { 607 {
580 bad_option = 1;
581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 608 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1;
582 } 610 }
611 }
583 } 612 }
584 613
585 if (bad_option) 614 if (bad_option)
586 rxvt_usage (0); 615 rxvt_usage (0);
616
617 return 0;
587} 618}
588 619
589/*}}} */ 620/*}}} */
590 621
591#ifndef NO_RESOURCES
592/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
593 623
594# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
625static void
626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
627{
628 term->bind_action (k, v);
629}
630
595/* 631/*
596 * Define key from XrmEnumerateDatabase. 632 * Define key from XrmEnumerateDatabase.
597 * quarks will be something like 633 * quarks will be something like
598 * "rxvt" "keysym" "0xFF01" 634 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 635 * value will be a string
600 */ 636 */
601/* ARGSUSED */ 637static int
602int 638rxvt_enumerate_helper (
603rxvt_define_key (XrmDatabase *database UNUSED, 639 XrmDatabase *database ecb_unused,
604 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
605 XrmQuarkList quarks, 641 XrmQuarkList quarks,
606 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
607 XrmValue *value, 643 XrmValue *value,
608 XPointer closure UNUSED) 644 XPointer closure
645)
609{ 646{
610 int last; 647 int last;
611 648
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 649 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
613 ; 650 ;
614 651
615 last--; 652 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 void (*cb)(rxvt_term *, const char *, const char *)
654 = (void (*)(rxvt_term *, const char *, const char *))
655 (((void **)closure)[1]);
656
657 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
658
617 return False; 659 return False;
618} 660}
619 661
620/* 662/*
621 * look for something like this (XK_Delete) 663 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 664 * 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 */ 665 */
628#define NEWARGLIM 500 /* `reasonable' size */
629 666
630struct keysym_vocabulary_t 667struct keysym_vocabulary_t
631{ 668{
632 const char *name; 669 const char *name;
633 unsigned short len; 670 unsigned short len;
634 unsigned short value; 671 unsigned short value;
635}; 672};
636keysym_vocabulary_t keysym_vocabulary[] = 673static const keysym_vocabulary_t keysym_vocabulary[] =
637{ 674{
638 { "ISOLevel3", 9, Level3Mask }, 675 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask }, 676 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask }, 677 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask }, 678 { "NumLock", 7, NumLockMask },
… …
661 { "4", 1, Mod4Mask }, 698 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask }, 699 { "5", 1, Mod5Mask },
663}; 700};
664 701
665int 702int
666rxvt_term::parse_keysym (const char *str, const char *arg) 703rxvt_term::parse_keysym (const char *str, unsigned int &state)
667{ 704{
668 int n, sym; 705 int sym;
669 unsigned int state = 0; 706 const char *key = strrchr (str, '-');
670 const char *pmodend = NULL;
671 char *newarg = NULL;
672 char newargstr[NEWARGLIM];
673 707
674 if (arg == NULL) 708 state = 0;
675 {
676 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
677 return 0;
678 709
679 str += n; /* skip `keysym.' */ 710 if (!key)
680 if (!(pmodend = strchr (str, ':'))) 711 key = str;
681 return -1;
682 }
683 else 712 else
684 pmodend = str + strlen(str); 713 key++;
685 714
686 for (--pmodend; str < pmodend; --pmodend) 715 // string or key is empty
687 if (*pmodend == '-') 716 if (*key == '\0')
688 break; 717 return -1;
689 718
719 // parse modifiers
690 while (str < pmodend) 720 while (str < key)
691 { 721 {
692 unsigned int i; 722 unsigned int i;
693 723
694 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 724 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
695 { 725 {
696 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 726 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
697 { 727 {
698 state |= keysym_vocabulary[i].value; 728 state |= keysym_vocabulary[i].value;
699 str += keysym_vocabulary[i].len; 729 str += keysym_vocabulary[i].len;
700 break; 730 break;
701 } 731 }
702 } 732 }
703 733
704 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 734 if (i >= ecb_array_length (keysym_vocabulary))
705 return -1; 735 return -1;
706 736
707 if (*str == '-') 737 if (*str == '-')
708 ++str; 738 ++str;
709 } 739 }
710 740
711 /* some scanf () have trouble with a 0x prefix */ 741 // convert keysym name to keysym number
712 if (str[0] == '0' && toupper (str[1]) == 'X') 742 if ((sym = XStringToKeysym (str)) == None)
713 { 743 {
714 str += 2; 744 // fallback on hexadecimal parsing
715 745 char *end;
746 sym = strtol (str, &end, 16);
716 if (arg) 747 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; 748 return -1;
750 } 749 }
751 750
752 if (newarg == NULL) 751 return sym;
753 { 752}
754 strncpy (newargstr, arg, NEWARGLIM - 1);
755 newargstr[NEWARGLIM - 1] = '\0';
756 newarg = newargstr;
757 }
758 753
759 rxvt_Str_trim (newarg); 754int
760 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 755rxvt_term::bind_action (const char *str, const char *arg)
756{
757 int sym;
758 unsigned int state;
759
760 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
761 return -1; 761 return -1;
762 762
763 wchar_t *ws = rxvt_mbstowcs (arg);
764 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
763 keyboard->register_user_translation (sym, state, newarg); 765 keyboard->register_action (sym, state, ws);
766
767 free (ws);
764 return 1; 768 return 1;
765} 769}
766 770
767# endif /* KEYSYM_RESOURCE */ 771#endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */
769 772
770static char * 773static char *
771get_res (XrmDatabase database, const char *program, const char *option) 774get_res (XrmDatabase database, const char *program, const char *option)
772{ 775{
773 char resource[512]; 776 char resource[512];
… …
805 808
806void 809void
807rxvt_term::extract_resources () 810rxvt_term::extract_resources ()
808{ 811{
809#ifndef NO_RESOURCES 812#ifndef NO_RESOURCES
813 XrmDatabase database = XrmGetDatabase (dpy);
814 XrmMergeDatabases (option_db, &database);
815 option_db = NULL;
810 /* 816 /*
811 * Query resources for options that affect us 817 * Query resources for options that affect us
812 */ 818 */
813 for (int entry = 0; entry < optList_size; entry++) 819 for (int entry = 0; entry < ecb_array_length (optList); entry++)
814 { 820 {
815 int s; 821 int s;
816 const char *kw = optList[entry].kw; 822 const char *kw = optList[entry].kw;
817 823
818 if (kw == NULL || rs[optList[entry].doff] != NULL) 824 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
838 844
839 set_option (optList[entry].index, s); 845 set_option (optList[entry].index, s);
840 } 846 }
841 } 847 }
842 } 848 }
849#endif /* NO_RESOURCES */
850}
843 851
852void
853rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
854{
844 /* 855 /*
845 * [R5 or later]: enumerate the resource database 856 * [R5 or later]: enumerate the resource database
846 */ 857 */
847# ifdef KEYSYM_RESOURCE 858#ifdef KEYSYM_RESOURCE
859 void *closure[2] = {
860 (void *)this,
861 (void *)cb,
862 };
863
848 XrmDatabase database = XrmGetDatabase (dpy); 864 XrmDatabase database = XrmGetDatabase (dpy);
849 XrmName name_prefix[3]; 865 XrmName name_prefix[3];
850 XrmClass class_prefix[3]; 866 XrmClass class_prefix[3];
851 867
852 name_prefix[0] = XrmStringToName (rs[Rs_name]); 868 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
853 name_prefix[1] = XrmStringToName ("keysym");
854 name_prefix[2] = NULLQUARK; 869 name_prefix[2] = NULLQUARK;
855 class_prefix[0] = XrmStringToName (RESCLASS); 870 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
856 class_prefix[1] = XrmStringToName ("Keysym");
857 class_prefix[2] = NULLQUARK; 871 class_prefix[2] = NULLQUARK;
872
873# ifdef RESFALLBACK
874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
859 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
860 XrmEnumOneLevel, rxvt_define_key, NULL); 877 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
861# ifdef RESFALLBACK 878# endif
862 name_prefix[0] = XrmStringToName (RESFALLBACK); 879
863 name_prefix[1] = XrmStringToName ("keysym");
864 class_prefix[0] = XrmStringToName (RESFALLBACK); 880 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
865 class_prefix[1] = XrmStringToName ("Keysym");
866 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
867 XrmEnumerateDatabase (database, name_prefix, class_prefix, 881 XrmEnumerateDatabase (database, name_prefix, class_prefix,
868 XrmEnumOneLevel, rxvt_define_key, NULL); 882 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
869# endif 883
884 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
885 XrmEnumerateDatabase (database, name_prefix, class_prefix,
886 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
870# endif 887#endif
888}
871 889
872#endif /* NO_RESOURCES */ 890void
891rxvt_term::extract_keysym_resources ()
892{
893#ifdef KEYSYM_RESOURCE
894 enumerate_keysym_resources (rxvt_define_key);
895#endif
873} 896}
874 897
875/*----------------------- end-of-file (C source) -----------------------*/ 898/*----------------------- end-of-file (C source) -----------------------*/
899

Diff Legend

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