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

Diff Legend

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