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.82 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.89 by root, Sun Jan 29 22:27:04 2006 UTC

… …
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL 37#define Optflag_mask 0x3fffffffUL
38
39/* #define DEBUG_RESOURCES */
40 38
41/*{{{ monolithic option/resource structure: */ 39/*{{{ monolithic option/resource structure: */
42/* 40/*
43 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
44 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
… …
213 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
214 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"),
215#if ENABLE_XEMBED 213#if ENABLE_XEMBED
216 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"),
217#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
218#if ENABLE_FRILLS 219#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 220 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 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"),
221 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"),
222 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 "transparent," 320 "transparent,"
320#endif 321#endif
321#if TINTING 322#if TINTING
322 "tint," 323 "tint,"
323#endif 324#endif
324#if defined(UTMP_SUPPORT)
325 "utmp,"
326#endif
327#if defined(USE_XIM) 325#if defined(USE_XIM)
328 "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,"
329#endif 360#endif
330 "scrollbars=" 361 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 362#if !defined(HAVE_SCROLLBARS)
332 "NONE" 363 "NONE"
333#else 364#else
… …
351# endif 382# endif
352# if defined(XTERM_SCROLLBAR) 383# if defined(XTERM_SCROLLBAR)
353 "xterm" 384 "xterm"
354# endif 385# endif
355#endif 386#endif
356 ","
357#if defined(NO_BACKSPACE_KEY)
358 "no_backspace,"
359#endif
360#if defined(NO_DELETE_KEY)
361 "no_delete,"
362#endif
363#if EIGHT_BIT_CONTROLS
364 "8bitctrls,"
365#endif
366#if defined(ENABLE_FRILLS)
367 "frills,"
368#endif
369#if defined(PREFER_24BIT)
370 "24bit,"
371#endif
372#if defined(SELECTION_SCROLLING)
373 "selectionscrolling,"
374#endif
375#if MOUSE_WHEEL
376 "wheel,"
377#endif
378#if MOUSE_SLIP_WHEELING
379 "slipwheel,"
380#endif
381#if defined(SMART_RESIZE)
382 "smart-resize,"
383#endif
384#if defined(CURSOR_BLINK)
385 "cursorBlink,"
386#endif
387#if defined(POINTER_BLANK)
388 "pointerBlank,"
389#endif
390#if defined(NO_RESOURCES)
391 "NoResources"
392#endif
393 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
394 388
395#define INDENT 18 389#define INDENT 18
396 390
397/*{{{ usage: */ 391/*{{{ usage: */
… …
495 { 489 {
496 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 491 const char *flag, *opt;
498 492
499 opt = argv[i]; 493 opt = argv[i];
500#ifdef DEBUG_RESOURCES 494
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 495 if (*opt == '-')
504 { 496 {
505 flag = On; 497 flag = On;
506 if (*++opt == '-') 498 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
… …
548 rs[optList[entry].doff] = flag == On && argv[i+1] 540 rs[optList[entry].doff] = flag == On && argv[i+1]
549 ? argv[++i] : 0; 541 ? argv[++i] : 0;
550 } 542 }
551 else 543 else
552 { /* boolean value */ 544 { /* boolean value */
553#ifdef DEBUG_RESOURCES
554 fprintf (stderr, "boolean (%s,%s) = %s\n",
555 optList[entry].opt, optList[entry].kw, flag);
556#endif
557 set_option (optList[entry].flag & Optflag_mask, flag == On); 545 set_option (optList[entry].flag & Optflag_mask, flag == On);
558 546
559 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag;
561 } 549 }
… …
777} 765}
778 766
779const char * 767const char *
780rxvt_term::x_resource (const char *name) 768rxvt_term::x_resource (const char *name)
781{ 769{
782 XrmDatabase database = XrmGetDatabase (display->display); 770 XrmDatabase database = XrmGetDatabase (xdisp);
783 771
784 const char *p = get_res (database, rs[Rs_name], name); 772 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786 774
787 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 775 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
839 827
840 /* 828 /*
841 * [R5 or later]: enumerate the resource database 829 * [R5 or later]: enumerate the resource database
842 */ 830 */
843# ifdef KEYSYM_RESOURCE 831# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display); 832 XrmDatabase database = XrmGetDatabase (xdisp);
845 XrmName name_prefix[3]; 833 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 834 XrmClass class_prefix[3];
847 835
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 836 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName ("keysym"); 837 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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