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.187 by sf-exg, Mon May 11 22:05:58 2015 UTC vs.
Revision 1.188 by sf-exg, Tue May 12 13:55:04 2015 UTC

627 627
628/*}}} */ 628/*}}} */
629 629
630/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
631 631
632# ifdef KEYSYM_RESOURCE 632#ifdef KEYSYM_RESOURCE
633static void 633static void
634rxvt_define_key (rxvt_term *term, const char *k, const char *v) 634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
635{ 635{
636 term->bind_action (k, v); 636 term->bind_action (k, v);
637} 637}
774 774
775 free (ws); 775 free (ws);
776 return 1; 776 return 1;
777} 777}
778 778
779# endif /* KEYSYM_RESOURCE */ 779#endif /* KEYSYM_RESOURCE */
780 780
781static char * 781static char *
782get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
783{ 783{
784 char resource[512]; 784 char resource[512];
861rxvt_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 *))
862{ 862{
863 /* 863 /*
864 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
865 */ 865 */
866# ifdef KEYSYM_RESOURCE 866#ifdef KEYSYM_RESOURCE
867 void *closure[2] = { 867 void *closure[2] = {
868 (void *)this, 868 (void *)this,
869 (void *)cb, 869 (void *)cb,
870 }; 870 };
871 871
876 name_prefix[1] = XrmStringToName ("keysym"); 876 name_prefix[1] = XrmStringToName ("keysym");
877 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
878 class_prefix[1] = XrmStringToName ("Keysym"); 878 class_prefix[1] = XrmStringToName ("Keysym");
879 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
880 880
881# ifdef RESFALLBACK 881# ifdef RESFALLBACK
882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
884 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
886# endif 886# endif
887 887
888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS); 888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
889 XrmEnumerateDatabase (database, name_prefix, class_prefix, 889 XrmEnumerateDatabase (database, name_prefix, class_prefix,
890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
891 891
892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]); 892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
893 XrmEnumerateDatabase (database, name_prefix, class_prefix, 893 XrmEnumerateDatabase (database, name_prefix, class_prefix,
894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
895# endif 895#endif
896} 896}
897 897
898void 898void
899rxvt_term::extract_keysym_resources () 899rxvt_term::extract_keysym_resources ()
900{ 900{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines