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

Diff Legend

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