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.167 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.198 by root, Sat Jul 3 15:34:35 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, "paste bracket suppression"),
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#if 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"),
… …
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, "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"),
236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 235 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 236 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), 237 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif 238#endif
243#ifdef BUILTIN_GLYPHS 239#ifdef BUILTIN_GLYPHS
244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 240 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "using font glyphs instead of internal glyphs"),
245#endif 241#endif
246#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 243 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
248#endif 244#endif
249#ifndef NO_BACKSPACE_KEY 245#ifndef NO_BACKSPACE_KEY
… …
257#endif 253#endif
258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
259 RSTRG (Rs_cutchars, "cutchars", "string"), 255 RSTRG (Rs_cutchars, "cutchars", "string"),
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, "secondary screen"),
263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 259 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "secondary screen scroll"),
260#endif
261#if ENABLE_FRILLS
262 STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
264#endif 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
… …
384#if defined(XTERM_SCROLLBAR) 383#if defined(XTERM_SCROLLBAR)
385 "+xterm" 384 "+xterm"
386#endif 385#endif
387 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
388 387
389#define INDENT 18 388#define INDENT 28
390 389
391const char rxvt_term::resval_undef [] = "<undef>"; 390const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 391const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 392const char rxvt_term::resval_off [] = "off";
394 393
… …
464 463
465 for (i = 0; i < ecb_array_length (optList); i++) 464 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 465 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 466 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 467 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 468 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 469 (optList_isBool (i) ? "boolean" : optList[i].arg));
471 470
472#if ENABLE_PERL 471#if ENABLE_PERL
473 rxvt_perl.init (this); 472 rxvt_perl.init (this);
474 rxvt_perl.usage (this, 2); 473 rxvt_perl.usage (this, 2);
… …
546 * default values 545 * default values
547 */ 546 */
548 547
549 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
550 { 549 {
551 if (flag && i+1 == argc) 550 if (flag && i + 1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 551 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 552
554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 553 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 554 }
556 } 555 }
… …
564 } 563 }
565 } 564 }
566#ifndef NO_RESOURCES 565#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 566 else if (!strcmp (opt, "xrm"))
568 { 567 {
569 if (i+1 < argc) 568 if (i + 1 < argc)
570 XrmPutLineResource (&option_db, argv[++i]); 569 XrmPutLineResource (&option_db, argv[++i]);
571 } 570 }
572#endif 571#endif
573#ifdef KEYSYM_RESOURCE 572#ifdef KEYSYM_RESOURCE
574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
575 { 574 {
576 if (i+1 < argc) 575 if (i + 1 < argc)
577 { 576 {
578 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);
579 sprintf (res, "*.%s: %s\n", opt, argv[i]); 578 sprintf (res, "*.%s: %s\n", opt, argv[i]);
580 XrmPutLineResource (&option_db, res); 579 XrmPutLineResource (&option_db, res);
581 } 580 }
582 } 581 }
583#endif 582#endif
584 else if (!strcmp (opt, "e")) 583 else if (!strcmp (opt, "e"))
585 { 584 {
586 if (i+1 == argc) 585 if (i + 1 < argc)
587 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
588
589 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;
590 } 590 }
591 else 591 else
592 { 592 {
593#if ENABLE_PERL 593#if ENABLE_PERL
594 rxvt_perl.init (this); 594 rxvt_perl.init (this);
595 595
596 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1])) 596 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
597 { 597 {
598 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) 598 if (flags & rxvt_perl.RESOURCE_ARG)
599 { 599 {
600 if (flag && i + 1 == argc) 600 if (i + 1 == argc)
601 {
601 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 602 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
602 603 bad_option = 1;
604 }
605 else
603 ++i; 606 ++i;
604 } 607 }
605 } 608 }
606 else 609 else
607#endif 610#endif
608 { 611 {
612 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1; 613 bad_option = 1;
610 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
611 } 614 }
612 } 615 }
613 } 616 }
614 617
615 if (bad_option) 618 if (bad_option)
… …
618 return 0; 621 return 0;
619} 622}
620 623
621/*}}} */ 624/*}}} */
622 625
623#ifndef NO_RESOURCES
624/*----------------------------------------------------------------------*/ 626/*----------------------------------------------------------------------*/
625 627
626# ifdef KEYSYM_RESOURCE 628#ifdef KEYSYM_RESOURCE
627/*
628 * Define key from XrmEnumerateDatabase.
629 * quarks will be something like
630 * "rxvt" "keysym" "0xFF01"
631 * value will be a string
632 */
633static int 629static void
634rxvt_define_key (XrmDatabase *database ecb_unused, 630rxvt_define_key (rxvt_term *term, const char *k, const char *v)
635 XrmBindingList bindings ecb_unused,
636 XrmQuarkList quarks,
637 XrmRepresentation *type ecb_unused,
638 XrmValue *value,
639 XPointer closure ecb_unused)
640{ 631{
641 int last; 632 term->bind_action (k, v);
642
643 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
644 ;
645
646 last--;
647 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
648 return False;
649} 633}
650 634
651/* 635/*
652 * look for something like this (XK_Delete) 636 * look for something like this (XK_Delete)
653 * rxvt*keysym.0xFFFF: "\177" 637 * rxvt*keysym.0xFFFF: "\177"
… …
687 { "4", 1, Mod4Mask }, 671 { "4", 1, Mod4Mask },
688 { "5", 1, Mod5Mask }, 672 { "5", 1, Mod5Mask },
689}; 673};
690 674
691int 675int
692rxvt_term::parse_keysym (const char *str, const char *arg) 676rxvt_term::parse_keysym (const char *str, unsigned int &state)
693{ 677{
694 int sym; 678 int sym;
695 unsigned int state = 0;
696 const char *key = strrchr (str, '-'); 679 const char *key = strrchr (str, '-');
680
681 state = 0;
697 682
698 if (!key) 683 if (!key)
699 key = str; 684 key = str;
700 else 685 else
701 key++; 686 key++;
702 687
703 // string or key is empty 688 // string or key is empty
704 if (*arg == '\0' || *key == '\0') 689 if (*key == '\0')
705 return -1; 690 return -1;
706 691
707 // parse modifiers 692 // parse modifiers
708 while (str < key) 693 while (str < key)
709 { 694 {
… …
734 sym = strtol (str, &end, 16); 719 sym = strtol (str, &end, 16);
735 if (*end) 720 if (*end)
736 return -1; 721 return -1;
737 } 722 }
738 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
739 wchar_t *ws = rxvt_mbstowcs (arg); 736 wchar_t *ws = rxvt_mbstowcs (arg);
740 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)))
741 keyboard->register_user_translation (sym, state, ws); 738 keyboard->register_action (sym, state, ws);
739
742 free (ws); 740 free (ws);
743 return 1; 741 return 1;
744} 742}
745 743
746# endif /* KEYSYM_RESOURCE */ 744#endif /* KEYSYM_RESOURCE */
747#endif /* NO_RESOURCES */
748 745
749static char * 746static char *
750get_res (XrmDatabase database, const char *program, const char *option) 747get_res (XrmDatabase database, const char *program, const char *option)
751{ 748{
752 char resource[512]; 749 char resource[512];
… …
792 /* 789 /*
793 * Query resources for options that affect us 790 * Query resources for options that affect us
794 */ 791 */
795 for (int entry = 0; entry < ecb_array_length (optList); entry++) 792 for (int entry = 0; entry < ecb_array_length (optList); entry++)
796 { 793 {
794 int s;
797 const char *kw = optList[entry].kw; 795 const char *kw = optList[entry].kw;
798 796
799 if (kw == NULL || rs[optList[entry].doff] != NULL) 797 if (kw == NULL || rs[optList[entry].doff] != NULL)
800 continue; // previously set 798 continue; // previously set
801 799
… …
807 allocated.push_back ((void *)p); 805 allocated.push_back ((void *)p);
808 rs[optList[entry].doff] = p; 806 rs[optList[entry].doff] = p;
809 807
810 if (optList_isBool (entry)) 808 if (optList_isBool (entry))
811 { 809 {
812 bool s = parse_bool_resource (p); 810 s = strcasecmp (p, "TRUE") == 0
811 || strcasecmp (p, "YES") == 0
812 || strcasecmp (p, "ON") == 0
813 || strcasecmp (p, "1") == 0;
813 814
814 if (optList_isReverse (entry)) 815 if (optList_isReverse (entry))
815 s = !s; 816 s = !s;
816 817
817 set_option (optList[entry].index, s); 818 set_option (optList[entry].index, s);
… …
819 } 820 }
820 } 821 }
821#endif /* NO_RESOURCES */ 822#endif /* NO_RESOURCES */
822} 823}
823 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
824void 902void
825rxvt_term::extract_keysym_resources () 903rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
826{
827#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
828 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
829#endif
830}
831
832#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
833void
834rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
835 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
836{ 904{
837 /* 905 /*
838 * [R5 or later]: enumerate the resource database 906 * [R5 or later]: enumerate the resource database
839 */ 907 */
908 assert (!name_p == !class_p); // both must be specified, or missing
909
910#ifdef KEYSYM_RESOURCE
911 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
912
840 XrmDatabase database = XrmGetDatabase (dpy); 913 XrmDatabase database = XrmGetDatabase (dpy);
841 XrmName name_prefix[3]; 914 XrmName name_prefix[3];
842 XrmClass class_prefix[3]; 915 XrmClass class_prefix[3];
843 916
844 name_prefix[0] = XrmStringToName (rs[Rs_name]); 917 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
845 name_prefix[1] = XrmStringToName (n_prefix);
846 name_prefix[2] = NULLQUARK; 918 name_prefix[2] = NULLQUARK;
847 class_prefix[0] = XrmStringToName (RESCLASS); 919 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
848 class_prefix[1] = XrmStringToName (c_prefix);
849 class_prefix[2] = NULLQUARK; 920 class_prefix[2] = NULLQUARK;
850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 921
922# ifdef RESFALLBACK
923 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
851 XrmEnumerateDatabase (database, name_prefix, class_prefix, 924 XrmEnumerateDatabase (database, name_prefix, class_prefix,
852 mode, proc, NULL); 925 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
853# ifdef RESFALLBACK 926# endif
927
854 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 928 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
855 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
856 XrmEnumerateDatabase (database, name_prefix, class_prefix, 929 XrmEnumerateDatabase (database, name_prefix, class_prefix,
857 mode, proc, NULL); 930 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
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);
858# endif 935#endif
859} 936}
937
938void
939rxvt_term::extract_keysym_resources ()
940{
941#ifdef KEYSYM_RESOURCE
942 enumerate_keysym_resources (rxvt_define_key);
860#endif 943#endif
944}
861 945
862/*----------------------- end-of-file (C source) -----------------------*/ 946/*----------------------- end-of-file (C source) -----------------------*/
947

Diff Legend

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