ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.101 by ayin, Thu May 3 18:11:08 2007 UTC vs.
Revision 1.194 by root, Tue Sep 17 20:38:53 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
… …
32#endif 33#endif
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 36#define Optflag_Reverse 1
36#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4
39#define Optflag_Info 8
37 40
38/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
39/* 42/*
40 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
42 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
43 */ 46 */
44 47
45/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
46#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
47 {0, 0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
48 54
49/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
50#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
51 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
52 58
… …
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 64#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 65 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 66
61/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
63 { (option), (flag), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 70
65/* convenient macros */ 71/* convenient macros */
66#define optList_strlen(i) \ 72#define optList_isString(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
68#define optList_isBool(i) \ 74#define optList_isBool(i) \
69 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
70#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
71 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
72#define optList_size \ 78#define optList_isInfo(i) \
73 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
74 80
75static const struct 81static const struct
76 { 82 {
77 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
78 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 107 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
98#if HAVE_SCROLLBARS
99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
101 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 110 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
102 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 111 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 112 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
104 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105#endif
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if TRANSPARENT
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 SWCH ("tr", Opt_transparent, 0, NULL),
113# if TINTING
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115# endif
116#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
120#endif
121#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 121#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 123#ifndef NO_BELL
126# if ENABLE_FRILLS 124# if ENABLE_FRILLS
127 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), 125 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
… …
169#ifndef NO_BOLD_UNDERLINE_REVERSE 167#ifndef NO_BOLD_UNDERLINE_REVERSE
170 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 168 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
171 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 169 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 170 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 171 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#if ENABLE_FRILLS 173#if ENABLE_FRILLS
176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
177#endif 175#endif
178#ifdef KEEP_SCROLLCOLOR
179 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 176 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
177#ifdef RXVT_SCROLLBAR
180 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
181#endif /* KEEP_SCROLLCOLOR */ 179#endif
182#ifdef OPTION_HC 180#ifdef OPTION_HC
183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
184#endif 183#endif
185#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
186 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
187 /* command-line option = resource name */ 186 /* command-line option = resource name */
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef XPM_BACKGROUND 192#if ENABLE_EWMH
194 RSTRG (Rs_path, "path", "search path"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
196#endif 197#endif
197 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
198 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
199#if ENABLE_STYLES 200#if ENABLE_STYLES
200 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
201 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
202 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
203 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
204#endif 205#endif
205#ifdef USE_XIM 206#if USE_XIM
206 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
207 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
208 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 209 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
209 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
210#endif /* USE_XIM */ 211#endif /* USE_XIM */
211 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 212 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
212 STRG (Rs_title, "title", "title", "string", "title name for window"), 213 STRG (Rs_title, "title", "title", "string", "title name for window"),
213 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 214 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
214 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 215 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
215 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
216#if ENABLE_XEMBED 217#if ENABLE_XEMBED
217 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
218#endif 219#endif
219#if XFT 220#if XFT
221 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
222#endif
223#if ENABLE_FRILLS
220 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
221#endif 225 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
222#if ENABLE_FRILLS
223 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 RSTRG (Rs_transient_for, "transient-for", "windowid"),
224 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 227 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 228 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 229 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
237#endif
238#ifdef BUILTIN_GLYPHS
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 239 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
234#endif 240#endif
235#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
237#endif 243#endif
238#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 246#endif
241#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 249#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 250#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 251 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 252#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 253 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 254 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 255 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 256#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 257 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 258 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 259#endif
… …
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 261 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 262 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 263 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 264 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 265#endif
266#if ISO_14755
267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
268 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
269#endif
263#ifndef NO_RESOURCES 270#ifndef NO_RESOURCES
264 INFO ("xrm", "string", "X resource"), 271 RINFO ("xrm", "string"),
272#endif
273#ifdef KEYSYM_RESOURCE
274 RINFO ("keysym.sym", "keysym"),
265#endif 275#endif
266 INFO ("e", "command arg ...", "command to execute") 276 INFO ("e", "command arg ...", "command to execute")
267 }; 277 };
268 278
269#undef INFO 279#undef INFO
280#undef RINFO
270#undef STRG 281#undef STRG
271#undef RSTRG 282#undef RSTRG
272#undef SWCH 283#undef SWCH
273#undef BOOL 284#undef BOOL
274 285
… …
313#endif 324#endif
314 "," 325 ","
315#if OFF_FOCUS_FADING 326#if OFF_FOCUS_FADING
316 "fade," 327 "fade,"
317#endif 328#endif
318#if defined(XPM_BACKGROUND)
319 "XPM,"
320#endif
321#if defined(TRANSPARENT) 329#if defined(ENABLE_TRANSPARENCY)
322 "transparent," 330 "transparent,"
323#endif
324#if TINTING
325 "tint," 331 "tint,"
332#endif
333#if HAVE_PIXBUF
334 "pixbuf,"
326#endif 335#endif
327#if defined(USE_XIM) 336#if defined(USE_XIM)
328 "XIM," 337 "XIM,"
329#endif 338#endif
330#if defined(NO_BACKSPACE_KEY) 339#if defined(NO_BACKSPACE_KEY)
… …
358 "pointerBlank," 367 "pointerBlank,"
359#endif 368#endif
360#if defined(NO_RESOURCES) 369#if defined(NO_RESOURCES)
361 "NoResources," 370 "NoResources,"
362#endif 371#endif
363 "scrollbars=" 372 "scrollbars=plain"
364#if !defined(HAVE_SCROLLBARS)
365 "NONE"
366#else
367# if defined(PLAIN_SCROLLBAR)
368 "plain"
369# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
370 "+"
371# endif
372# endif
373# if defined(RXVT_SCROLLBAR) 373#if defined(RXVT_SCROLLBAR)
374 "rxvt" 374 "+rxvt"
375# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
376 "+"
377# endif
378# endif 375#endif
379# if defined(NEXT_SCROLLBAR) 376#if defined(NEXT_SCROLLBAR)
380 "NeXT" 377 "+NeXT"
381# if defined(XTERM_SCROLLBAR)
382 "+"
383# endif
384# endif 378#endif
385# if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
386 "xterm" 380 "+xterm"
387# endif
388#endif 381#endif
389 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
390 383
391#define INDENT 18 384#define INDENT 28
392 385
393const char rxvt_term::resval_undef [] = "<undef>"; 386const char rxvt_term::resval_undef [] = "<undef>";
394const char rxvt_term::resval_on [] = "on"; 387const char rxvt_term::resval_on [] = "on";
395const char rxvt_term::resval_off [] = "off"; 388const char rxvt_term::resval_off [] = "off";
396 389
397/*{{{ usage: */ 390/*{{{ usage: */
398/*----------------------------------------------------------------------*/ 391/*----------------------------------------------------------------------*/
399static void 392void
400rxvt_usage (int type) 393rxvt_term::rxvt_usage (int type)
401{ 394{
402 unsigned int i, col; 395 unsigned int i, col;
403 396
404 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 397 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
405 398
406 switch (type) 399 switch (type)
407 { 400 {
408 case 0: /* brief listing */ 401 case 0: /* brief listing */
409 rxvt_log (" [-help] [--help]\n"); 402 rxvt_log (" [-help] [--help]\n");
410 403
411 for (col = 1, i = 0; i < optList_size; i++) 404 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
412 if (optList[i].desc != NULL) 405 if (optList[i].desc != NULL)
413 { 406 {
414 int len = 0; 407 int len = 0;
415 408
416 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)
417 { 417 {
418 len = optList_strlen (i);
419 if (len > 0)
420 len++; /* account for space */
421 }
422#ifdef DEBUG_STRICT
423 assert (optList[i].opt != NULL);
424#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426 col += len;
427 if (col > 79)
428 { /* assume regular width */ 418 /* assume regular width */
429 rxvt_log ("\n"); 419 rxvt_log ("\n");
430 col = 1 + len; 420 col = 1 + len;
431 } 421 }
432 422
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 423 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
424
434 if (optList_strlen (i)) 425 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
436 else 427 else
437 rxvt_log ("]"); 428 rxvt_log ("]");
438 } 429 }
439 break; 430 break;
440 431
441 case 1: /* full command-line listing */ 432 case 1: /* full command-line listing */
442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443 434
444 for (i = 0; i < optList_size; i++) 435 for (i = 0; i < ecb_array_length (optList); i++)
445 if (optList[i].desc != NULL) 436 if (optList[i].desc != NULL)
446 { 437 {
447#ifdef DEBUG_STRICT
448 assert (optList[i].opt != NULL); 438 assert (optList[i].opt != NULL);
449#endif
450 rxvt_log (" %s%s %-*s%s%s\n", 439 rxvt_log (" %s%s %-*s%s%s\n",
451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 440 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
452 (INDENT - strlen (optList[i].opt) 441 (INDENT - strlen (optList[i].opt)
453 + (optList_isBool (i) ? 0 : 2)), 442 + (optList_isBool (i) ? 0 : 2)),
454 (optList[i].arg ? optList[i].arg : ""), 443 (optList[i].arg ? optList[i].arg : ""),
455 (optList_isBool (i) ? "turn on/off " : ""), 444 (optList_isBool (i) ? "turn on/off " : ""),
456 optList[i].desc); 445 optList[i].desc);
457 } 446 }
447
448#if ENABLE_PERL
449 rxvt_perl.init (this);
450 rxvt_perl.usage (this, 1);
451#endif
452
458 rxvt_log ("\n --help to list long-options"); 453 rxvt_log ("\n --help to list long-options");
459 break; 454 break;
460 455
461 case 2: /* full resource listing */ 456 case 2: /* full resource listing */
462 rxvt_log (" [options] [-e command args]\n\n" 457 rxvt_log (" [options] [-e command args]\n\n"
463 "where resources (long-options) include:\n"); 458 "where resources (long-options) include:\n");
464 459
465 for (i = 0; i < optList_size; i++) 460 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 461 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 462 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 463 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 464 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 465 (optList_isBool (i) ? "boolean" : optList[i].arg));
471#ifdef KEYSYM_RESOURCE 466
472 rxvt_log (" " "keysym.sym" ": %*s%s\n", 467#if ENABLE_PERL
473 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 468 rxvt_perl.init (this);
474 "keysym"); 469 rxvt_perl.usage (this, 2);
475#endif 470#endif
471
476 rxvt_log ("\n -help to list options"); 472 rxvt_log ("\n -help to list options");
477 break; 473 break;
478 } 474 }
479 475
480 rxvt_log ("\n\n"); 476 rxvt_log ("\n\n");
481 rxvt_exit_failure (); 477 rxvt_exit_failure ();
482 /* NOTREACHED */
483} 478}
484 479
485/*}}} */ 480/*}}} */
486 481
487/*{{{ get command-line options before getting resources */ 482/*{{{ get command-line options before getting resources */
488void 483const char **
489rxvt_term::get_options (int argc, const char *const *argv) 484rxvt_term::get_options (int argc, const char *const *argv)
490{ 485{
491 int i, bad_option = 0; 486 int i, bad_option = 0;
492 487
493 for (i = 1; i < argc; i++) 488 for (i = 1; i < argc; i++)
494 { 489 {
495 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 491 const char *opt;
492 int flag;
497 493
498 opt = argv[i]; 494 opt = argv[i];
499 495
500 if (*opt == '-') 496 if (*opt == '-')
501 { 497 {
502 flag = resval_on; 498 flag = 1;
503 499
504 if (*++opt == '-') 500 if (*++opt == '-')
505 longopt = *opt++; /* long option */ 501 longopt = *opt++; /* long option */
506 } 502 }
507 else if (*opt == '+') 503 else if (*opt == '+')
508 { 504 {
509 flag = resval_off; 505 flag = 0;
510 506
511 if (*++opt == '+') 507 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
513 } 509 }
514 else 510 else
… …
523 519
524 if (!strcmp (opt, "h")) 520 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 521 rxvt_usage (0);
526 522
527 /* feature: always try to match long-options */ 523 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 524 for (entry = 0; entry < ecb_array_length (optList); entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 525 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 526 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 527 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 528 break;
533 529
534 if (entry < optList_size) 530 if (entry < ecb_array_length (optList)
531 && !optList_isInfo (entry))
535 { 532 {
536 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 534 flag = !flag;
538 535
539 if (optList_strlen (entry)) 536 if (optList_isString (entry))
540 { 537 {
541 /* 538 /*
542 * special cases are handled in main.c:main () to allow 539 * special cases are handled in init_resources () to allow
543 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
544 * default values 541 * default values
545 */ 542 */
546 543
547 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
548 { 545 {
549 if (flag == resval_on && !argv [i+1]) 546 if (flag && i + 1 == argc)
550 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 547 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 548
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 549 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
553 } 550 }
554 } 551 }
555 else 552 else
553 {
556 { /* boolean value */ 554 /* boolean value */
557 set_option (optList[entry].index, flag == resval_on); 555 set_option (optList[entry].index, flag);
558 556
559 if (optList[entry].doff != -1) 557 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 558 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 559 }
562 } 560 }
561#ifndef NO_RESOURCES
562 else if (!strcmp (opt, "xrm"))
563 {
564 if (i + 1 < argc)
565 XrmPutLineResource (&option_db, argv[++i]);
566 }
567#endif
568#ifdef KEYSYM_RESOURCE
569 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
570 {
571 if (i + 1 < argc)
572 {
573 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
574 sprintf (res, "*.%s: %s\n", opt, argv[i]);
575 XrmPutLineResource (&option_db, res);
576 }
577 }
578#endif
579 else if (!strcmp (opt, "e"))
580 {
581 if (i + 1 < argc)
582 return (const char **)argv + i + 1;
583
584 rxvt_warn ("option '-e' requires an argument, aborting.\n");
585 bad_option = 1;
586 }
563 else 587 else
564#ifdef KEYSYM_RESOURCE 588 {
565 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ 589#if ENABLE_PERL
566 if (rxvt_Str_match (opt, "keysym.")) 590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
567 { 593 {
568 const char *str = argv[++i]; 594 if (flags & rxvt_perl.RESOURCE_ARG)
569 595 {
570 if (str != NULL) 596 if (i + 1 == argc)
571 parse_keysym (opt + sizeof ("keysym.") - 1, str); 597 {
598 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
599 bad_option = 1;
600 }
601 else
602 ++i;
603 }
572 } 604 }
573 else 605 else
574#endif 606#endif
575 { 607 {
576 bad_option = 1;
577 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 608 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1;
578 } 610 }
611 }
579 } 612 }
580 613
581 if (bad_option) 614 if (bad_option)
582 rxvt_usage (0); 615 rxvt_usage (0);
616
617 return 0;
583} 618}
584 619
585/*}}} */ 620/*}}} */
586 621
587#ifndef NO_RESOURCES
588/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
589 623
590# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
591/* 625static void
592 * Define key from XrmEnumerateDatabase. 626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
593 * quarks will be something like
594 * "rxvt" "keysym" "0xFF01"
595 * value will be a string
596 */
597/* ARGSUSED */
598int
599rxvt_define_key (XrmDatabase *database UNUSED,
600 XrmBindingList bindings UNUSED,
601 XrmQuarkList quarks,
602 XrmRepresentation *type UNUSED,
603 XrmValue *value,
604 XPointer closure UNUSED)
605{ 627{
606 int last; 628 term->bind_action (k, v);
607
608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
609 ;
610
611 last--;
612 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
613 return False;
614} 629}
615 630
616/* 631/*
617 * look for something like this (XK_Delete) 632 * look for something like this (XK_Delete)
618 * rxvt*keysym.0xFFFF: "\177" 633 * rxvt*keysym.0xFFFF: "\177"
619 *
620 * arg will be
621 * NULL for ~/.Xdefaults and
622 * non-NULL for command-line options (need to allocate)
623 */ 634 */
624#define NEWARGLIM 500 /* `reasonable' size */
625 635
626struct keysym_vocabulary_t 636struct keysym_vocabulary_t
627{ 637{
628 const char *name; 638 const char *name;
629 unsigned short len; 639 unsigned short len;
630 unsigned short value; 640 unsigned short value;
631}; 641};
632keysym_vocabulary_t keysym_vocabulary[] = 642static const keysym_vocabulary_t keysym_vocabulary[] =
633{ 643{
634 { "ISOLevel3", 9, Level3Mask }, 644 { "ISOLevel3", 9, Level3Mask },
635 { "AppKeypad", 9, AppKeypadMask }, 645 { "AppKeypad", 9, AppKeypadMask },
636 { "Control", 7, ControlMask }, 646 { "Control", 7, ControlMask },
637 { "NumLock", 7, NumLockMask }, 647 { "NumLock", 7, NumLockMask },
… …
657 { "4", 1, Mod4Mask }, 667 { "4", 1, Mod4Mask },
658 { "5", 1, Mod5Mask }, 668 { "5", 1, Mod5Mask },
659}; 669};
660 670
661int 671int
662rxvt_term::parse_keysym (const char *str, const char *arg) 672rxvt_term::parse_keysym (const char *str, unsigned int &state)
663{ 673{
664 int n, sym; 674 int sym;
665 unsigned int state = 0; 675 const char *key = strrchr (str, '-');
666 const char *pmodend = NULL;
667 char *newarg = NULL;
668 char newargstr[NEWARGLIM];
669 676
670 if (arg == NULL) 677 state = 0;
671 {
672 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
673 return 0;
674 678
675 str += n; /* skip `keysym.' */ 679 if (!key)
676 if (!(pmodend = strchr (str, ':'))) 680 key = str;
677 return -1;
678 }
679 else 681 else
680 pmodend = str + strlen(str); 682 key++;
681 683
682 for (--pmodend; str < pmodend; --pmodend) 684 // string or key is empty
683 if (*pmodend == '-') 685 if (*key == '\0')
684 break; 686 return -1;
685 687
688 // parse modifiers
686 while (str < pmodend) 689 while (str < key)
687 { 690 {
688 unsigned int i; 691 unsigned int i;
689 692
690 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 693 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
691 { 694 {
692 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 695 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
693 { 696 {
694 state |= keysym_vocabulary[i].value; 697 state |= keysym_vocabulary[i].value;
695 str += keysym_vocabulary[i].len; 698 str += keysym_vocabulary[i].len;
696 break; 699 break;
697 } 700 }
698 } 701 }
699 702
700 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 703 if (i >= ecb_array_length (keysym_vocabulary))
701 return -1; 704 return -1;
702 705
703 if (*str == '-') 706 if (*str == '-')
704 ++str; 707 ++str;
705 } 708 }
706 709
707 /* some scanf () have trouble with a 0x prefix */ 710 // convert keysym name to keysym number
708 if (str[0] == '0' && toupper (str[1]) == 'X') 711 if ((sym = XStringToKeysym (str)) == None)
709 { 712 {
710 str += 2; 713 // fallback on hexadecimal parsing
711 714 char *end;
715 sym = strtol (str, &end, 16);
712 if (arg) 716 if (*end)
713 {
714 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
715 return -1;
716 }
717 else
718 {
719 if (sscanf (str, "%x:", &sym) != 1)
720 return -1;
721
722 /* cue to ':', it's there since sscanf () worked */
723 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
724 newargstr[NEWARGLIM - 1] = '\0';
725 newarg = newargstr;
726 }
727 }
728 else
729 {
730 /*
731 * convert keysym name to keysym number
732 */
733 strncpy (newargstr, str, NEWARGLIM - 1);
734 newargstr[NEWARGLIM - 1] = '\0';
735
736 if (arg == NULL)
737 {
738 if ((newarg = strchr (newargstr, ':')) == NULL)
739 return -1;
740
741 *newarg++ = '\0'; /* terminate keysym name */
742 }
743
744 if ((sym = XStringToKeysym (newargstr)) == None)
745 return -1; 717 return -1;
746 } 718 }
747 719
748 if (newarg == NULL) 720 return sym;
749 { 721}
750 strncpy (newargstr, arg, NEWARGLIM - 1);
751 newargstr[NEWARGLIM - 1] = '\0';
752 newarg = newargstr;
753 }
754 722
755 rxvt_Str_trim (newarg); 723int
756 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 724rxvt_term::bind_action (const char *str, const char *arg)
725{
726 int sym;
727 unsigned int state;
728
729 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
757 return -1; 730 return -1;
758 731
732 wchar_t *ws = rxvt_mbstowcs (arg);
733 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
759 keyboard->register_user_translation (sym, state, newarg); 734 keyboard->register_action (sym, state, ws);
735
736 free (ws);
760 return 1; 737 return 1;
761} 738}
762 739
763# endif /* KEYSYM_RESOURCE */ 740#endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */
765 741
766static char * 742static char *
767get_res (XrmDatabase database, const char *program, const char *option) 743get_res (XrmDatabase database, const char *program, const char *option)
768{ 744{
769 char resource[512]; 745 char resource[512];
… …
801 777
802void 778void
803rxvt_term::extract_resources () 779rxvt_term::extract_resources ()
804{ 780{
805#ifndef NO_RESOURCES 781#ifndef NO_RESOURCES
782 XrmDatabase database = XrmGetDatabase (dpy);
783 XrmMergeDatabases (option_db, &database);
784 option_db = NULL;
806 /* 785 /*
807 * Query resources for options that affect us 786 * Query resources for options that affect us
808 */ 787 */
809 for (int entry = 0; entry < optList_size; entry++) 788 for (int entry = 0; entry < ecb_array_length (optList); entry++)
810 { 789 {
811 int s; 790 int s;
812 const char *kw = optList[entry].kw; 791 const char *kw = optList[entry].kw;
813 792
814 if (kw == NULL || rs[optList[entry].doff] != NULL) 793 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
834 813
835 set_option (optList[entry].index, s); 814 set_option (optList[entry].index, s);
836 } 815 }
837 } 816 }
838 } 817 }
818#endif /* NO_RESOURCES */
819}
839 820
821struct rxvt_enumerate_closure
822{
823 rxvt_term *term;
824 void (*cb)(rxvt_term *, const char *, const char *);
825 int specific; // iterate over only a specific subhierarchy
826};
827
828/*
829 * Define key from XrmEnumerateDatabase.
830 * quarks will be something like
831 * "rxvt" "keysym" "0xFF01"
832 * value will be a string
833 */
834static int
835rxvt_enumerate_helper (
836 XrmDatabase *database ecb_unused,
837 XrmBindingList bindings ecb_unused,
838 XrmQuarkList quarks,
839 XrmRepresentation *type ecb_unused,
840 XrmValue *value,
841 XPointer closure
842)
843{
844 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
845
846 if (*quarks == NULLQUARK) return False;
847
848 // if the quark list starts with a tighly bound quark, we skip it,
849 // as it is the exactly matched the prefix. Otherwise, it matched because
850 // it started with "*", in which case we assuime the prefix is part
851 // of the "*".
852 if (*bindings == XrmBindTightly)
853 {
854 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
855 if (*quarks == NULLQUARK) return False;
856 }
857
858 // specific, a bit misleadingly named, is used when a specific "subclass"
859 // is iterated over, e.g. "keysym", and is used to skip one more
860 // component, as well as all generic prefixes
861 // this is a bit of a hack, ideally, keysym (the only user) should use its
862 // own iteration function, but this ought to be less bloated
863 if (data->specific)
864 {
865 if (*bindings != XrmBindTightly)
866 return False;
867
868 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
869 if (*quarks == NULLQUARK) return False;
870 }
871
872 char *pattern;
873 if (quarks[1] == NULLQUARK)
874 pattern = XrmQuarkToString (quarks[0]); // single component, fats path
875 else
876 {
877 // multiple components, slow path - should be rare, to don't optimize for speed
878 int size = 0;
879
880 for (int i = 0; quarks[i] != NULLQUARK; ++i)
881 size += strlen (XrmQuarkToString (quarks[i])) + 1;
882
883 pattern = rxvt_temp_buf<char> (size + 1);
884
885 // now print all components
886 {
887 char *cur = pattern;
888
889 for (int i = 0; quarks[i] != NULLQUARK; ++i)
890 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
891 }
892
893 ++pattern; // skip initial dot
894 }
895
896 data->cb (data->term, pattern, (char *)value->addr);
897
898 return False;
899}
900
901void
902rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
903{
840 /* 904 /*
841 * [R5 or later]: enumerate the resource database 905 * [R5 or later]: enumerate the resource database
842 */ 906 */
907 assert (!name_p == !class_p); // both must be specified, or missing
908
843# ifdef KEYSYM_RESOURCE 909#ifdef KEYSYM_RESOURCE
910 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
911
844 XrmDatabase database = XrmGetDatabase (dpy); 912 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 913 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 914 XrmClass class_prefix[3];
847 915
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 916 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
849 name_prefix[1] = XrmStringToName ("keysym");
850 name_prefix[2] = NULLQUARK; 917 name_prefix[2] = NULLQUARK;
851 class_prefix[0] = XrmStringToName (RESCLASS); 918 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
852 class_prefix[1] = XrmStringToName ("Keysym");
853 class_prefix[2] = NULLQUARK; 919 class_prefix[2] = NULLQUARK;
854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 920
921# ifdef RESFALLBACK
922 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
855 XrmEnumerateDatabase (database, name_prefix, class_prefix, 923 XrmEnumerateDatabase (database, name_prefix, class_prefix,
856 XrmEnumOneLevel, rxvt_define_key, NULL); 924 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
857# ifdef RESFALLBACK 925# endif
858 name_prefix[0] = XrmStringToName (RESFALLBACK); 926
859 name_prefix[1] = XrmStringToName ("keysym");
860 class_prefix[0] = XrmStringToName (RESFALLBACK); 927 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
861 class_prefix[1] = XrmStringToName ("Keysym");
862 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
863 XrmEnumerateDatabase (database, name_prefix, class_prefix, 928 XrmEnumerateDatabase (database, name_prefix, class_prefix,
864 XrmEnumOneLevel, rxvt_define_key, NULL); 929 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
865# 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);
866# endif 934#endif
935}
867 936
868#endif /* NO_RESOURCES */ 937void
938rxvt_term::extract_keysym_resources ()
939{
940#ifdef KEYSYM_RESOURCE
941 enumerate_keysym_resources (rxvt_define_key);
942#endif
869} 943}
870 944
871/*----------------------- end-of-file (C source) -----------------------*/ 945/*----------------------- end-of-file (C source) -----------------------*/
946

Diff Legend

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