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.97 by ayin, Tue May 1 09:34:07 2007 UTC vs.
Revision 1.187 by sf-exg, Mon May 11 22:05:58 2015 UTC

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

Diff Legend

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