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.185 by sf-exg, Sat Mar 14 23:03:51 2015 UTC vs.
Revision 1.188 by sf-exg, Tue May 12 13:55:04 2015 UTC

… …
625 return 0; 625 return 0;
626} 626}
627 627
628/*}}} */ 628/*}}} */
629 629
630#ifndef NO_RESOURCES
631/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
632 631
633# ifdef KEYSYM_RESOURCE 632#ifdef KEYSYM_RESOURCE
634static void 633static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v) 634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{ 635{
637 term->bind_action (k, v); 636 term->bind_action (k, v);
638} 637}
… …
775 774
776 free (ws); 775 free (ws);
777 return 1; 776 return 1;
778} 777}
779 778
780# endif /* KEYSYM_RESOURCE */ 779#endif /* KEYSYM_RESOURCE */
781#endif /* NO_RESOURCES */
782 780
783static char * 781static char *
784get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
785{ 783{
786 char resource[512]; 784 char resource[512];
… …
860} 858}
861 859
862void 860void
863rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) 861rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
864{ 862{
865#ifndef NO_RESOURCES
866 /* 863 /*
867 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
868 */ 865 */
869# ifdef KEYSYM_RESOURCE 866#ifdef KEYSYM_RESOURCE
870 void *closure[2] = { 867 void *closure[2] = {
871 (void *)this, 868 (void *)this,
872 (void *)cb, 869 (void *)cb,
873 }; 870 };
874 871
… …
879 name_prefix[1] = XrmStringToName ("keysym"); 876 name_prefix[1] = XrmStringToName ("keysym");
880 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
881 class_prefix[1] = XrmStringToName ("Keysym"); 878 class_prefix[1] = XrmStringToName ("Keysym");
882 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
883 880
884# ifdef RESFALLBACK 881# ifdef RESFALLBACK
885 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
886 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
887 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
888 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
889# endif 886# endif
890 887
891 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS); 888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
892 XrmEnumerateDatabase (database, name_prefix, class_prefix, 889 XrmEnumerateDatabase (database, name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
894 891
895 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]); 892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
896 XrmEnumerateDatabase (database, name_prefix, class_prefix, 893 XrmEnumerateDatabase (database, name_prefix, class_prefix,
897 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
898# endif 895#endif
899
900#endif /* NO_RESOURCES */
901} 896}
902 897
903void 898void
904rxvt_term::extract_keysym_resources () 899rxvt_term::extract_keysym_resources ()
905{ 900{
901#ifdef KEYSYM_RESOURCE
906 enumerate_keysym_resources (rxvt_define_key); 902 enumerate_keysym_resources (rxvt_define_key);
903#endif
907} 904}
908 905
909/*----------------------- end-of-file (C source) -----------------------*/ 906/*----------------------- end-of-file (C source) -----------------------*/
910 907

Diff Legend

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