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.122 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.193 by root, Tue Sep 17 20:38:14 2019 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 3 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
15 * 16 *
16 * This program is distributed in the hope that it will be useful, 17 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
117#endif
118#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 121#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 123#ifndef NO_BELL
124# if ENABLE_FRILLS 124# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 173#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 175#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 179#endif
180#ifdef OPTION_HC 180#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 183#endif
183#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 186 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 192#if ENABLE_EWMH
192 RSTRG (Rs_path, "path", "search path"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
194#endif 197#endif
195 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 200#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
202#endif 205#endif
203#ifdef USE_XIM 206#if USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 209 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 211#endif /* USE_XIM */
… …
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 217#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 219#endif
217#if XFT 220#if XFT
221 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
222#endif
223#if ENABLE_FRILLS
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219#endif 225 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
220#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 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"), 227 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"), 228 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"), 229 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"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
237#endif
238#ifdef BUILTIN_GLYPHS
230 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 239 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 240#endif
233#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 243#endif
236#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 246#endif
239#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 249#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 250#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 251 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 252#endif
246 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 253 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 254 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 255 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 256#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 258 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254#endif 259#endif
… …
257 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 262 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
258 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 263 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 264 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260#endif 265#endif
261#if ISO_14755 266#if ISO_14755
267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 268 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263#endif 269#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 270#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"), 271 RINFO ("xrm", "string"),
272#endif
273#ifdef KEYSYM_RESOURCE
274 RINFO ("keysym.sym", "keysym"),
270#endif 275#endif
271 INFO ("e", "command arg ...", "command to execute") 276 INFO ("e", "command arg ...", "command to execute")
272 }; 277 };
273 278
274#undef INFO 279#undef INFO
280#undef RINFO
275#undef STRG 281#undef STRG
276#undef RSTRG 282#undef RSTRG
277#undef SWCH 283#undef SWCH
278#undef BOOL 284#undef BOOL
279 285
… …
322#endif 328#endif
323#if defined(ENABLE_TRANSPARENCY) 329#if defined(ENABLE_TRANSPARENCY)
324 "transparent," 330 "transparent,"
325 "tint," 331 "tint,"
326#endif 332#endif
327#if HAVE_AFTERIMAGE 333#if HAVE_PIXBUF
328 "afterimage," 334 "pixbuf,"
329#endif 335#endif
330#if defined(USE_XIM) 336#if defined(USE_XIM)
331 "XIM," 337 "XIM,"
332#endif 338#endif
333#if defined(NO_BACKSPACE_KEY) 339#if defined(NO_BACKSPACE_KEY)
… …
361 "pointerBlank," 367 "pointerBlank,"
362#endif 368#endif
363#if defined(NO_RESOURCES) 369#if defined(NO_RESOURCES)
364 "NoResources," 370 "NoResources,"
365#endif 371#endif
366 "scrollbars=" 372 "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) 373#if defined(RXVT_SCROLLBAR)
377 "rxvt" 374 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 375#endif
382# if defined(NEXT_SCROLLBAR) 376#if defined(NEXT_SCROLLBAR)
383 "NeXT" 377 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 378#endif
388# if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
389 "xterm" 380 "+xterm"
390# endif
391#endif 381#endif
392 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
393 383
394#define INDENT 18 384#define INDENT 28
395 385
396const char rxvt_term::resval_undef [] = "<undef>"; 386const char rxvt_term::resval_undef [] = "<undef>";
397const char rxvt_term::resval_on [] = "on"; 387const char rxvt_term::resval_on [] = "on";
398const char rxvt_term::resval_off [] = "off"; 388const char rxvt_term::resval_off [] = "off";
399 389
400/*{{{ usage: */ 390/*{{{ usage: */
401/*----------------------------------------------------------------------*/ 391/*----------------------------------------------------------------------*/
402static void 392void
403rxvt_usage (int type) 393rxvt_term::rxvt_usage (int type)
404{ 394{
405 unsigned int i, col; 395 unsigned int i, col;
406 396
407 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 397 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
408 398
409 switch (type) 399 switch (type)
410 { 400 {
411 case 0: /* brief listing */ 401 case 0: /* brief listing */
412 rxvt_log (" [-help] [--help]\n"); 402 rxvt_log (" [-help] [--help]\n");
413 403
414 for (col = 1, i = 0; i < optList_size; i++) 404 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
415 if (optList[i].desc != NULL) 405 if (optList[i].desc != NULL)
416 { 406 {
417 int len = 0; 407 int len = 0;
418 408
419 if (!optList_isBool (i)) 409 if (optList[i].arg)
410 len = strlen (optList[i].arg) + 1;
411
412 assert (optList[i].opt != NULL);
413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
414 col += len;
415
416 if (col > 79)
420 { 417 {
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 */ 418 /* assume regular width */
432 rxvt_log ("\n"); 419 rxvt_log ("\n");
433 col = 1 + len; 420 col = 1 + len;
434 } 421 }
435 422
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 423 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
424
437 if (optList_strlen (i)) 425 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
439 else 427 else
440 rxvt_log ("]"); 428 rxvt_log ("]");
441 } 429 }
442 break; 430 break;
443 431
444 case 1: /* full command-line listing */ 432 case 1: /* full command-line listing */
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 434
447 for (i = 0; i < optList_size; i++) 435 for (i = 0; i < ecb_array_length (optList); i++)
448 if (optList[i].desc != NULL) 436 if (optList[i].desc != NULL)
449 { 437 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 438 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 439 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 440 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 441 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 442 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 443 (optList[i].arg ? optList[i].arg : ""),
458 (optList_isBool (i) ? "turn on/off " : ""), 444 (optList_isBool (i) ? "turn on/off " : ""),
459 optList[i].desc); 445 optList[i].desc);
460 } 446 }
447
448#if ENABLE_PERL
449 rxvt_perl.init (this);
450 rxvt_perl.usage (this, 1);
451#endif
452
461 rxvt_log ("\n --help to list long-options"); 453 rxvt_log ("\n --help to list long-options");
462 break; 454 break;
463 455
464 case 2: /* full resource listing */ 456 case 2: /* full resource listing */
465 rxvt_log (" [options] [-e command args]\n\n" 457 rxvt_log (" [options] [-e command args]\n\n"
466 "where resources (long-options) include:\n"); 458 "where resources (long-options) include:\n");
467 459
468 for (i = 0; i < optList_size; i++) 460 for (i = 0; i < ecb_array_length (optList); i++)
469 if (optList[i].kw != NULL) 461 if (optList[i].kw != NULL)
470 rxvt_log (" %s: %*s%s\n", 462 rxvt_log (" %s: %*s%s\n",
471 optList[i].kw, 463 optList[i].kw,
472 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 464 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
473 (optList_isBool (i) ? "boolean" : optList[i].arg)); 465 (optList_isBool (i) ? "boolean" : optList[i].arg));
474#ifdef KEYSYM_RESOURCE 466
475 rxvt_log (" " "keysym.sym" ": %*s%s\n", 467#if ENABLE_PERL
476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 468 rxvt_perl.init (this);
477 "keysym"); 469 rxvt_perl.usage (this, 2);
478#endif 470#endif
471
479 rxvt_log ("\n -help to list options"); 472 rxvt_log ("\n -help to list options");
480 break; 473 break;
481 } 474 }
482 475
483 rxvt_log ("\n\n"); 476 rxvt_log ("\n\n");
484 rxvt_exit_failure (); 477 rxvt_exit_failure ();
485 /* NOTREACHED */
486} 478}
487 479
488/*}}} */ 480/*}}} */
489 481
490/*{{{ get command-line options before getting resources */ 482/*{{{ get command-line options before getting resources */
491void 483const char **
492rxvt_term::get_options (int argc, const char *const *argv) 484rxvt_term::get_options (int argc, const char *const *argv)
493{ 485{
494 int i, bad_option = 0; 486 int i, bad_option = 0;
495 487
496 for (i = 1; i < argc; i++) 488 for (i = 1; i < argc; i++)
497 { 489 {
498 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 491 const char *opt;
492 int flag;
500 493
501 opt = argv[i]; 494 opt = argv[i];
502 495
503 if (*opt == '-') 496 if (*opt == '-')
504 { 497 {
505 flag = resval_on; 498 flag = 1;
506 499
507 if (*++opt == '-') 500 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 501 longopt = *opt++; /* long option */
509 } 502 }
510 else if (*opt == '+') 503 else if (*opt == '+')
511 { 504 {
512 flag = resval_off; 505 flag = 0;
513 506
514 if (*++opt == '+') 507 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
516 } 509 }
517 else 510 else
… …
526 519
527 if (!strcmp (opt, "h")) 520 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 521 rxvt_usage (0);
529 522
530 /* feature: always try to match long-options */ 523 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 524 for (entry = 0; entry < ecb_array_length (optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 525 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 526 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 527 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 528 break;
536 529
537 if (entry < optList_size) 530 if (entry < ecb_array_length (optList)
531 && !optList_isInfo (entry))
538 { 532 {
539 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 534 flag = !flag;
541 535
542 if (optList_strlen (entry)) 536 if (optList_isString (entry))
543 { 537 {
544 /* 538 /*
545 * special cases are handled in main.c:main () to allow 539 * special cases are handled in init_resources () to allow
546 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
547 * default values 541 * default values
548 */ 542 */
549 543
550 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
551 { 545 {
552 if (flag == resval_on && i+1 == argc) 546 if (flag && i + 1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 547 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 548
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 549 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 550 }
557 } 551 }
558 else 552 else
553 {
559 { /* boolean value */ 554 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 555 set_option (optList[entry].index, flag);
561 556
562 if (optList[entry].doff != -1) 557 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 558 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 559 }
565 } 560 }
561#ifndef NO_RESOURCES
562 else if (!strcmp (opt, "xrm"))
563 {
564 if (i + 1 < argc)
565 XrmPutLineResource (&option_db, argv[++i]);
566 }
567#endif
566#ifdef KEYSYM_RESOURCE 568#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 569 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 { 570 {
569 if (i+1 < argc) 571 if (i + 1 < argc)
570 { 572 {
571 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 573 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
572 sprintf (res, "*.%s: %s\n", opt, argv[i]); 574 sprintf (res, "*.%s: %s\n", opt, argv[i]);
573 XrmPutLineResource (&option_db, res); 575 XrmPutLineResource (&option_db, res);
574 free (res);
575 } 576 }
576 } 577 }
577#endif 578#endif
579 else if (!strcmp (opt, "e"))
580 {
581 if (i + 1 < argc)
582 return (const char **)argv + i + 1;
583
584 rxvt_warn ("option '-e' requires an argument, aborting.\n");
585 bad_option = 1;
586 }
578 else 587 else
579 { 588 {
589#if ENABLE_PERL
590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
593 {
594 if (flags & rxvt_perl.RESOURCE_ARG)
595 {
596 if (i + 1 == argc)
597 {
598 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
580 bad_option = 1; 599 bad_option = 1;
600 }
601 else
602 ++i;
603 }
604 }
605 else
606#endif
607 {
581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 608 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1;
610 }
582 } 611 }
583 } 612 }
584 613
585 if (bad_option) 614 if (bad_option)
586 rxvt_usage (0); 615 rxvt_usage (0);
616
617 return 0;
587} 618}
588 619
589/*}}} */ 620/*}}} */
590 621
591#ifndef NO_RESOURCES
592/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
593 623
594# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
625static void
626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
627{
628 term->bind_action (k, v);
629}
630
631struct rxvt_enumerate_closure
632{
633 rxvt_term *term;
634 void (*cb)(rxvt_term *, const char *, const char *);
635 int specific; // iterate over only a specific subhierarchy
636};
637
595/* 638/*
596 * Define key from XrmEnumerateDatabase. 639 * Define key from XrmEnumerateDatabase.
597 * quarks will be something like 640 * quarks will be something like
598 * "rxvt" "keysym" "0xFF01" 641 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 642 * value will be a string
600 */ 643 */
601/* ARGSUSED */ 644static int
602int 645rxvt_enumerate_helper (
603rxvt_define_key (XrmDatabase *database UNUSED, 646 XrmDatabase *database ecb_unused,
604 XrmBindingList bindings UNUSED, 647 XrmBindingList bindings ecb_unused,
605 XrmQuarkList quarks, 648 XrmQuarkList quarks,
606 XrmRepresentation *type UNUSED, 649 XrmRepresentation *type ecb_unused,
607 XrmValue *value, 650 XrmValue *value,
608 XPointer closure UNUSED) 651 XPointer closure
652)
609{ 653{
610 int last; 654 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
611 655
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 656 if (*quarks == NULLQUARK) return False;
657
658 // if the quark list starts with a tighly bound quark, we skip it,
659 // as it is the exactly matched the prefix. Otherwise, it matched because
660 // it started with "*", in which case we assuime the prefix is part
661 // of the "*".
662 if (*bindings == XrmBindTightly)
613 ; 663 {
664 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
665 if (*quarks == NULLQUARK) return False;
666 }
614 667
615 last--; 668 // specific, a bit misleadingly named, is used when a specific "subclass"
616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 669 // is iterated over, e.g. "keysym", and is used to skip one more
670 // component, as well as all generic prefixes
671 // this is a bit of a hack, ideally, keysym (the only user) should use its
672 // own iteration function, but this ought to be less bloated
673 if (data->specific)
674 {
675 if (*bindings != XrmBindTightly)
676 return False;
677
678 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
679 if (*quarks == NULLQUARK) return False;
680 }
681
682 char *pattern;
683 if (quarks[1] == NULLQUARK)
684 pattern = XrmQuarkToString (quarks[0]); // single component, fats path
685 else
686 {
687 // multiple components, slow path - should be rare, to don't optimize for speed
688 int size = 0;
689
690 for (int i = 0; quarks[i] != NULLQUARK; ++i)
691 size += strlen (XrmQuarkToString (quarks[i])) + 1;
692
693 pattern = rxvt_temp_buf<char> (size + 1);
694
695 // now print all components
696 {
697 char *cur = pattern;
698
699 for (int i = 0; quarks[i] != NULLQUARK; ++i)
700 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
701 }
702
703 ++pattern; // skip initial dot
704 }
705
706 data->cb (data->term, pattern, (char *)value->addr);
707
617 return False; 708 return False;
618} 709}
619 710
620/* 711/*
621 * look for something like this (XK_Delete) 712 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 713 * rxvt*keysym.0xFFFF: "\177"
623 *
624 * arg will be
625 * NULL for ~/.Xdefaults and
626 * non-NULL for command-line options (need to allocate)
627 */ 714 */
628#define NEWARGLIM 500 /* `reasonable' size */
629 715
630struct keysym_vocabulary_t 716struct keysym_vocabulary_t
631{ 717{
632 const char *name; 718 const char *name;
633 unsigned short len; 719 unsigned short len;
634 unsigned short value; 720 unsigned short value;
635}; 721};
636keysym_vocabulary_t keysym_vocabulary[] = 722static const keysym_vocabulary_t keysym_vocabulary[] =
637{ 723{
638 { "ISOLevel3", 9, Level3Mask }, 724 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask }, 725 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask }, 726 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask }, 727 { "NumLock", 7, NumLockMask },
… …
661 { "4", 1, Mod4Mask }, 747 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask }, 748 { "5", 1, Mod5Mask },
663}; 749};
664 750
665int 751int
666rxvt_term::parse_keysym (const char *str, const char *arg) 752rxvt_term::parse_keysym (const char *str, unsigned int &state)
667{ 753{
668 int n, sym; 754 int sym;
669 unsigned int state = 0; 755 const char *key = strrchr (str, '-');
670 const char *pmodend = NULL;
671 char *newarg = NULL;
672 char newargstr[NEWARGLIM];
673 756
674 if (arg == NULL) 757 state = 0;
675 {
676 n = sizeof ("keysym.") - 1;
677 if (strncmp (str, "keysym.", n))
678 return 0;
679 758
680 str += n; /* skip `keysym.' */ 759 if (!key)
681 if (!(pmodend = strchr (str, ':'))) 760 key = str;
682 return -1;
683 }
684 else 761 else
685 pmodend = str + strlen(str); 762 key++;
686 763
687 for (--pmodend; str < pmodend; --pmodend) 764 // string or key is empty
688 if (*pmodend == '-') 765 if (*key == '\0')
689 break; 766 return -1;
690 767
768 // parse modifiers
691 while (str < pmodend) 769 while (str < key)
692 { 770 {
693 unsigned int i; 771 unsigned int i;
694 772
695 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 773 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
696 { 774 {
697 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 775 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
698 { 776 {
699 state |= keysym_vocabulary[i].value; 777 state |= keysym_vocabulary[i].value;
700 str += keysym_vocabulary[i].len; 778 str += keysym_vocabulary[i].len;
701 break; 779 break;
702 } 780 }
703 } 781 }
704 782
705 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 783 if (i >= ecb_array_length (keysym_vocabulary))
706 return -1; 784 return -1;
707 785
708 if (*str == '-') 786 if (*str == '-')
709 ++str; 787 ++str;
710 } 788 }
711 789
712 /* some scanf () have trouble with a 0x prefix */ 790 // convert keysym name to keysym number
713 if (str[0] == '0' && toupper (str[1]) == 'X') 791 if ((sym = XStringToKeysym (str)) == None)
714 { 792 {
715 str += 2; 793 // fallback on hexadecimal parsing
716 794 char *end;
795 sym = strtol (str, &end, 16);
717 if (arg) 796 if (*end)
718 {
719 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
720 return -1;
721 }
722 else
723 {
724 if (sscanf (str, "%x:", &sym) != 1)
725 return -1;
726
727 /* cue to ':', it's there since sscanf () worked */
728 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
729 newargstr[NEWARGLIM - 1] = '\0';
730 newarg = newargstr;
731 }
732 }
733 else
734 {
735 /*
736 * convert keysym name to keysym number
737 */
738 strncpy (newargstr, str, NEWARGLIM - 1);
739 newargstr[NEWARGLIM - 1] = '\0';
740
741 if (arg == NULL)
742 {
743 if ((newarg = strchr (newargstr, ':')) == NULL)
744 return -1;
745
746 *newarg++ = '\0'; /* terminate keysym name */
747 }
748
749 if ((sym = XStringToKeysym (newargstr)) == None)
750 return -1; 797 return -1;
751 } 798 }
752 799
753 if (newarg == NULL) 800 return sym;
754 { 801}
755 strncpy (newargstr, arg, NEWARGLIM - 1);
756 newargstr[NEWARGLIM - 1] = '\0';
757 newarg = newargstr;
758 }
759 802
760 if (*newarg == '\0') 803int
804rxvt_term::bind_action (const char *str, const char *arg)
805{
806 int sym;
807 unsigned int state;
808
809 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
761 return -1; 810 return -1;
762 811
812 wchar_t *ws = rxvt_mbstowcs (arg);
813 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
763 keyboard->register_user_translation (sym, state, newarg); 814 keyboard->register_action (sym, state, ws);
815
816 free (ws);
764 return 1; 817 return 1;
765} 818}
766 819
767# endif /* KEYSYM_RESOURCE */ 820#endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */
769 821
770static char * 822static char *
771get_res (XrmDatabase database, const char *program, const char *option) 823get_res (XrmDatabase database, const char *program, const char *option)
772{ 824{
773 char resource[512]; 825 char resource[512];
… …
811 XrmMergeDatabases (option_db, &database); 863 XrmMergeDatabases (option_db, &database);
812 option_db = NULL; 864 option_db = NULL;
813 /* 865 /*
814 * Query resources for options that affect us 866 * Query resources for options that affect us
815 */ 867 */
816 for (int entry = 0; entry < optList_size; entry++) 868 for (int entry = 0; entry < ecb_array_length (optList); entry++)
817 { 869 {
818 int s; 870 int s;
819 const char *kw = optList[entry].kw; 871 const char *kw = optList[entry].kw;
820 872
821 if (kw == NULL || rs[optList[entry].doff] != NULL) 873 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
841 893
842 set_option (optList[entry].index, s); 894 set_option (optList[entry].index, s);
843 } 895 }
844 } 896 }
845 } 897 }
898#endif /* NO_RESOURCES */
899}
846 900
901void
902rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
903{
847 /* 904 /*
848 * [R5 or later]: enumerate the resource database 905 * [R5 or later]: enumerate the resource database
849 */ 906 */
907 assert (!name_p == !class_p); // both must be specified, or missing
908
850# ifdef KEYSYM_RESOURCE 909#ifdef KEYSYM_RESOURCE
910 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
911
912 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3]; 913 XrmName name_prefix[3];
852 XrmClass class_prefix[3]; 914 XrmClass class_prefix[3];
853 915
854 name_prefix[0] = XrmStringToName (rs[Rs_name]); 916 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
855 name_prefix[1] = XrmStringToName ("keysym");
856 name_prefix[2] = NULLQUARK; 917 name_prefix[2] = NULLQUARK;
857 class_prefix[0] = XrmStringToName (RESCLASS); 918 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
858 class_prefix[1] = XrmStringToName ("Keysym");
859 class_prefix[2] = NULLQUARK; 919 class_prefix[2] = NULLQUARK;
860 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 920
921# ifdef RESFALLBACK
922 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
861 XrmEnumerateDatabase (database, name_prefix, class_prefix, 923 XrmEnumerateDatabase (database, name_prefix, class_prefix,
862 XrmEnumOneLevel, rxvt_define_key, NULL); 924 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
863# ifdef RESFALLBACK 925# endif
864 name_prefix[0] = XrmStringToName (RESFALLBACK); 926
865 name_prefix[1] = XrmStringToName ("keysym");
866 class_prefix[0] = XrmStringToName (RESFALLBACK); 927 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
867 class_prefix[1] = XrmStringToName ("Keysym");
868 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 928 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 929 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
871# endif 930
931 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
932 XrmEnumerateDatabase (database, name_prefix, class_prefix,
933 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
872# endif 934#endif
935}
873 936
874#endif /* NO_RESOURCES */ 937void
938rxvt_term::extract_keysym_resources ()
939{
940#ifdef KEYSYM_RESOURCE
941 enumerate_keysym_resources (rxvt_define_key);
942#endif
875} 943}
876 944
877/*----------------------- end-of-file (C source) -----------------------*/ 945/*----------------------- end-of-file (C source) -----------------------*/
946

Diff Legend

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