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

Diff Legend

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