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.114 by sasha, Wed Sep 12 21:06: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
… …
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
37#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
38 40
39/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
40/* 42/*
41 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
43 * 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 ()
44 */ 46 */
45 47
46/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
48 {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}
49 54
50/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
52 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 58
… …
62/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 70
66/* convenient macros */ 71/* convenient macros */
67#define optList_strlen(i) \ 72#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
69#define optList_isBool(i) \ 74#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 78#define optList_isInfo(i) \
74 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
75 80
76static const struct 81static const struct
77 { 82 {
78 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
79 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 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"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 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"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 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"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 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"),
104 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"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 112 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 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"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 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"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 118#if BG_IMAGE_FROM_ROOT
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, 0, NULL), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 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"),
117#endif 124#endif
118#if OFF_FOCUS_FADING 125#if OFF_FOCUS_FADING
119 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"),
120 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"),
121#endif 128#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 129 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 130#ifndef NO_BELL
124# if ENABLE_FRILLS 131# if ENABLE_FRILLS
… …
167#ifndef NO_BOLD_UNDERLINE_REVERSE 174#ifndef NO_BOLD_UNDERLINE_REVERSE
168 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 175 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 176 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 177 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 178 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 179#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 180#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 181 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 182#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 183 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
184#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 186#endif
180#ifdef OPTION_HC 187#ifdef OPTION_HC
181 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"),
182#endif 190#endif
183#ifndef NO_CURSORCOLOR 191#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 192 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 193 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
193 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"),
194#endif 205#endif
195 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 208#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 210 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 211 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 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"),
202#endif 213#endif
203#ifdef USE_XIM 214#if USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 215 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 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"),
206 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"),
207 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"),
208#endif /* USE_XIM */ 219#endif /* USE_XIM */
209 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"),
210 STRG (Rs_title, "title", "title", "string", "title name for window"), 221 STRG (Rs_title, "title", "title", "string", "title name for window"),
211 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 222 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 223 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213 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"),
214#if ENABLE_XEMBED 225#if ENABLE_XEMBED
215 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"),
216#endif 227#endif
217#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219#endif 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
220#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 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"),
223 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"),
224 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"),
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 239 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 240 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 241 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 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
230 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"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 248#endif
233#ifdef POINTER_BLANK 249#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 250 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 251#endif
236#ifndef NO_BACKSPACE_KEY 252#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 253 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 254#endif
239#ifndef NO_DELETE_KEY 255#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 256 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 257#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 258#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 259 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 260#endif
246 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"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 262 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 263 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 264#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 265 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 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"),
254#endif 267#endif
… …
257 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
258 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
259 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"),
260#endif 273#endif
261#if ISO_14755 274#if ISO_14755
275 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 276 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 277#endif
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif
268#ifndef NO_RESOURCES 278#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"), 279 RINFO ("xrm", "string"),
280#endif
281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"),
270#endif 283#endif
271 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
272 }; 285 };
273 286
274#undef INFO 287#undef INFO
288#undef RINFO
275#undef STRG 289#undef STRG
276#undef RSTRG 290#undef RSTRG
277#undef SWCH 291#undef SWCH
278#undef BOOL 292#undef BOOL
279 293
… …
322#endif 336#endif
323#if defined(ENABLE_TRANSPARENCY) 337#if defined(ENABLE_TRANSPARENCY)
324 "transparent," 338 "transparent,"
325 "tint," 339 "tint,"
326#endif 340#endif
327#if HAVE_AFTERIMAGE 341#if HAVE_PIXBUF
328 "afterimage," 342 "pixbuf,"
329#endif 343#endif
330#if defined(USE_XIM) 344#if defined(USE_XIM)
331 "XIM," 345 "XIM,"
332#endif 346#endif
333#if defined(NO_BACKSPACE_KEY) 347#if defined(NO_BACKSPACE_KEY)
… …
361 "pointerBlank," 375 "pointerBlank,"
362#endif 376#endif
363#if defined(NO_RESOURCES) 377#if defined(NO_RESOURCES)
364 "NoResources," 378 "NoResources,"
365#endif 379#endif
366 "scrollbars=" 380 "scrollbars=plain"
367#if !defined(HAVE_SCROLLBARS)
368 "NONE"
369#else
370# if defined(PLAIN_SCROLLBAR)
371 "plain"
372# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
373 "+"
374# endif
375# endif
376# if defined(RXVT_SCROLLBAR) 381#if defined(RXVT_SCROLLBAR)
377 "rxvt" 382 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 383#endif
382# if defined(NEXT_SCROLLBAR) 384#if defined(NEXT_SCROLLBAR)
383 "NeXT" 385 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 386#endif
388# if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
389 "xterm" 388 "+xterm"
390# endif
391#endif 389#endif
392 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
393 391
394#define INDENT 18 392#define INDENT 28
395 393
396const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
397const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
398const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
399 397
400/*{{{ usage: */ 398/*{{{ usage: */
401/*----------------------------------------------------------------------*/ 399/*----------------------------------------------------------------------*/
402static void 400void
403rxvt_usage (int type) 401rxvt_term::rxvt_usage (int type)
404{ 402{
405 unsigned int i, col; 403 unsigned int i, col;
406 404
407 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 405 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
408 406
409 switch (type) 407 switch (type)
410 { 408 {
411 case 0: /* brief listing */ 409 case 0: /* brief listing */
412 rxvt_log (" [-help] [--help]\n"); 410 rxvt_log (" [-help] [--help]\n");
413 411
414 for (col = 1, i = 0; i < optList_size; i++) 412 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
415 if (optList[i].desc != NULL) 413 if (optList[i].desc != NULL)
416 { 414 {
417 int len = 0; 415 int len = 0;
418 416
419 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)
420 { 425 {
421 len = optList_strlen (i);
422 if (len > 0)
423 len++; /* account for space */
424 }
425#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL);
427#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429 col += len;
430 if (col > 79)
431 { /* assume regular width */ 426 /* assume regular width */
432 rxvt_log ("\n"); 427 rxvt_log ("\n");
433 col = 1 + len; 428 col = 1 + len;
434 } 429 }
435 430
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432
437 if (optList_strlen (i)) 433 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
439 else 435 else
440 rxvt_log ("]"); 436 rxvt_log ("]");
441 } 437 }
442 break; 438 break;
443 439
444 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 442
447 for (i = 0; i < optList_size; i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
448 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
449 { 445 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 449 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
458 (optList_isBool (i) ? "turn on/off " : ""), 452 (optList_isBool (i) ? "turn on/off " : ""),
459 optList[i].desc); 453 optList[i].desc);
460 } 454 }
455
456#if ENABLE_PERL
457 rxvt_perl.init (this);
458 rxvt_perl.usage (this, 1);
459#endif
460
461 rxvt_log ("\n --help to list long-options"); 461 rxvt_log ("\n --help to list long-options");
462 break; 462 break;
463 463
464 case 2: /* full resource listing */ 464 case 2: /* full resource listing */
465 rxvt_log (" [options] [-e command args]\n\n" 465 rxvt_log (" [options] [-e command args]\n\n"
466 "where resources (long-options) include:\n"); 466 "where resources (long-options) include:\n");
467 467
468 for (i = 0; i < optList_size; i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
469 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
470 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
471 optList[i].kw, 471 optList[i].kw,
472 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
473 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
474#ifdef KEYSYM_RESOURCE 474
475 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475#if ENABLE_PERL
476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 rxvt_perl.init (this);
477 "keysym"); 477 rxvt_perl.usage (this, 2);
478#endif 478#endif
479
479 rxvt_log ("\n -help to list options"); 480 rxvt_log ("\n -help to list options");
480 break; 481 break;
481 } 482 }
482 483
483 rxvt_log ("\n\n"); 484 rxvt_log ("\n\n");
484 rxvt_exit_failure (); 485 rxvt_exit_failure ();
485 /* NOTREACHED */
486} 486}
487 487
488/*}}} */ 488/*}}} */
489 489
490/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
491void 491const char **
492rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
493{ 493{
494 int i, bad_option = 0; 494 int i, bad_option = 0;
495 495
496 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
497 { 497 {
498 unsigned int entry, longopt = 0; 498 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 499 const char *opt;
500 int flag;
500 501
501 opt = argv[i]; 502 opt = argv[i];
502 503
503 if (*opt == '-') 504 if (*opt == '-')
504 { 505 {
505 flag = resval_on; 506 flag = 1;
506 507
507 if (*++opt == '-') 508 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
509 } 510 }
510 else if (*opt == '+') 511 else if (*opt == '+')
511 { 512 {
512 flag = resval_off; 513 flag = 0;
513 514
514 if (*++opt == '+') 515 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 516 longopt = *opt++; /* long option */
516 } 517 }
517 else 518 else
… …
526 527
527 if (!strcmp (opt, "h")) 528 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 529 rxvt_usage (0);
529 530
530 /* feature: always try to match long-options */ 531 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 532 for (entry = 0; entry < ecb_array_length (optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 533 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 534 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 535 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 536 break;
536 537
537 if (entry < optList_size) 538 if (entry < ecb_array_length (optList)
539 && !optList_isInfo (entry))
538 { 540 {
539 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 542 flag = !flag;
541 543
542 if (optList_strlen (entry)) 544 if (optList_isString (entry))
543 { 545 {
544 /* 546 /*
545 * special cases are handled in main.c:main () to allow 547 * special cases are handled in init_resources () to allow
546 * X resources to set these values before we settle for 548 * X resources to set these values before we settle for
547 * default values 549 * default values
548 */ 550 */
549 551
550 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
551 { 553 {
552 if (flag == resval_on && !argv [i+1]) 554 if (flag && i + 1 == argc)
553 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 556
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 558 }
557 } 559 }
558 else 560 else
561 {
559 { /* boolean value */ 562 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 563 set_option (optList[entry].index, flag);
561 564
562 if (optList[entry].doff != -1) 565 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 566 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 567 }
565 } 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 }
566 else 595 else
567#ifdef KEYSYM_RESOURCE 596 {
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 597#if ENABLE_PERL
598 rxvt_perl.init (this);
599
600 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
569 { 601 {
570 const char *str = argv[++i]; 602 if (flags & rxvt_perl.RESOURCE_ARG)
571 603 {
572 if (str != NULL) 604 if (i + 1 == argc)
573 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 }
574 } 612 }
575 else 613 else
576#endif 614#endif
577 { 615 {
578 bad_option = 1;
579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
617 bad_option = 1;
580 } 618 }
619 }
581 } 620 }
582 621
583 if (bad_option) 622 if (bad_option)
584 rxvt_usage (0); 623 rxvt_usage (0);
624
625 return 0;
585} 626}
586 627
587/*}}} */ 628/*}}} */
588 629
589#ifndef NO_RESOURCES 630#ifndef NO_RESOURCES
590/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
591 632
592# 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
593/* 640/*
594 * Define key from XrmEnumerateDatabase. 641 * Define key from XrmEnumerateDatabase.
595 * quarks will be something like 642 * quarks will be something like
596 * "rxvt" "keysym" "0xFF01" 643 * "rxvt" "keysym" "0xFF01"
597 * value will be a string 644 * value will be a string
598 */ 645 */
599/* ARGSUSED */ 646static int
600int 647rxvt_keysym_enumerate_helper (
601rxvt_define_key (XrmDatabase *database UNUSED, 648 XrmDatabase *database ecb_unused,
602 XrmBindingList bindings UNUSED, 649 XrmBindingList bindings ecb_unused,
603 XrmQuarkList quarks, 650 XrmQuarkList quarks,
604 XrmRepresentation *type UNUSED, 651 XrmRepresentation *type ecb_unused,
605 XrmValue *value, 652 XrmValue *value,
606 XPointer closure UNUSED) 653 XPointer closure
654)
607{ 655{
608 int last; 656 int last;
609 657
610 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 */
611 ; 659 ;
612 660
613 last--; 661 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
614 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
615 return False; 668 return False;
616} 669}
617 670
618/* 671/*
619 * look for something like this (XK_Delete) 672 * look for something like this (XK_Delete)
620 * rxvt*keysym.0xFFFF: "\177" 673 * rxvt*keysym.0xFFFF: "\177"
621 *
622 * arg will be
623 * NULL for ~/.Xdefaults and
624 * non-NULL for command-line options (need to allocate)
625 */ 674 */
626#define NEWARGLIM 500 /* `reasonable' size */
627 675
628struct keysym_vocabulary_t 676struct keysym_vocabulary_t
629{ 677{
630 const char *name; 678 const char *name;
631 unsigned short len; 679 unsigned short len;
632 unsigned short value; 680 unsigned short value;
633}; 681};
634keysym_vocabulary_t keysym_vocabulary[] = 682static const keysym_vocabulary_t keysym_vocabulary[] =
635{ 683{
636 { "ISOLevel3", 9, Level3Mask }, 684 { "ISOLevel3", 9, Level3Mask },
637 { "AppKeypad", 9, AppKeypadMask }, 685 { "AppKeypad", 9, AppKeypadMask },
638 { "Control", 7, ControlMask }, 686 { "Control", 7, ControlMask },
639 { "NumLock", 7, NumLockMask }, 687 { "NumLock", 7, NumLockMask },
… …
659 { "4", 1, Mod4Mask }, 707 { "4", 1, Mod4Mask },
660 { "5", 1, Mod5Mask }, 708 { "5", 1, Mod5Mask },
661}; 709};
662 710
663int 711int
664rxvt_term::parse_keysym (const char *str, const char *arg) 712rxvt_term::parse_keysym (const char *str, unsigned int &state)
665{ 713{
666 int n, sym; 714 int sym;
667 unsigned int state = 0; 715 const char *key = strrchr (str, '-');
668 const char *pmodend = NULL;
669 char *newarg = NULL;
670 char newargstr[NEWARGLIM];
671 716
672 if (arg == NULL) 717 state = 0;
673 {
674 n = sizeof ("keysym.") - 1;
675 if (strncmp (str, "keysym.", n))
676 return 0;
677 718
678 str += n; /* skip `keysym.' */ 719 if (!key)
679 if (!(pmodend = strchr (str, ':'))) 720 key = str;
680 return -1;
681 }
682 else 721 else
683 pmodend = str + strlen(str); 722 key++;
684 723
685 for (--pmodend; str < pmodend; --pmodend) 724 // string or key is empty
686 if (*pmodend == '-') 725 if (*key == '\0')
687 break; 726 return -1;
688 727
728 // parse modifiers
689 while (str < pmodend) 729 while (str < key)
690 { 730 {
691 unsigned int i; 731 unsigned int i;
692 732
693 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 733 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
694 { 734 {
695 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)
696 { 736 {
697 state |= keysym_vocabulary[i].value; 737 state |= keysym_vocabulary[i].value;
698 str += keysym_vocabulary[i].len; 738 str += keysym_vocabulary[i].len;
699 break; 739 break;
700 } 740 }
701 } 741 }
702 742
703 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 743 if (i >= ecb_array_length (keysym_vocabulary))
704 return -1; 744 return -1;
705 745
706 if (*str == '-') 746 if (*str == '-')
707 ++str; 747 ++str;
708 } 748 }
709 749
710 /* some scanf () have trouble with a 0x prefix */ 750 // convert keysym name to keysym number
711 if (str[0] == '0' && toupper (str[1]) == 'X') 751 if ((sym = XStringToKeysym (str)) == None)
712 { 752 {
713 str += 2; 753 // fallback on hexadecimal parsing
714 754 char *end;
755 sym = strtol (str, &end, 16);
715 if (arg) 756 if (*end)
716 {
717 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
718 return -1;
719 }
720 else
721 {
722 if (sscanf (str, "%x:", &sym) != 1)
723 return -1;
724
725 /* cue to ':', it's there since sscanf () worked */
726 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
727 newargstr[NEWARGLIM - 1] = '\0';
728 newarg = newargstr;
729 }
730 }
731 else
732 {
733 /*
734 * convert keysym name to keysym number
735 */
736 strncpy (newargstr, str, NEWARGLIM - 1);
737 newargstr[NEWARGLIM - 1] = '\0';
738
739 if (arg == NULL)
740 {
741 if ((newarg = strchr (newargstr, ':')) == NULL)
742 return -1;
743
744 *newarg++ = '\0'; /* terminate keysym name */
745 }
746
747 if ((sym = XStringToKeysym (newargstr)) == None)
748 return -1; 757 return -1;
749 } 758 }
750 759
751 if (newarg == NULL) 760 return sym;
752 { 761}
753 strncpy (newargstr, arg, NEWARGLIM - 1);
754 newargstr[NEWARGLIM - 1] = '\0';
755 newarg = newargstr;
756 }
757 762
758 if (*newarg == '\0') 763int
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)
759 return -1; 770 return -1;
760 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)))
761 keyboard->register_user_translation (sym, state, newarg); 774 keyboard->register_action (sym, state, ws);
775
776 free (ws);
762 return 1; 777 return 1;
763} 778}
764 779
765# endif /* KEYSYM_RESOURCE */ 780# endif /* KEYSYM_RESOURCE */
766#endif /* NO_RESOURCES */ 781#endif /* NO_RESOURCES */
767 782
768static char * 783static char *
769get_res (XrmDatabase database, const char *program, const char *option) 784get_res (XrmDatabase database, const char *program, const char *option)
770{ 785{
771 char resource[512]; 786 char resource[512];
… …
803 818
804void 819void
805rxvt_term::extract_resources () 820rxvt_term::extract_resources ()
806{ 821{
807#ifndef NO_RESOURCES 822#ifndef NO_RESOURCES
823 XrmDatabase database = XrmGetDatabase (dpy);
824 XrmMergeDatabases (option_db, &database);
825 option_db = NULL;
808 /* 826 /*
809 * Query resources for options that affect us 827 * Query resources for options that affect us
810 */ 828 */
811 for (int entry = 0; entry < optList_size; entry++) 829 for (int entry = 0; entry < ecb_array_length (optList); entry++)
812 { 830 {
813 int s; 831 int s;
814 const char *kw = optList[entry].kw; 832 const char *kw = optList[entry].kw;
815 833
816 if (kw == NULL || rs[optList[entry].doff] != NULL) 834 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
836 854
837 set_option (optList[entry].index, s); 855 set_option (optList[entry].index, s);
838 } 856 }
839 } 857 }
840 } 858 }
859#endif /* NO_RESOURCES */
860}
841 861
862void
863rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
864{
865#ifndef NO_RESOURCES
842 /* 866 /*
843 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
844 */ 868 */
845# ifdef KEYSYM_RESOURCE 869# ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
846 XrmDatabase database = XrmGetDatabase (dpy); 875 XrmDatabase database = XrmGetDatabase (dpy);
847 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
848 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
849 878
850 name_prefix[0] = XrmStringToName (rs[Rs_name]); 879 name_prefix[0] = XrmStringToName (rs[Rs_name]);
… …
853 class_prefix[0] = XrmStringToName (RESCLASS); 882 class_prefix[0] = XrmStringToName (RESCLASS);
854 class_prefix[1] = XrmStringToName ("Keysym"); 883 class_prefix[1] = XrmStringToName ("Keysym");
855 class_prefix[2] = NULLQUARK; 884 class_prefix[2] = NULLQUARK;
856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 885 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
857 XrmEnumerateDatabase (database, name_prefix, class_prefix, 886 XrmEnumerateDatabase (database, name_prefix, class_prefix,
858 XrmEnumOneLevel, rxvt_define_key, NULL); 887 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
859# ifdef RESFALLBACK 888# ifdef RESFALLBACK
860 name_prefix[0] = XrmStringToName (RESFALLBACK);
861 name_prefix[1] = XrmStringToName ("keysym");
862 class_prefix[0] = XrmStringToName (RESFALLBACK); 889 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
863 class_prefix[1] = XrmStringToName ("Keysym");
864 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 890 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
865 XrmEnumerateDatabase (database, name_prefix, class_prefix, 891 XrmEnumerateDatabase (database, name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 892 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
867# endif 893# endif
868# endif 894# endif
869 895
870#endif /* NO_RESOURCES */ 896#endif /* NO_RESOURCES */
897}
898
899void
900rxvt_term::extract_keysym_resources ()
901{
902 enumerate_keysym_resources (rxvt_define_key);
871} 903}
872 904
873/*----------------------- end-of-file (C source) -----------------------*/ 905/*----------------------- end-of-file (C source) -----------------------*/
906

Diff Legend

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