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

Diff Legend

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