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

Diff Legend

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