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.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC vs.
Revision 1.197 by root, Sat Jul 3 04:04:13 2021 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
… …
96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
97 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
98 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
99 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"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
102 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"),
103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 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"),
106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
111 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"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 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"),
114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
122#endif
123#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
124 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"),
125 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"),
126#endif 121#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
… …
139#endif 134#endif
140#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
142#endif 137#endif
143#if ENABLE_FRILLS 138#if ENABLE_FRILLS
139 BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_disablePasteBrackets, 0, "do not emit bracketed paste mode sequences"),
144 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"),
145 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"),
146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
147#endif 143#endif
148#if CURSOR_BLINK 144#if CURSOR_BLINK
… …
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 189#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 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"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#ifdef BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200# if ENABLE_EWMH 193#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 194 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif 195#endif
196#ifdef HAVE_XMU
197 RSTRG (Rs_pointerShape, "pointerShape", "string"),
203#endif 198#endif
204 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 201#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 203 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 204 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
210 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"),
211#endif 206#endif
212#ifdef USE_XIM 207#if USE_XIM
213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 208 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
214 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"),
215 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"),
216 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"),
217#endif /* USE_XIM */ 212#endif /* USE_XIM */
… …
222 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"),
223#if ENABLE_XEMBED 218#if ENABLE_XEMBED
224 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"),
225#endif 220#endif
226#if XFT 221#if XFT
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
223#endif
224#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 225 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 226 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 227 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 228 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
234 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 230 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 231 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
260 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 256 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
261#ifndef NO_SECONDARY_SCREEN 257#ifndef NO_SECONDARY_SCREEN
262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 258 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 259 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
264#endif 260#endif
261#if ENABLE_FRILLS
262 STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
263#endif
265#if ENABLE_PERL 264#if ENABLE_PERL
266 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 265 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 266 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 267 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
269 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 268 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
270#endif 269#endif
271#if ISO_14755 270#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 271 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 272 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
274#endif
275#ifdef HAVE_AFTERIMAGE
276 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
277#endif 273#endif
278#ifndef NO_RESOURCES 274#ifndef NO_RESOURCES
279 RINFO ("xrm", "string"), 275 RINFO ("xrm", "string"),
280#endif 276#endif
281#ifdef KEYSYM_RESOURCE 277#ifdef KEYSYM_RESOURCE
… …
336#endif 332#endif
337#if defined(ENABLE_TRANSPARENCY) 333#if defined(ENABLE_TRANSPARENCY)
338 "transparent," 334 "transparent,"
339 "tint," 335 "tint,"
340#endif 336#endif
341#if HAVE_AFTERIMAGE
342 "afterimage,"
343#endif
344#if HAVE_PIXBUF 337#if HAVE_PIXBUF
345 "pixbuf," 338 "pixbuf,"
346#endif 339#endif
347#if defined(USE_XIM) 340#if defined(USE_XIM)
348 "XIM," 341 "XIM,"
… …
390#if defined(XTERM_SCROLLBAR) 383#if defined(XTERM_SCROLLBAR)
391 "+xterm" 384 "+xterm"
392#endif 385#endif
393 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
394 387
395#define INDENT 18 388#define INDENT 28
396 389
397const char rxvt_term::resval_undef [] = "<undef>"; 390const char rxvt_term::resval_undef [] = "<undef>";
398const char rxvt_term::resval_on [] = "on"; 391const char rxvt_term::resval_on [] = "on";
399const char rxvt_term::resval_off [] = "off"; 392const char rxvt_term::resval_off [] = "off";
400 393
401/*{{{ usage: */ 394/*{{{ usage: */
402/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
403static void 396void
404rxvt_usage (int type) 397rxvt_term::rxvt_usage (int type)
405{ 398{
406 unsigned int i, col; 399 unsigned int i, col;
407 400
408 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 401 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
409 402
… …
417 { 410 {
418 int len = 0; 411 int len = 0;
419 412
420 if (optList[i].arg) 413 if (optList[i].arg)
421 len = strlen (optList[i].arg) + 1; 414 len = strlen (optList[i].arg) + 1;
415
422 assert (optList[i].opt != NULL); 416 assert (optList[i].opt != NULL);
423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
424 col += len; 418 col += len;
419
425 if (col > 79) 420 if (col > 79)
426 { 421 {
427 /* assume regular width */ 422 /* assume regular width */
428 rxvt_log ("\n"); 423 rxvt_log ("\n");
429 col = 1 + len; 424 col = 1 + len;
430 } 425 }
431 426
432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 427 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
428
433 if (optList[i].arg) 429 if (optList[i].arg)
434 rxvt_log (" %s]", optList[i].arg); 430 rxvt_log (" %s]", optList[i].arg);
435 else 431 else
436 rxvt_log ("]"); 432 rxvt_log ("]");
437 } 433 }
… …
450 + (optList_isBool (i) ? 0 : 2)), 446 + (optList_isBool (i) ? 0 : 2)),
451 (optList[i].arg ? optList[i].arg : ""), 447 (optList[i].arg ? optList[i].arg : ""),
452 (optList_isBool (i) ? "turn on/off " : ""), 448 (optList_isBool (i) ? "turn on/off " : ""),
453 optList[i].desc); 449 optList[i].desc);
454 } 450 }
451
452#if ENABLE_PERL
453 rxvt_perl.init (this);
454 rxvt_perl.usage (this, 1);
455#endif
456
455 rxvt_log ("\n --help to list long-options"); 457 rxvt_log ("\n --help to list long-options");
456 break; 458 break;
457 459
458 case 2: /* full resource listing */ 460 case 2: /* full resource listing */
459 rxvt_log (" [options] [-e command args]\n\n" 461 rxvt_log (" [options] [-e command args]\n\n"
… …
461 463
462 for (i = 0; i < ecb_array_length (optList); i++) 464 for (i = 0; i < ecb_array_length (optList); i++)
463 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
464 rxvt_log (" %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
465 optList[i].kw, 467 optList[i].kw,
466 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 468 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
467 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
470
471#if ENABLE_PERL
472 rxvt_perl.init (this);
473 rxvt_perl.usage (this, 2);
474#endif
475
468 rxvt_log ("\n -help to list options"); 476 rxvt_log ("\n -help to list options");
469 break; 477 break;
470 } 478 }
471 479
472 rxvt_log ("\n\n"); 480 rxvt_log ("\n\n");
… …
537 * default values 545 * default values
538 */ 546 */
539 547
540 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
541 { 549 {
542 if (flag && i+1 == argc) 550 if (flag && i + 1 == argc)
543 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
544 552
545 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
546 } 554 }
547 } 555 }
… …
555 } 563 }
556 } 564 }
557#ifndef NO_RESOURCES 565#ifndef NO_RESOURCES
558 else if (!strcmp (opt, "xrm")) 566 else if (!strcmp (opt, "xrm"))
559 { 567 {
560 if (i+1 < argc) 568 if (i + 1 < argc)
561 XrmPutLineResource (&option_db, argv[++i]); 569 XrmPutLineResource (&option_db, argv[++i]);
562 } 570 }
563#endif 571#endif
564#ifdef KEYSYM_RESOURCE 572#ifdef KEYSYM_RESOURCE
565 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
566 { 574 {
567 if (i+1 < argc) 575 if (i + 1 < argc)
568 { 576 {
569 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 577 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
570 sprintf (res, "*.%s: %s\n", opt, argv[i]); 578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
571 XrmPutLineResource (&option_db, res); 579 XrmPutLineResource (&option_db, res);
572 } 580 }
573 } 581 }
574#endif 582#endif
575 else if (!strcmp (opt, "e")) 583 else if (!strcmp (opt, "e"))
576 { 584 {
577 if (i+1 == argc) 585 if (i + 1 < argc)
578 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
579
580 return (const char **)argv + i + 1; 586 return (const char **)argv + i + 1;
587
588 rxvt_warn ("option '-e' requires an argument, aborting.\n");
589 bad_option = 1;
581 } 590 }
582 else 591 else
583 { 592 {
593#if ENABLE_PERL
594 rxvt_perl.init (this);
595
596 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
597 {
598 if (flags & rxvt_perl.RESOURCE_ARG)
599 {
600 if (i + 1 == argc)
601 {
602 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
584 bad_option = 1; 603 bad_option = 1;
604 }
605 else
606 ++i;
607 }
608 }
609 else
610#endif
611 {
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 612 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
613 bad_option = 1;
614 }
586 } 615 }
587 } 616 }
588 617
589 if (bad_option) 618 if (bad_option)
590 rxvt_usage (0); 619 rxvt_usage (0);
… …
592 return 0; 621 return 0;
593} 622}
594 623
595/*}}} */ 624/*}}} */
596 625
597#ifndef NO_RESOURCES
598/*----------------------------------------------------------------------*/ 626/*----------------------------------------------------------------------*/
599 627
600# ifdef KEYSYM_RESOURCE 628#ifdef KEYSYM_RESOURCE
601/*
602 * Define key from XrmEnumerateDatabase.
603 * quarks will be something like
604 * "rxvt" "keysym" "0xFF01"
605 * value will be a string
606 */
607static int 629static void
608rxvt_define_key (XrmDatabase *database ecb_unused, 630rxvt_define_key (rxvt_term *term, const char *k, const char *v)
609 XrmBindingList bindings ecb_unused,
610 XrmQuarkList quarks,
611 XrmRepresentation *type ecb_unused,
612 XrmValue *value,
613 XPointer closure ecb_unused)
614{ 631{
615 int last; 632 term->bind_action (k, v);
616
617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
618 ;
619
620 last--;
621 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
622 return False;
623} 633}
624 634
625/* 635/*
626 * look for something like this (XK_Delete) 636 * look for something like this (XK_Delete)
627 * rxvt*keysym.0xFFFF: "\177" 637 * rxvt*keysym.0xFFFF: "\177"
… …
661 { "4", 1, Mod4Mask }, 671 { "4", 1, Mod4Mask },
662 { "5", 1, Mod5Mask }, 672 { "5", 1, Mod5Mask },
663}; 673};
664 674
665int 675int
666rxvt_term::parse_keysym (const char *str, const char *arg) 676rxvt_term::parse_keysym (const char *str, unsigned int &state)
667{ 677{
668 int sym; 678 int sym;
669 unsigned int state = 0;
670 const char *key = strrchr (str, '-'); 679 const char *key = strrchr (str, '-');
680
681 state = 0;
671 682
672 if (!key) 683 if (!key)
673 key = str; 684 key = str;
674 else 685 else
675 key++; 686 key++;
676 687
677 // string or key is empty 688 // string or key is empty
678 if (*arg == '\0' || *key == '\0') 689 if (*key == '\0')
679 return -1; 690 return -1;
680 691
681 // parse modifiers 692 // parse modifiers
682 while (str < key) 693 while (str < key)
683 { 694 {
… …
708 sym = strtol (str, &end, 16); 719 sym = strtol (str, &end, 16);
709 if (*end) 720 if (*end)
710 return -1; 721 return -1;
711 } 722 }
712 723
724 return sym;
725}
726
727int
728rxvt_term::bind_action (const char *str, const char *arg)
729{
730 int sym;
731 unsigned int state;
732
733 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
734 return -1;
735
713 wchar_t *ws = rxvt_mbstowcs (arg); 736 wchar_t *ws = rxvt_mbstowcs (arg);
714 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 737 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
715 keyboard->register_user_translation (sym, state, ws); 738 keyboard->register_action (sym, state, ws);
739
716 free (ws); 740 free (ws);
717 return 1; 741 return 1;
718} 742}
719 743
720# endif /* KEYSYM_RESOURCE */ 744#endif /* KEYSYM_RESOURCE */
721#endif /* NO_RESOURCES */
722 745
723static char * 746static char *
724get_res (XrmDatabase database, const char *program, const char *option) 747get_res (XrmDatabase database, const char *program, const char *option)
725{ 748{
726 char resource[512]; 749 char resource[512];
… …
797 } 820 }
798 } 821 }
799#endif /* NO_RESOURCES */ 822#endif /* NO_RESOURCES */
800} 823}
801 824
825struct rxvt_enumerate_closure
826{
827 rxvt_term *term;
828 void (*cb)(rxvt_term *, const char *, const char *);
829 int specific; // iterate over only a specific subhierarchy
830};
831
832/*
833 * Define key from XrmEnumerateDatabase.
834 * quarks will be something like
835 * "rxvt" "keysym" "0xFF01"
836 * value will be a string
837 */
838static int
839rxvt_enumerate_helper (
840 XrmDatabase *database ecb_unused,
841 XrmBindingList bindings ecb_unused,
842 XrmQuarkList quarks,
843 XrmRepresentation *type ecb_unused,
844 XrmValue *value,
845 XPointer closure
846)
847{
848 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
849
850 if (*quarks == NULLQUARK) return False;
851
852 // if the quark list starts with a tightly bound quark, we skip it,
853 // as it exactly matched the prefix. Otherwise, it matched because
854 // it started with "*", in which case we assume the prefix is part
855 // of the "*".
856 if (*bindings == XrmBindTightly)
857 {
858 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
859 if (*quarks == NULLQUARK) return False;
860 }
861
862 // specific, a bit misleadingly named, is used when a specific "subclass"
863 // is iterated over, e.g. "keysym", and is used to skip one more
864 // component, as well as all generic prefixes
865 // this is a bit of a hack, ideally, keysym (the only user) should use its
866 // own iteration function, but this ought to be less bloated
867 if (data->specific)
868 {
869 ++quarks, ++bindings;
870 if (*quarks == NULLQUARK) return False;
871 }
872
873 char *pattern;
874 if (quarks[1] == NULLQUARK)
875 pattern = XrmQuarkToString (quarks[0]); // single component, fast path
876 else
877 {
878 // multiple components, slow path - should be rare, don't optimize for speed
879 int size = 0;
880
881 for (int i = 0; quarks[i] != NULLQUARK; ++i)
882 size += strlen (XrmQuarkToString (quarks[i])) + 1;
883
884 pattern = rxvt_temp_buf<char> (size + 1);
885
886 // now print all components
887 {
888 char *cur = pattern;
889
890 for (int i = 0; quarks[i] != NULLQUARK; ++i)
891 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
892 }
893
894 ++pattern; // skip initial dot
895 }
896
897 data->cb (data->term, pattern, (char *)value->addr);
898
899 return False;
900}
901
802void 902void
803rxvt_term::extract_keysym_resources () 903rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
804{ 904{
805#ifndef NO_RESOURCES
806 /* 905 /*
807 * [R5 or later]: enumerate the resource database 906 * [R5 or later]: enumerate the resource database
808 */ 907 */
908 assert (!name_p == !class_p); // both must be specified, or missing
909
809# ifdef KEYSYM_RESOURCE 910#ifdef KEYSYM_RESOURCE
911 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
912
810 XrmDatabase database = XrmGetDatabase (dpy); 913 XrmDatabase database = XrmGetDatabase (dpy);
811 XrmName name_prefix[3]; 914 XrmName name_prefix[3];
812 XrmClass class_prefix[3]; 915 XrmClass class_prefix[3];
813 916
814 name_prefix[0] = XrmStringToName (rs[Rs_name]); 917 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
815 name_prefix[1] = XrmStringToName ("keysym");
816 name_prefix[2] = NULLQUARK; 918 name_prefix[2] = NULLQUARK;
817 class_prefix[0] = XrmStringToName (RESCLASS); 919 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
818 class_prefix[1] = XrmStringToName ("Keysym");
819 class_prefix[2] = NULLQUARK; 920 class_prefix[2] = NULLQUARK;
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 921
922# ifdef RESFALLBACK
923 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
821 XrmEnumerateDatabase (database, name_prefix, class_prefix, 924 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL); 925 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
823# ifdef RESFALLBACK 926# endif
927
824 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 928 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
825 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
826 XrmEnumerateDatabase (database, name_prefix, class_prefix, 929 XrmEnumerateDatabase (database, name_prefix, class_prefix,
827 XrmEnumOneLevel, rxvt_define_key, NULL); 930 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
828# endif 931
932 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
933 XrmEnumerateDatabase (database, name_prefix, class_prefix,
934 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
829# endif 935#endif
936}
830 937
831#endif /* NO_RESOURCES */ 938void
939rxvt_term::extract_keysym_resources ()
940{
941#ifdef KEYSYM_RESOURCE
942 enumerate_keysym_resources (rxvt_define_key);
943#endif
832} 944}
833 945
834/*----------------------- end-of-file (C source) -----------------------*/ 946/*----------------------- end-of-file (C source) -----------------------*/
947

Diff Legend

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