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.166 by root, Tue Jun 5 19:32:29 2012 UTC vs.
Revision 1.193 by root, Tue Sep 17 20:38:14 2019 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"),
… …
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 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 192#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif 194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
203#endif 197#endif
204 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 200#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 217#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 219#endif
226#if XFT 220#if XFT
221 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
222#endif
223#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 225 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 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"), 227 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"), 228 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"), 229 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"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
384#if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
385 "+xterm" 380 "+xterm"
386#endif 381#endif
387 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
388 383
389#define INDENT 18 384#define INDENT 28
390 385
391const char rxvt_term::resval_undef [] = "<undef>"; 386const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 387const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 388const char rxvt_term::resval_off [] = "off";
394 389
… …
447 + (optList_isBool (i) ? 0 : 2)), 442 + (optList_isBool (i) ? 0 : 2)),
448 (optList[i].arg ? optList[i].arg : ""), 443 (optList[i].arg ? optList[i].arg : ""),
449 (optList_isBool (i) ? "turn on/off " : ""), 444 (optList_isBool (i) ? "turn on/off " : ""),
450 optList[i].desc); 445 optList[i].desc);
451 } 446 }
447
448#if ENABLE_PERL
449 rxvt_perl.init (this);
450 rxvt_perl.usage (this, 1);
451#endif
452
452 rxvt_log ("\n --help to list long-options"); 453 rxvt_log ("\n --help to list long-options");
453 break; 454 break;
454 455
455 case 2: /* full resource listing */ 456 case 2: /* full resource listing */
456 rxvt_log (" [options] [-e command args]\n\n" 457 rxvt_log (" [options] [-e command args]\n\n"
… …
458 459
459 for (i = 0; i < ecb_array_length (optList); i++) 460 for (i = 0; i < ecb_array_length (optList); i++)
460 if (optList[i].kw != NULL) 461 if (optList[i].kw != NULL)
461 rxvt_log (" %s: %*s%s\n", 462 rxvt_log (" %s: %*s%s\n",
462 optList[i].kw, 463 optList[i].kw,
463 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 464 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
464 (optList_isBool (i) ? "boolean" : optList[i].arg)); 465 (optList_isBool (i) ? "boolean" : optList[i].arg));
466
467#if ENABLE_PERL
468 rxvt_perl.init (this);
469 rxvt_perl.usage (this, 2);
470#endif
471
465 rxvt_log ("\n -help to list options"); 472 rxvt_log ("\n -help to list options");
466 break; 473 break;
467 } 474 }
468
469#if ENABLE_PERL
470 if (type) // do not initialise perl for type == 0, as perl does not have "short" options
471 {
472 rxvt_perl.init (this);
473 rxvt_perl.usage (type);
474 }
475#endif
476 475
477 rxvt_log ("\n\n"); 476 rxvt_log ("\n\n");
478 rxvt_exit_failure (); 477 rxvt_exit_failure ();
479} 478}
480 479
… …
542 * default values 541 * default values
543 */ 542 */
544 543
545 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
546 { 545 {
547 if (flag && i+1 == argc) 546 if (flag && i + 1 == argc)
548 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 547 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
549 548
550 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 549 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
551 } 550 }
552 } 551 }
… …
560 } 559 }
561 } 560 }
562#ifndef NO_RESOURCES 561#ifndef NO_RESOURCES
563 else if (!strcmp (opt, "xrm")) 562 else if (!strcmp (opt, "xrm"))
564 { 563 {
565 if (i+1 < argc) 564 if (i + 1 < argc)
566 XrmPutLineResource (&option_db, argv[++i]); 565 XrmPutLineResource (&option_db, argv[++i]);
567 } 566 }
568#endif 567#endif
569#ifdef KEYSYM_RESOURCE 568#ifdef KEYSYM_RESOURCE
570 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 569 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
571 { 570 {
572 if (i+1 < argc) 571 if (i + 1 < argc)
573 { 572 {
574 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 573 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
575 sprintf (res, "*.%s: %s\n", opt, argv[i]); 574 sprintf (res, "*.%s: %s\n", opt, argv[i]);
576 XrmPutLineResource (&option_db, res); 575 XrmPutLineResource (&option_db, res);
577 } 576 }
578 } 577 }
579#endif 578#endif
580 else if (!strcmp (opt, "e")) 579 else if (!strcmp (opt, "e"))
581 { 580 {
582 if (i+1 == argc) 581 if (i + 1 < argc)
583 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
584
585 return (const char **)argv + i + 1; 582 return (const char **)argv + i + 1;
583
584 rxvt_warn ("option '-e' requires an argument, aborting.\n");
585 bad_option = 1;
586 } 586 }
587 else 587 else
588 { 588 {
589#if ENABLE_PERL 589#if ENABLE_PERL
590 rxvt_perl.init (this); 590 rxvt_perl.init (this);
591 591
592 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1])) 592 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
593 { 593 {
594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) 594 if (flags & rxvt_perl.RESOURCE_ARG)
595 { 595 {
596 if (flag && i + 1 == argc) 596 if (i + 1 == argc)
597 {
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 598 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
598 599 bad_option = 1;
600 }
601 else
599 ++i; 602 ++i;
600 } 603 }
601 } 604 }
602 else 605 else
603#endif 606#endif
604 { 607 {
608 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
605 bad_option = 1; 609 bad_option = 1;
606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
607 } 610 }
608 } 611 }
609 } 612 }
610 613
611 if (bad_option) 614 if (bad_option)
… …
614 return 0; 617 return 0;
615} 618}
616 619
617/*}}} */ 620/*}}} */
618 621
619#ifndef NO_RESOURCES
620/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
621 623
622# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
625static void
626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
627{
628 term->bind_action (k, v);
629}
630
631struct rxvt_enumerate_closure
632{
633 rxvt_term *term;
634 void (*cb)(rxvt_term *, const char *, const char *);
635 int specific; // iterate over only a specific subhierarchy
636};
637
623/* 638/*
624 * Define key from XrmEnumerateDatabase. 639 * Define key from XrmEnumerateDatabase.
625 * quarks will be something like 640 * quarks will be something like
626 * "rxvt" "keysym" "0xFF01" 641 * "rxvt" "keysym" "0xFF01"
627 * value will be a string 642 * value will be a string
628 */ 643 */
629static int 644static int
645rxvt_enumerate_helper (
630rxvt_define_key (XrmDatabase *database ecb_unused, 646 XrmDatabase *database ecb_unused,
631 XrmBindingList bindings ecb_unused, 647 XrmBindingList bindings ecb_unused,
632 XrmQuarkList quarks, 648 XrmQuarkList quarks,
633 XrmRepresentation *type ecb_unused, 649 XrmRepresentation *type ecb_unused,
634 XrmValue *value, 650 XrmValue *value,
635 XPointer closure ecb_unused) 651 XPointer closure
652)
636{ 653{
637 int last; 654 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
638 655
639 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 656 if (*quarks == NULLQUARK) return False;
657
658 // if the quark list starts with a tighly bound quark, we skip it,
659 // as it is the exactly matched the prefix. Otherwise, it matched because
660 // it started with "*", in which case we assuime the prefix is part
661 // of the "*".
662 if (*bindings == XrmBindTightly)
640 ; 663 {
664 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
665 if (*quarks == NULLQUARK) return False;
666 }
641 667
642 last--; 668 // specific, a bit misleadingly named, is used when a specific "subclass"
643 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 669 // is iterated over, e.g. "keysym", and is used to skip one more
670 // component, as well as all generic prefixes
671 // this is a bit of a hack, ideally, keysym (the only user) should use its
672 // own iteration function, but this ought to be less bloated
673 if (data->specific)
674 {
675 if (*bindings != XrmBindTightly)
676 return False;
677
678 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
679 if (*quarks == NULLQUARK) return False;
680 }
681
682 char *pattern;
683 if (quarks[1] == NULLQUARK)
684 pattern = XrmQuarkToString (quarks[0]); // single component, fats path
685 else
686 {
687 // multiple components, slow path - should be rare, to don't optimize for speed
688 int size = 0;
689
690 for (int i = 0; quarks[i] != NULLQUARK; ++i)
691 size += strlen (XrmQuarkToString (quarks[i])) + 1;
692
693 pattern = rxvt_temp_buf<char> (size + 1);
694
695 // now print all components
696 {
697 char *cur = pattern;
698
699 for (int i = 0; quarks[i] != NULLQUARK; ++i)
700 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
701 }
702
703 ++pattern; // skip initial dot
704 }
705
706 data->cb (data->term, pattern, (char *)value->addr);
707
644 return False; 708 return False;
645} 709}
646 710
647/* 711/*
648 * look for something like this (XK_Delete) 712 * look for something like this (XK_Delete)
… …
683 { "4", 1, Mod4Mask }, 747 { "4", 1, Mod4Mask },
684 { "5", 1, Mod5Mask }, 748 { "5", 1, Mod5Mask },
685}; 749};
686 750
687int 751int
688rxvt_term::parse_keysym (const char *str, const char *arg) 752rxvt_term::parse_keysym (const char *str, unsigned int &state)
689{ 753{
690 int sym; 754 int sym;
691 unsigned int state = 0;
692 const char *key = strrchr (str, '-'); 755 const char *key = strrchr (str, '-');
756
757 state = 0;
693 758
694 if (!key) 759 if (!key)
695 key = str; 760 key = str;
696 else 761 else
697 key++; 762 key++;
698 763
699 // string or key is empty 764 // string or key is empty
700 if (*arg == '\0' || *key == '\0') 765 if (*key == '\0')
701 return -1; 766 return -1;
702 767
703 // parse modifiers 768 // parse modifiers
704 while (str < key) 769 while (str < key)
705 { 770 {
… …
730 sym = strtol (str, &end, 16); 795 sym = strtol (str, &end, 16);
731 if (*end) 796 if (*end)
732 return -1; 797 return -1;
733 } 798 }
734 799
800 return sym;
801}
802
803int
804rxvt_term::bind_action (const char *str, const char *arg)
805{
806 int sym;
807 unsigned int state;
808
809 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
810 return -1;
811
735 wchar_t *ws = rxvt_mbstowcs (arg); 812 wchar_t *ws = rxvt_mbstowcs (arg);
736 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 813 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
737 keyboard->register_user_translation (sym, state, ws); 814 keyboard->register_action (sym, state, ws);
815
738 free (ws); 816 free (ws);
739 return 1; 817 return 1;
740} 818}
741 819
742# endif /* KEYSYM_RESOURCE */ 820#endif /* KEYSYM_RESOURCE */
743#endif /* NO_RESOURCES */
744 821
745static char * 822static char *
746get_res (XrmDatabase database, const char *program, const char *option) 823get_res (XrmDatabase database, const char *program, const char *option)
747{ 824{
748 char resource[512]; 825 char resource[512];
… …
788 /* 865 /*
789 * Query resources for options that affect us 866 * Query resources for options that affect us
790 */ 867 */
791 for (int entry = 0; entry < ecb_array_length (optList); entry++) 868 for (int entry = 0; entry < ecb_array_length (optList); entry++)
792 { 869 {
870 int s;
793 const char *kw = optList[entry].kw; 871 const char *kw = optList[entry].kw;
794 872
795 if (kw == NULL || rs[optList[entry].doff] != NULL) 873 if (kw == NULL || rs[optList[entry].doff] != NULL)
796 continue; // previously set 874 continue; // previously set
797 875
… …
803 allocated.push_back ((void *)p); 881 allocated.push_back ((void *)p);
804 rs[optList[entry].doff] = p; 882 rs[optList[entry].doff] = p;
805 883
806 if (optList_isBool (entry)) 884 if (optList_isBool (entry))
807 { 885 {
808 bool s = parse_bool_resource (p); 886 s = strcasecmp (p, "TRUE") == 0
887 || strcasecmp (p, "YES") == 0
888 || strcasecmp (p, "ON") == 0
889 || strcasecmp (p, "1") == 0;
809 890
810 if (optList_isReverse (entry)) 891 if (optList_isReverse (entry))
811 s = !s; 892 s = !s;
812 893
813 set_option (optList[entry].index, s); 894 set_option (optList[entry].index, s);
… …
816 } 897 }
817#endif /* NO_RESOURCES */ 898#endif /* NO_RESOURCES */
818} 899}
819 900
820void 901void
821rxvt_term::extract_keysym_resources () 902rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
822{
823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
824 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
825#endif
826}
827
828#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
829void
830rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
831 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
832{ 903{
833 /* 904 /*
834 * [R5 or later]: enumerate the resource database 905 * [R5 or later]: enumerate the resource database
835 */ 906 */
907 assert (!name_p == !class_p); // both must be specified, or missing
908
909#ifdef KEYSYM_RESOURCE
910 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
911
836 XrmDatabase database = XrmGetDatabase (dpy); 912 XrmDatabase database = XrmGetDatabase (dpy);
837 XrmName name_prefix[3]; 913 XrmName name_prefix[3];
838 XrmClass class_prefix[3]; 914 XrmClass class_prefix[3];
839 915
840 name_prefix[0] = XrmStringToName (rs[Rs_name]); 916 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
841 name_prefix[1] = XrmStringToName (n_prefix);
842 name_prefix[2] = NULLQUARK; 917 name_prefix[2] = NULLQUARK;
843 class_prefix[0] = XrmStringToName (RESCLASS); 918 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
844 class_prefix[1] = XrmStringToName (c_prefix);
845 class_prefix[2] = NULLQUARK; 919 class_prefix[2] = NULLQUARK;
846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 920
921# ifdef RESFALLBACK
922 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
847 XrmEnumerateDatabase (database, name_prefix, class_prefix, 923 XrmEnumerateDatabase (database, name_prefix, class_prefix,
848 mode, proc, NULL); 924 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
849# ifdef RESFALLBACK 925# endif
926
850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 927 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 928 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 mode, proc, NULL); 929 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
930
931 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
932 XrmEnumerateDatabase (database, name_prefix, class_prefix,
933 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
854# endif 934#endif
855} 935}
936
937void
938rxvt_term::extract_keysym_resources ()
939{
940#ifdef KEYSYM_RESOURCE
941 enumerate_keysym_resources (rxvt_define_key);
856#endif 942#endif
943}
857 944
858/*----------------------- end-of-file (C source) -----------------------*/ 945/*----------------------- end-of-file (C source) -----------------------*/
946

Diff Legend

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