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.184 by sf-exg, Mon Oct 13 17:05:32 2014 UTC

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 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 118#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 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"), 123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
200# if ENABLE_EWMH 203#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
203#endif 205#endif
204 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 208#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 224 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 225#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 226 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 227#endif
226#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 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"), 235 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"), 236 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"), 237 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"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
384#if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
385 "+xterm" 388 "+xterm"
386#endif 389#endif
387 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
388 391
389#define INDENT 18 392#define INDENT 28
390 393
391const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
394 397
447 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
448 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
449 (optList_isBool (i) ? "turn on/off " : ""), 452 (optList_isBool (i) ? "turn on/off " : ""),
450 optList[i].desc); 453 optList[i].desc);
451 } 454 }
455
456#if ENABLE_PERL
457 rxvt_perl.init (this);
458 rxvt_perl.usage (this, 1);
459#endif
460
452 rxvt_log ("\n --help to list long-options"); 461 rxvt_log ("\n --help to list long-options");
453 break; 462 break;
454 463
455 case 2: /* full resource listing */ 464 case 2: /* full resource listing */
456 rxvt_log (" [options] [-e command args]\n\n" 465 rxvt_log (" [options] [-e command args]\n\n"
458 467
459 for (i = 0; i < ecb_array_length (optList); i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
460 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
461 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
462 optList[i].kw, 471 optList[i].kw,
463 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
464 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
474
475#if ENABLE_PERL
476 rxvt_perl.init (this);
477 rxvt_perl.usage (this, 2);
478#endif
479
465 rxvt_log ("\n -help to list options"); 480 rxvt_log ("\n -help to list options");
466 break; 481 break;
467 } 482 }
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 483
477 rxvt_log ("\n\n"); 484 rxvt_log ("\n\n");
478 rxvt_exit_failure (); 485 rxvt_exit_failure ();
479} 486}
480 487
542 * default values 549 * default values
543 */ 550 */
544 551
545 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
546 { 553 {
547 if (flag && i+1 == argc) 554 if (flag && i + 1 == argc)
548 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
549 556
550 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
551 } 558 }
552 } 559 }
560 } 567 }
561 } 568 }
562#ifndef NO_RESOURCES 569#ifndef NO_RESOURCES
563 else if (!strcmp (opt, "xrm")) 570 else if (!strcmp (opt, "xrm"))
564 { 571 {
565 if (i+1 < argc) 572 if (i + 1 < argc)
566 XrmPutLineResource (&option_db, argv[++i]); 573 XrmPutLineResource (&option_db, argv[++i]);
567 } 574 }
568#endif 575#endif
569#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
570 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 577 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
571 { 578 {
572 if (i+1 < argc) 579 if (i + 1 < argc)
573 { 580 {
574 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 581 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
575 sprintf (res, "*.%s: %s\n", opt, argv[i]); 582 sprintf (res, "*.%s: %s\n", opt, argv[i]);
576 XrmPutLineResource (&option_db, res); 583 XrmPutLineResource (&option_db, res);
577 } 584 }
578 } 585 }
579#endif 586#endif
580 else if (!strcmp (opt, "e")) 587 else if (!strcmp (opt, "e"))
581 { 588 {
582 if (i+1 == argc) 589 if (i + 1 < argc)
583 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
584
585 return (const char **)argv + i + 1; 590 return (const char **)argv + i + 1;
591
592 rxvt_warn ("option '-e' requires an argument, aborting.\n");
593 bad_option = 1;
586 } 594 }
587 else 595 else
588 { 596 {
589#if ENABLE_PERL 597#if ENABLE_PERL
590 rxvt_perl.init (this); 598 rxvt_perl.init (this);
591 599
592 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1])) 600 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
593 { 601 {
594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) 602 if (flags & rxvt_perl.RESOURCE_ARG)
595 { 603 {
596 if (flag && i + 1 == argc) 604 if (i + 1 == argc)
605 {
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 606 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
598 607 bad_option = 1;
608 }
609 else
599 ++i; 610 ++i;
600 } 611 }
601 } 612 }
602 else 613 else
603#endif 614#endif
604 { 615 {
616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
605 bad_option = 1; 617 bad_option = 1;
606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
607 } 618 }
608 } 619 }
609 } 620 }
610 621
611 if (bad_option) 622 if (bad_option)
618 629
619#ifndef NO_RESOURCES 630#ifndef NO_RESOURCES
620/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
621 632
622# ifdef KEYSYM_RESOURCE 633# ifdef KEYSYM_RESOURCE
634static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{
637 term->bind_action (k, v);
638}
639
623/* 640/*
624 * Define key from XrmEnumerateDatabase. 641 * Define key from XrmEnumerateDatabase.
625 * quarks will be something like 642 * quarks will be something like
626 * "rxvt" "keysym" "0xFF01" 643 * "rxvt" "keysym" "0xFF01"
627 * value will be a string 644 * value will be a string
628 */ 645 */
629static int 646static int
647rxvt_keysym_enumerate_helper (
630rxvt_define_key (XrmDatabase *database ecb_unused, 648 XrmDatabase *database ecb_unused,
631 XrmBindingList bindings ecb_unused, 649 XrmBindingList bindings ecb_unused,
632 XrmQuarkList quarks, 650 XrmQuarkList quarks,
633 XrmRepresentation *type ecb_unused, 651 XrmRepresentation *type ecb_unused,
634 XrmValue *value, 652 XrmValue *value,
635 XPointer closure ecb_unused) 653 XPointer closure
654)
636{ 655{
637 int last; 656 int last;
638 657
639 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 658 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
640 ; 659 ;
641 660
642 last--; 661 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
643 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 662 void (*cb)(rxvt_term *, const char *, const char *)
663 = (void (*)(rxvt_term *, const char *, const char *))
664 (((void **)closure)[1]);
665
666 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
667
644 return False; 668 return False;
645} 669}
646 670
647/* 671/*
648 * look for something like this (XK_Delete) 672 * look for something like this (XK_Delete)
683 { "4", 1, Mod4Mask }, 707 { "4", 1, Mod4Mask },
684 { "5", 1, Mod5Mask }, 708 { "5", 1, Mod5Mask },
685}; 709};
686 710
687int 711int
688rxvt_term::parse_keysym (const char *str, const char *arg) 712rxvt_term::parse_keysym (const char *str, unsigned int &state)
689{ 713{
690 int sym; 714 int sym;
691 unsigned int state = 0;
692 const char *key = strrchr (str, '-'); 715 const char *key = strrchr (str, '-');
716
717 state = 0;
693 718
694 if (!key) 719 if (!key)
695 key = str; 720 key = str;
696 else 721 else
697 key++; 722 key++;
698 723
699 // string or key is empty 724 // string or key is empty
700 if (*arg == '\0' || *key == '\0') 725 if (*key == '\0')
701 return -1; 726 return -1;
702 727
703 // parse modifiers 728 // parse modifiers
704 while (str < key) 729 while (str < key)
705 { 730 {
730 sym = strtol (str, &end, 16); 755 sym = strtol (str, &end, 16);
731 if (*end) 756 if (*end)
732 return -1; 757 return -1;
733 } 758 }
734 759
760 return sym;
761}
762
763int
764rxvt_term::bind_action (const char *str, const char *arg)
765{
766 int sym;
767 unsigned int state;
768
769 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
770 return -1;
771
735 wchar_t *ws = rxvt_mbstowcs (arg); 772 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))) 773 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); 774 keyboard->register_action (sym, state, ws);
775
738 free (ws); 776 free (ws);
739 return 1; 777 return 1;
740} 778}
741 779
742# endif /* KEYSYM_RESOURCE */ 780# endif /* KEYSYM_RESOURCE */
788 /* 826 /*
789 * Query resources for options that affect us 827 * Query resources for options that affect us
790 */ 828 */
791 for (int entry = 0; entry < ecb_array_length (optList); entry++) 829 for (int entry = 0; entry < ecb_array_length (optList); entry++)
792 { 830 {
831 int s;
793 const char *kw = optList[entry].kw; 832 const char *kw = optList[entry].kw;
794 833
795 if (kw == NULL || rs[optList[entry].doff] != NULL) 834 if (kw == NULL || rs[optList[entry].doff] != NULL)
796 continue; // previously set 835 continue; // previously set
797 836
803 allocated.push_back ((void *)p); 842 allocated.push_back ((void *)p);
804 rs[optList[entry].doff] = p; 843 rs[optList[entry].doff] = p;
805 844
806 if (optList_isBool (entry)) 845 if (optList_isBool (entry))
807 { 846 {
808 bool s = parse_bool_resource (p); 847 s = strcasecmp (p, "TRUE") == 0
848 || strcasecmp (p, "YES") == 0
849 || strcasecmp (p, "ON") == 0
850 || strcasecmp (p, "1") == 0;
809 851
810 if (optList_isReverse (entry)) 852 if (optList_isReverse (entry))
811 s = !s; 853 s = !s;
812 854
813 set_option (optList[entry].index, s); 855 set_option (optList[entry].index, s);
816 } 858 }
817#endif /* NO_RESOURCES */ 859#endif /* NO_RESOURCES */
818} 860}
819 861
820void 862void
821rxvt_term::extract_keysym_resources () 863rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
822{ 864{
823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE 865#ifndef NO_RESOURCES
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{
833 /* 866 /*
834 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
835 */ 868 */
869# ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
836 XrmDatabase database = XrmGetDatabase (dpy); 875 XrmDatabase database = XrmGetDatabase (dpy);
837 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
838 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
839 878
840 name_prefix[0] = XrmStringToName (rs[Rs_name]); 879 name_prefix[0] = XrmStringToName (rs[Rs_name]);
841 name_prefix[1] = XrmStringToName (n_prefix); 880 name_prefix[1] = XrmStringToName ("keysym");
842 name_prefix[2] = NULLQUARK; 881 name_prefix[2] = NULLQUARK;
843 class_prefix[0] = XrmStringToName (RESCLASS); 882 class_prefix[0] = XrmStringToName (RESCLASS);
844 class_prefix[1] = XrmStringToName (c_prefix); 883 class_prefix[1] = XrmStringToName ("Keysym");
845 class_prefix[2] = NULLQUARK; 884 class_prefix[2] = NULLQUARK;
846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 885 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
847 XrmEnumerateDatabase (database, name_prefix, class_prefix, 886 XrmEnumerateDatabase (database, name_prefix, class_prefix,
848 mode, proc, NULL); 887 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
849# ifdef RESFALLBACK 888# ifdef RESFALLBACK
850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 889 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 890 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 891 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 mode, proc, NULL); 892 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
854# endif 893# endif
855}
856#endif 894# endif
895
896#endif /* NO_RESOURCES */
897}
898
899void
900rxvt_term::extract_keysym_resources ()
901{
902 enumerate_keysym_resources (rxvt_define_key);
903}
857 904
858/*----------------------- end-of-file (C source) -----------------------*/ 905/*----------------------- end-of-file (C source) -----------------------*/
906

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines