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

Diff Legend

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