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.88 by root, Wed Jan 25 22:14:45 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"),
… …
319#if TINTING 320#if TINTING
320 "tint," 321 "tint,"
321#endif 322#endif
322#if defined(USE_XIM) 323#if defined(USE_XIM)
323 "XIM," 324 "XIM,"
325#endif
326#if defined(NO_BACKSPACE_KEY)
327 "no_backspace,"
328#endif
329#if defined(NO_DELETE_KEY)
330 "no_delete,"
331#endif
332#if EIGHT_BIT_CONTROLS
333 "8bitctrls,"
334#endif
335#if defined(ENABLE_FRILLS)
336 "frills,"
337#endif
338#if defined(SELECTION_SCROLLING)
339 "selectionscrolling,"
340#endif
341#if MOUSE_WHEEL
342 "wheel,"
343#endif
344#if MOUSE_SLIP_WHEELING
345 "slipwheel,"
346#endif
347#if defined(SMART_RESIZE)
348 "smart-resize,"
349#endif
350#if defined(CURSOR_BLINK)
351 "cursorBlink,"
352#endif
353#if defined(POINTER_BLANK)
354 "pointerBlank,"
355#endif
356#if defined(NO_RESOURCES)
357 "NoResources,"
324#endif 358#endif
325 "scrollbars=" 359 "scrollbars="
326#if !defined(HAVE_SCROLLBARS) 360#if !defined(HAVE_SCROLLBARS)
327 "NONE" 361 "NONE"
328#else 362#else
… …
345# endif 379# endif
346# endif 380# endif
347# if defined(XTERM_SCROLLBAR) 381# if defined(XTERM_SCROLLBAR)
348 "xterm" 382 "xterm"
349# endif 383# endif
350#endif
351 ","
352#if defined(NO_BACKSPACE_KEY)
353 "no_backspace,"
354#endif
355#if defined(NO_DELETE_KEY)
356 "no_delete,"
357#endif
358#if EIGHT_BIT_CONTROLS
359 "8bitctrls,"
360#endif
361#if defined(ENABLE_FRILLS)
362 "frills,"
363#endif
364#if defined(PREFER_24BIT)
365 "24bit,"
366#endif
367#if defined(SELECTION_SCROLLING)
368 "selectionscrolling,"
369#endif
370#if MOUSE_WHEEL
371 "wheel,"
372#endif
373#if MOUSE_SLIP_WHEELING
374 "slipwheel,"
375#endif
376#if defined(SMART_RESIZE)
377 "smart-resize,"
378#endif
379#if defined(CURSOR_BLINK)
380 "cursorBlink,"
381#endif
382#if defined(POINTER_BLANK)
383 "pointerBlank,"
384#endif
385#if defined(NO_RESOURCES)
386 "NoResources"
387#endif 384#endif
388 "\nUsage: "; /* Usage */ 385 "\nUsage: "; /* Usage */
389 386
390#define INDENT 18 387#define INDENT 18
391 388
… …
766} 763}
767 764
768const char * 765const char *
769rxvt_term::x_resource (const char *name) 766rxvt_term::x_resource (const char *name)
770{ 767{
771 XrmDatabase database = XrmGetDatabase (display->display); 768 XrmDatabase database = XrmGetDatabase (xdisp);
772 769
773 const char *p = get_res (database, rs[Rs_name], name); 770 const char *p = get_res (database, rs[Rs_name], name);
774 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 771 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
775 772
776 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 773 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
828 825
829 /* 826 /*
830 * [R5 or later]: enumerate the resource database 827 * [R5 or later]: enumerate the resource database
831 */ 828 */
832# ifdef KEYSYM_RESOURCE 829# ifdef KEYSYM_RESOURCE
833 XrmDatabase database = XrmGetDatabase (display->display); 830 XrmDatabase database = XrmGetDatabase (xdisp);
834 XrmName name_prefix[3]; 831 XrmName name_prefix[3];
835 XrmClass class_prefix[3]; 832 XrmClass class_prefix[3];
836 833
837 name_prefix[0] = XrmStringToName (rs[Rs_name]); 834 name_prefix[0] = XrmStringToName (rs[Rs_name]);
838 name_prefix[1] = XrmStringToName ("keysym"); 835 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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