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.185 by sf-exg, Sat Mar 14 23:03:51 2015 UTC

… …
874 874
875 XrmDatabase database = XrmGetDatabase (dpy); 875 XrmDatabase database = XrmGetDatabase (dpy);
876 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
877 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
878 878
879 name_prefix[0] = XrmStringToName (rs[Rs_name]);
880 name_prefix[1] = XrmStringToName ("keysym"); 879 name_prefix[1] = XrmStringToName ("keysym");
881 name_prefix[2] = NULLQUARK; 880 name_prefix[2] = NULLQUARK;
882 class_prefix[0] = XrmStringToName (RESCLASS);
883 class_prefix[1] = XrmStringToName ("Keysym"); 881 class_prefix[1] = XrmStringToName ("Keysym");
884 class_prefix[2] = NULLQUARK; 882 class_prefix[2] = NULLQUARK;
885 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883
886 XrmEnumerateDatabase (database, name_prefix, class_prefix,
887 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
888# ifdef RESFALLBACK 884# ifdef RESFALLBACK
889 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 885 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
890 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 886 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
891 XrmEnumerateDatabase (database, name_prefix, class_prefix, 887 XrmEnumerateDatabase (database, name_prefix, class_prefix,
892 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 888 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
893# endif 889# endif
890
891 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
892 XrmEnumerateDatabase (database, name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
894
895 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
896 XrmEnumerateDatabase (database, name_prefix, class_prefix,
897 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
894# endif 898# endif
895 899
896#endif /* NO_RESOURCES */ 900#endif /* NO_RESOURCES */
897} 901}
898 902

Diff Legend

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