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.184 by sf-exg, Mon Oct 13 17:05:32 2014 UTC vs.
Revision 1.186 by sf-exg, Mon May 11 22:05:48 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)
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] = {
874 871
875 XrmDatabase database = XrmGetDatabase (dpy); 872 XrmDatabase database = XrmGetDatabase (dpy);
876 XrmName name_prefix[3]; 873 XrmName name_prefix[3];
877 XrmClass class_prefix[3]; 874 XrmClass class_prefix[3];
878 875
879 name_prefix[0] = XrmStringToName (rs[Rs_name]);
880 name_prefix[1] = XrmStringToName ("keysym"); 876 name_prefix[1] = XrmStringToName ("keysym");
881 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
882 class_prefix[0] = XrmStringToName (RESCLASS);
883 class_prefix[1] = XrmStringToName ("Keysym"); 878 class_prefix[1] = XrmStringToName ("Keysym");
884 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
885 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 880
886 XrmEnumerateDatabase (database, name_prefix, class_prefix,
887 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
888# ifdef RESFALLBACK 881# ifdef RESFALLBACK
889 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
890 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
891 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
892 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
893# endif 886# endif
887
888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
889 XrmEnumerateDatabase (database, name_prefix, class_prefix,
890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
891
892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
893 XrmEnumerateDatabase (database, name_prefix, class_prefix,
894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
894# endif 895# endif
895
896#endif /* NO_RESOURCES */
897} 896}
898 897
899void 898void
900rxvt_term::extract_keysym_resources () 899rxvt_term::extract_keysym_resources ()
901{ 900{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines