| 1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
| 2 | * File: xdefaults.C |
2 | * File: xdefaults.C |
| 3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
| 4 | * |
4 | * |
| 5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
| 6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
| … | |
… | |
| 774 | } |
774 | } |
| 775 | |
775 | |
| 776 | const char * |
776 | const char * |
| 777 | rxvt_term::x_resource (const char *name) |
777 | rxvt_term::x_resource (const char *name) |
| 778 | { |
778 | { |
| 779 | XrmDatabase database = XrmGetDatabase (xdisp); |
779 | XrmDatabase database = XrmGetDatabase (dpy); |
| 780 | |
780 | |
| 781 | const char *p = get_res (database, rs[Rs_name], name); |
781 | const char *p = get_res (database, rs[Rs_name], name); |
| 782 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
782 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
| 783 | |
783 | |
| 784 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
784 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
| … | |
… | |
| 836 | |
836 | |
| 837 | /* |
837 | /* |
| 838 | * [R5 or later]: enumerate the resource database |
838 | * [R5 or later]: enumerate the resource database |
| 839 | */ |
839 | */ |
| 840 | # ifdef KEYSYM_RESOURCE |
840 | # ifdef KEYSYM_RESOURCE |
| 841 | XrmDatabase database = XrmGetDatabase (xdisp); |
841 | XrmDatabase database = XrmGetDatabase (dpy); |
| 842 | XrmName name_prefix[3]; |
842 | XrmName name_prefix[3]; |
| 843 | XrmClass class_prefix[3]; |
843 | XrmClass class_prefix[3]; |
| 844 | |
844 | |
| 845 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
845 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
| 846 | name_prefix[1] = XrmStringToName ("keysym"); |
846 | name_prefix[1] = XrmStringToName ("keysym"); |
