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.84 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.87 by root, Wed Jan 25 22:13:47 2006 UTC

… …
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"),
… …
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#endif
364#if defined(PREFER_24BIT)
365 "24bit,"
366#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
371 "wheel," 369 "wheel,"
… …
381#endif 379#endif
382#if defined(POINTER_BLANK) 380#if defined(POINTER_BLANK)
383 "pointerBlank," 381 "pointerBlank,"
384#endif 382#endif
385#if defined(NO_RESOURCES) 383#if defined(NO_RESOURCES)
386 "NoResources" 384 "NoResources,"
387#endif 385#endif
386 "v" VERSION
388 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
389 388
390#define INDENT 18 389#define INDENT 18
391 390
392/*{{{ usage: */ 391/*{{{ usage: */
… …
766} 765}
767 766
768const char * 767const char *
769rxvt_term::x_resource (const char *name) 768rxvt_term::x_resource (const char *name)
770{ 769{
771 XrmDatabase database = XrmGetDatabase (display->display); 770 XrmDatabase database = XrmGetDatabase (xdisp);
772 771
773 const char *p = get_res (database, rs[Rs_name], name); 772 const char *p = get_res (database, rs[Rs_name], name);
774 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
775 774
776 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 775 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
828 827
829 /* 828 /*
830 * [R5 or later]: enumerate the resource database 829 * [R5 or later]: enumerate the resource database
831 */ 830 */
832# ifdef KEYSYM_RESOURCE 831# ifdef KEYSYM_RESOURCE
833 XrmDatabase database = XrmGetDatabase (display->display); 832 XrmDatabase database = XrmGetDatabase (xdisp);
834 XrmName name_prefix[3]; 833 XrmName name_prefix[3];
835 XrmClass class_prefix[3]; 834 XrmClass class_prefix[3];
836 835
837 name_prefix[0] = XrmStringToName (rs[Rs_name]); 836 name_prefix[0] = XrmStringToName (rs[Rs_name]);
838 name_prefix[1] = XrmStringToName ("keysym"); 837 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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