… | |
… | |
216 | #if ENABLE_FRILLS |
216 | #if ENABLE_FRILLS |
217 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
217 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
218 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
218 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
219 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
219 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
220 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
220 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
|
|
221 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
221 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
222 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
222 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
223 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
223 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
224 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
224 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
225 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
225 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
226 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
… | |
… | |
358 | #if EIGHT_BIT_CONTROLS |
359 | #if EIGHT_BIT_CONTROLS |
359 | "8bitctrls," |
360 | "8bitctrls," |
360 | #endif |
361 | #endif |
361 | #if defined(ENABLE_FRILLS) |
362 | #if defined(ENABLE_FRILLS) |
362 | "frills," |
363 | "frills," |
363 | #endif |
|
|
364 | #if defined(PREFER_24BIT) |
|
|
365 | "24bit," |
|
|
366 | #endif |
364 | #endif |
367 | #if defined(SELECTION_SCROLLING) |
365 | #if defined(SELECTION_SCROLLING) |
368 | "selectionscrolling," |
366 | "selectionscrolling," |
369 | #endif |
367 | #endif |
370 | #if MOUSE_WHEEL |
368 | #if MOUSE_WHEEL |
… | |
… | |
766 | } |
764 | } |
767 | |
765 | |
768 | const char * |
766 | const char * |
769 | rxvt_term::x_resource (const char *name) |
767 | rxvt_term::x_resource (const char *name) |
770 | { |
768 | { |
771 | XrmDatabase database = XrmGetDatabase (display->display); |
769 | XrmDatabase database = XrmGetDatabase (xdisp); |
772 | |
770 | |
773 | const char *p = get_res (database, rs[Rs_name], name); |
771 | const char *p = get_res (database, rs[Rs_name], name); |
774 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
772 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
775 | |
773 | |
776 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
774 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
… | |
… | |
828 | |
826 | |
829 | /* |
827 | /* |
830 | * [R5 or later]: enumerate the resource database |
828 | * [R5 or later]: enumerate the resource database |
831 | */ |
829 | */ |
832 | # ifdef KEYSYM_RESOURCE |
830 | # ifdef KEYSYM_RESOURCE |
833 | XrmDatabase database = XrmGetDatabase (display->display); |
831 | XrmDatabase database = XrmGetDatabase (xdisp); |
834 | XrmName name_prefix[3]; |
832 | XrmName name_prefix[3]; |
835 | XrmClass class_prefix[3]; |
833 | XrmClass class_prefix[3]; |
836 | |
834 | |
837 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
835 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
838 | name_prefix[1] = XrmStringToName ("keysym"); |
836 | name_prefix[1] = XrmStringToName ("keysym"); |