| … | |
… | |
| 764 | } |
764 | } |
| 765 | |
765 | |
| 766 | const char * |
766 | const char * |
| 767 | rxvt_term::x_resource (const char *name) |
767 | rxvt_term::x_resource (const char *name) |
| 768 | { |
768 | { |
| 769 | XrmDatabase database = XrmGetDatabase (display->display); |
769 | XrmDatabase database = XrmGetDatabase (xdisp); |
| 770 | |
770 | |
| 771 | const char *p = get_res (database, rs[Rs_name], name); |
771 | const char *p = get_res (database, rs[Rs_name], name); |
| 772 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
772 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
| 773 | |
773 | |
| 774 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
774 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
| … | |
… | |
| 826 | |
826 | |
| 827 | /* |
827 | /* |
| 828 | * [R5 or later]: enumerate the resource database |
828 | * [R5 or later]: enumerate the resource database |
| 829 | */ |
829 | */ |
| 830 | # ifdef KEYSYM_RESOURCE |
830 | # ifdef KEYSYM_RESOURCE |
| 831 | XrmDatabase database = XrmGetDatabase (display->display); |
831 | XrmDatabase database = XrmGetDatabase (xdisp); |
| 832 | XrmName name_prefix[3]; |
832 | XrmName name_prefix[3]; |
| 833 | XrmClass class_prefix[3]; |
833 | XrmClass class_prefix[3]; |
| 834 | |
834 | |
| 835 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
835 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
| 836 | name_prefix[1] = XrmStringToName ("keysym"); |
836 | name_prefix[1] = XrmStringToName ("keysym"); |
