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.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC vs.
Revision 1.200 by root, Fri Dec 23 21:46:46 2022 UTC

… …
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 <schmorp@schmorp.de> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * 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
13 * 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
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 3 of the License, or
15 * (at your option) any later version. 15 * (at your option) any later version.
16 * 16 *
17 * 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,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
46 */ 46 */
47 47
48/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
49#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
50 {0, Optflag_Info, -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}
51 54
52/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
53#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
54 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
55 58
… …
93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
94 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
95 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
96 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
97 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
98 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
99 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"),
100 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
101 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
102 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"),
103 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
104 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
108 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"),
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 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"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
119#endif
120#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
121 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
122 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
123#endif 121#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
… …
136#endif 134#endif
137#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
138 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
139#endif 137#endif
140#if ENABLE_FRILLS 138#if ENABLE_FRILLS
139 BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_disablePasteBrackets, 0, "paste bracket suppression"),
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"), 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
142 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
143 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
144#endif 143#endif
145#if CURSOR_BLINK 144#if CURSOR_BLINK
… …
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 189#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#ifdef BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"),
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197# if ENABLE_EWMH 193#if ENABLE_EWMH
198 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 194 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
199# endif 195#endif
196#ifdef HAVE_XMU
197 RSTRG (Rs_pointerShape, "pointerShape", "string"),
200#endif 198#endif
201 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203#if ENABLE_STYLES 201#if ENABLE_STYLES
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 203 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 204 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 205 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
208#endif 206#endif
209#ifdef USE_XIM 207#if USE_XIM
210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
211 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 209 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
212 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 210 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
213 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 211 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
214#endif /* USE_XIM */ 212#endif /* USE_XIM */
… …
219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 217 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
220#if ENABLE_XEMBED 218#if ENABLE_XEMBED
221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 219 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222#endif 220#endif
223#if XFT 221#if XFT
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
223#endif
224#if ENABLE_FRILLS
225 STRG (Rs_refreshRate, "refreshRate", "fps", "number", "refresh rate / frames per second"),
224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 226 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
225 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 227 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
226#endif
227#if ENABLE_FRILLS
228 RSTRG (Rs_transient_for, "transient-for", "windowid"), 228 RSTRG (Rs_transient_for, "transient-for", "windowid"),
229 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 229 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "override-redirect on the terminal window"),
230 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 230 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
231 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 231 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
236 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 236 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
237 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 237 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
238 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), 238 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
239#endif 239#endif
240#ifdef BUILTIN_GLYPHS 240#ifdef BUILTIN_GLYPHS
241 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 241 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "use of font glyphs instead of internal glyphs"),
242#endif 242#endif
243#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
244 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 244 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
245#endif 245#endif
246#ifndef NO_BACKSPACE_KEY 246#ifndef NO_BACKSPACE_KEY
… …
254#endif 254#endif
255 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 255 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
256 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
257 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 257 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
258#ifndef NO_SECONDARY_SCREEN 258#ifndef NO_SECONDARY_SCREEN
259 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 259 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "secondary screen"),
260 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 260 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "secondary screen scroll"),
261#endif
262#if ENABLE_FRILLS
263 STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
261#endif 264#endif
262#if ENABLE_PERL 265#if ENABLE_PERL
263 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 266 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
264 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
265 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
… …
267#endif 270#endif
268#if ISO_14755 271#if ISO_14755
269 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
270 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
271#endif 274#endif
272#ifdef HAVE_AFTERIMAGE 275#ifndef NO_RESOURCES
273 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 RINFO ("xrm", "string"),
277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
274#endif 280#endif
275 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
276 }; 282 };
277 283
278#undef INFO 284#undef INFO
285#undef RINFO
279#undef STRG 286#undef STRG
280#undef RSTRG 287#undef RSTRG
281#undef SWCH 288#undef SWCH
282#undef BOOL 289#undef BOOL
283 290
… …
326#endif 333#endif
327#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 335 "transparent,"
329 "tint," 336 "tint,"
330#endif 337#endif
331#if HAVE_AFTERIMAGE
332 "afterimage,"
333#endif
334#if HAVE_PIXBUF 338#if HAVE_PIXBUF
335 "pixbuf," 339 "pixbuf,"
336#endif 340#endif
337#if defined(USE_XIM) 341#if defined(USE_XIM)
338 "XIM," 342 "XIM,"
… …
380#if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
381 "+xterm" 385 "+xterm"
382#endif 386#endif
383 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
384 388
385#define INDENT 18 389#define INDENT 28
386 390
387const char rxvt_term::resval_undef [] = "<undef>"; 391const char rxvt_term::resval_undef [] = "<undef>";
388const char rxvt_term::resval_on [] = "on"; 392const char rxvt_term::resval_on [] = "on";
389const char rxvt_term::resval_off [] = "off"; 393const char rxvt_term::resval_off [] = "off";
390 394
391/*{{{ usage: */ 395/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
393static void 397void
394rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
395{ 399{
396 unsigned int i, col; 400 unsigned int i, col;
397 401
398 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
399 403
… …
407 { 411 {
408 int len = 0; 412 int len = 0;
409 413
410 if (optList[i].arg) 414 if (optList[i].arg)
411 len = strlen (optList[i].arg) + 1; 415 len = strlen (optList[i].arg) + 1;
416
412 assert (optList[i].opt != NULL); 417 assert (optList[i].opt != NULL);
413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
414 col += len; 419 col += len;
420
415 if (col > 79) 421 if (col > 79)
416 { 422 {
417 /* assume regular width */ 423 /* assume regular width */
418 rxvt_log ("\n"); 424 rxvt_log ("\n");
419 col = 1 + len; 425 col = 1 + len;
420 } 426 }
421 427
422 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
423 if (optList[i].arg) 430 if (optList[i].arg)
424 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
425 else 432 else
426 rxvt_log ("]"); 433 rxvt_log ("]");
427 } 434 }
… …
440 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
441 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
442 (optList_isBool (i) ? "turn on/off " : ""), 449 (optList_isBool (i) ? "turn on/off " : ""),
443 optList[i].desc); 450 optList[i].desc);
444 } 451 }
452
453#if ENABLE_PERL
454 rxvt_perl.init (this);
455 rxvt_perl.usage (this, 1);
456#endif
457
445 rxvt_log ("\n --help to list long-options"); 458 rxvt_log ("\n --help to list long-options");
446 break; 459 break;
447 460
448 case 2: /* full resource listing */ 461 case 2: /* full resource listing */
449 rxvt_log (" [options] [-e command args]\n\n" 462 rxvt_log (" [options] [-e command args]\n\n"
… …
451 464
452 for (i = 0; i < ecb_array_length (optList); i++) 465 for (i = 0; i < ecb_array_length (optList); i++)
453 if (optList[i].kw != NULL) 466 if (optList[i].kw != NULL)
454 rxvt_log (" %s: %*s%s\n", 467 rxvt_log (" %s: %*s%s\n",
455 optList[i].kw, 468 optList[i].kw,
456 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 469 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
457 (optList_isBool (i) ? "boolean" : optList[i].arg)); 470 (optList_isBool (i) ? "boolean" : optList[i].arg));
458#ifdef KEYSYM_RESOURCE 471
459 rxvt_log (" " "keysym.sym" ": %*s%s\n", 472#if ENABLE_PERL
460 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 473 rxvt_perl.init (this);
461 "keysym"); 474 rxvt_perl.usage (this, 2);
462#endif 475#endif
476
463 rxvt_log ("\n -help to list options"); 477 rxvt_log ("\n -help to list options");
464 break; 478 break;
465 } 479 }
466 480
467 rxvt_log ("\n\n"); 481 rxvt_log ("\n\n");
… …
532 * default values 546 * default values
533 */ 547 */
534 548
535 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
536 { 550 {
537 if (flag && i+1 == argc) 551 if (flag && i + 1 == argc)
538 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
539 553
540 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
541 } 555 }
542 } 556 }
… …
550 } 564 }
551 } 565 }
552#ifndef NO_RESOURCES 566#ifndef NO_RESOURCES
553 else if (!strcmp (opt, "xrm")) 567 else if (!strcmp (opt, "xrm"))
554 { 568 {
555 if (i+1 < argc) 569 if (i + 1 < argc)
556 XrmPutLineResource (&option_db, argv[++i]); 570 XrmPutLineResource (&option_db, argv[++i]);
557 } 571 }
558#endif 572#endif
559#ifdef KEYSYM_RESOURCE 573#ifdef KEYSYM_RESOURCE
560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
561 { 575 {
562 if (i+1 < argc) 576 if (i + 1 < argc)
563 { 577 {
564 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 578 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
565 sprintf (res, "*.%s: %s\n", opt, argv[i]); 579 sprintf (res, "*.%s: %s\n", opt, argv[i]);
566 XrmPutLineResource (&option_db, res); 580 XrmPutLineResource (&option_db, res);
567 } 581 }
568 } 582 }
569#endif 583#endif
570 else if (!strcmp (opt, "e")) 584 else if (!strcmp (opt, "e"))
571 { 585 {
572 if (i+1 == argc) 586 if (i + 1 < argc)
573 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
574
575 return (const char **)argv + i + 1; 587 return (const char **)argv + i + 1;
588
589 rxvt_warn ("option '-e' requires an argument, aborting.\n");
590 bad_option = 1;
576 } 591 }
577 else 592 else
578 { 593 {
594#if ENABLE_PERL
595 rxvt_perl.init (this);
596
597 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
598 {
599 if (flags & rxvt_perl.RESOURCE_ARG)
600 {
601 if (i + 1 == argc)
602 {
603 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
579 bad_option = 1; 604 bad_option = 1;
605 }
606 else
607 ++i;
608 }
609 }
610 else
611#endif
612 {
580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 613 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
614 bad_option = 1;
615 }
581 } 616 }
582 } 617 }
583 618
584 if (bad_option) 619 if (bad_option)
585 rxvt_usage (0); 620 rxvt_usage (0);
… …
587 return 0; 622 return 0;
588} 623}
589 624
590/*}}} */ 625/*}}} */
591 626
592#ifndef NO_RESOURCES
593/*----------------------------------------------------------------------*/ 627/*----------------------------------------------------------------------*/
594 628
595# ifdef KEYSYM_RESOURCE 629#ifdef KEYSYM_RESOURCE
596/*
597 * Define key from XrmEnumerateDatabase.
598 * quarks will be something like
599 * "rxvt" "keysym" "0xFF01"
600 * value will be a string
601 */
602static int 630static void
603rxvt_define_key (XrmDatabase *database ecb_unused, 631rxvt_define_key (rxvt_term *term, const char *k, const char *v)
604 XrmBindingList bindings ecb_unused,
605 XrmQuarkList quarks,
606 XrmRepresentation *type ecb_unused,
607 XrmValue *value,
608 XPointer closure ecb_unused)
609{ 632{
610 int last; 633 term->bind_action (k, v);
611
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
613 ;
614
615 last--;
616 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
617 return False;
618} 634}
619 635
620/* 636/*
621 * look for something like this (XK_Delete) 637 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 638 * rxvt*keysym.0xFFFF: "\177"
… …
656 { "4", 1, Mod4Mask }, 672 { "4", 1, Mod4Mask },
657 { "5", 1, Mod5Mask }, 673 { "5", 1, Mod5Mask },
658}; 674};
659 675
660int 676int
661rxvt_term::parse_keysym (const char *str, const char *arg) 677rxvt_term::parse_keysym (const char *str, unsigned int &state)
662{ 678{
663 int sym; 679 int sym;
664 unsigned int state = 0;
665 const char *key = strrchr (str, '-'); 680 const char *key = strrchr (str, '-');
681
682 state = 0;
666 683
667 if (!key) 684 if (!key)
668 key = str; 685 key = str;
669 else 686 else
670 key++; 687 key++;
671 688
672 // string or key is empty 689 // string or key is empty
673 if (*arg == '\0' || *key == '\0') 690 if (*key == '\0')
674 return -1; 691 return -1;
675 692
676 // parse modifiers 693 // parse modifiers
677 while (str < key) 694 while (str < key)
678 { 695 {
… …
703 sym = strtol (str, &end, 16); 720 sym = strtol (str, &end, 16);
704 if (*end) 721 if (*end)
705 return -1; 722 return -1;
706 } 723 }
707 724
725 return sym;
726}
727
728int
729rxvt_term::bind_action (const char *str, const char *arg)
730{
731 int sym;
732 unsigned int state;
733
734 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
735 return -1;
736
708 wchar_t *ws = rxvt_mbstowcs (arg); 737 wchar_t *ws = rxvt_mbstowcs (arg);
709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 738 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
710 keyboard->register_user_translation (sym, state, ws); 739 keyboard->register_action (sym, state, ws);
740
711 free (ws); 741 free (ws);
712 return 1; 742 return 1;
713} 743}
714 744
715# endif /* KEYSYM_RESOURCE */ 745#endif /* KEYSYM_RESOURCE */
716#endif /* NO_RESOURCES */
717 746
718static char * 747static char *
719get_res (XrmDatabase database, const char *program, const char *option) 748get_res (XrmDatabase database, const char *program, const char *option)
720{ 749{
721 char resource[512]; 750 char resource[512];
… …
792 } 821 }
793 } 822 }
794#endif /* NO_RESOURCES */ 823#endif /* NO_RESOURCES */
795} 824}
796 825
826struct rxvt_enumerate_closure
827{
828 rxvt_term *term;
829 void (*cb)(rxvt_term *, const char *, const char *);
830 int specific; // iterate over only a specific subhierarchy
831};
832
833/*
834 * Define key from XrmEnumerateDatabase.
835 * quarks will be something like
836 * "rxvt" "keysym" "0xFF01"
837 * value will be a string
838 */
839static int
840rxvt_enumerate_helper (
841 XrmDatabase *database ecb_unused,
842 XrmBindingList bindings ecb_unused,
843 XrmQuarkList quarks,
844 XrmRepresentation *type ecb_unused,
845 XrmValue *value,
846 XPointer closure
847)
848{
849 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
850
851 if (*quarks == NULLQUARK) return False;
852
853 // if the quark list starts with a tightly bound quark, we skip it,
854 // as it exactly matched the prefix. Otherwise, it matched because
855 // it started with "*", in which case we assume the prefix is part
856 // of the "*".
857 if (*bindings == XrmBindTightly)
858 {
859 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
860 if (*quarks == NULLQUARK) return False;
861 }
862
863 // specific, a bit misleadingly named, is used when a specific "subclass"
864 // is iterated over, e.g. "keysym", and is used to skip one more
865 // component, as well as all generic prefixes
866 // this is a bit of a hack, ideally, keysym (the only user) should use its
867 // own iteration function, but this ought to be less bloated
868 if (data->specific)
869 {
870 ++quarks, ++bindings;
871 if (*quarks == NULLQUARK) return False;
872 }
873
874 char *pattern;
875 if (quarks[1] == NULLQUARK)
876 pattern = XrmQuarkToString (quarks[0]); // single component, fast path
877 else
878 {
879 // multiple components, slow path - should be rare, don't optimize for speed
880 int size = 0;
881
882 for (int i = 0; quarks[i] != NULLQUARK; ++i)
883 size += strlen (XrmQuarkToString (quarks[i])) + 1;
884
885 pattern = rxvt_temp_buf<char> (size + 1);
886
887 // now print all components
888 {
889 char *cur = pattern;
890
891 for (int i = 0; quarks[i] != NULLQUARK; ++i)
892 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
893 }
894
895 ++pattern; // skip initial dot
896 }
897
898 data->cb (data->term, pattern, (char *)value->addr);
899
900 return False;
901}
902
797void 903void
798rxvt_term::extract_keysym_resources () 904rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
799{ 905{
800#ifndef NO_RESOURCES
801 /* 906 /*
802 * [R5 or later]: enumerate the resource database 907 * [R5 or later]: enumerate the resource database
803 */ 908 */
909 assert (!name_p == !class_p); // both must be specified, or missing
910
804# ifdef KEYSYM_RESOURCE 911#ifdef KEYSYM_RESOURCE
912 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
913
805 XrmDatabase database = XrmGetDatabase (dpy); 914 XrmDatabase database = XrmGetDatabase (dpy);
806 XrmName name_prefix[3]; 915 XrmName name_prefix[3];
807 XrmClass class_prefix[3]; 916 XrmClass class_prefix[3];
808 917
809 name_prefix[0] = XrmStringToName (rs[Rs_name]); 918 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
810 name_prefix[1] = XrmStringToName ("keysym");
811 name_prefix[2] = NULLQUARK; 919 name_prefix[2] = NULLQUARK;
812 class_prefix[0] = XrmStringToName (RESCLASS); 920 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
813 class_prefix[1] = XrmStringToName ("Keysym");
814 class_prefix[2] = NULLQUARK; 921 class_prefix[2] = NULLQUARK;
815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 922
923# ifdef RESFALLBACK
924 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
816 XrmEnumerateDatabase (database, name_prefix, class_prefix, 925 XrmEnumerateDatabase (database, name_prefix, class_prefix,
817 XrmEnumOneLevel, rxvt_define_key, NULL); 926 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
818# ifdef RESFALLBACK 927# endif
928
819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 929 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
821 XrmEnumerateDatabase (database, name_prefix, class_prefix, 930 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL); 931 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
823# endif 932
933 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
934 XrmEnumerateDatabase (database, name_prefix, class_prefix,
935 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
824# endif 936#endif
937}
825 938
826#endif /* NO_RESOURCES */ 939void
940rxvt_term::extract_keysym_resources ()
941{
942#ifdef KEYSYM_RESOURCE
943 enumerate_keysym_resources (rxvt_define_key);
944#endif
827} 945}
828 946
829/*----------------------- end-of-file (C source) -----------------------*/ 947/*----------------------- end-of-file (C source) -----------------------*/
948

Diff Legend

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