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.89 by root, Sun Jan 29 22:27:04 2006 UTC

… …
211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 213#if ENABLE_XEMBED
214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
215#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
216#if ENABLE_FRILLS 219#if ENABLE_FRILLS
217 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 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"), 221 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"), 222 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"), 223 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
… …
319#if TINTING 322#if TINTING
320 "tint," 323 "tint,"
321#endif 324#endif
322#if defined(USE_XIM) 325#if defined(USE_XIM)
323 "XIM," 326 "XIM,"
327#endif
328#if defined(NO_BACKSPACE_KEY)
329 "no_backspace,"
330#endif
331#if defined(NO_DELETE_KEY)
332 "no_delete,"
333#endif
334#if EIGHT_BIT_CONTROLS
335 "8bitctrls,"
336#endif
337#if defined(ENABLE_FRILLS)
338 "frills,"
339#endif
340#if defined(SELECTION_SCROLLING)
341 "selectionscrolling,"
342#endif
343#if MOUSE_WHEEL
344 "wheel,"
345#endif
346#if MOUSE_SLIP_WHEELING
347 "slipwheel,"
348#endif
349#if defined(SMART_RESIZE)
350 "smart-resize,"
351#endif
352#if defined(CURSOR_BLINK)
353 "cursorBlink,"
354#endif
355#if defined(POINTER_BLANK)
356 "pointerBlank,"
357#endif
358#if defined(NO_RESOURCES)
359 "NoResources,"
324#endif 360#endif
325 "scrollbars=" 361 "scrollbars="
326#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
327 "NONE" 363 "NONE"
328#else 364#else
… …
345# endif 381# endif
346# endif 382# endif
347# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
348 "xterm" 384 "xterm"
349# endif 385# 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 386#endif
388 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
389 388
390#define INDENT 18 389#define INDENT 18
391 390
… …
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