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.83 by root, Sat Jan 21 22:38:06 2006 UTC vs.
Revision 1.88 by root, Wed Jan 25 22:14:45 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
… …
218#if ENABLE_FRILLS 216#if ENABLE_FRILLS
219 RSTRG (Rs_transient_for, "transient-for", "windowid"), 217 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"), 218 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"), 219 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"), 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"),
223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
321#if TINTING 320#if TINTING
322 "tint," 321 "tint,"
323#endif 322#endif
324#if defined(USE_XIM) 323#if defined(USE_XIM)
325 "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,"
326#endif 358#endif
327 "scrollbars=" 359 "scrollbars="
328#if !defined(HAVE_SCROLLBARS) 360#if !defined(HAVE_SCROLLBARS)
329 "NONE" 361 "NONE"
330#else 362#else
… …
348# endif 380# endif
349# if defined(XTERM_SCROLLBAR) 381# if defined(XTERM_SCROLLBAR)
350 "xterm" 382 "xterm"
351# endif 383# endif
352#endif 384#endif
353 ","
354#if defined(NO_BACKSPACE_KEY)
355 "no_backspace,"
356#endif
357#if defined(NO_DELETE_KEY)
358 "no_delete,"
359#endif
360#if EIGHT_BIT_CONTROLS
361 "8bitctrls,"
362#endif
363#if defined(ENABLE_FRILLS)
364 "frills,"
365#endif
366#if defined(PREFER_24BIT)
367 "24bit,"
368#endif
369#if defined(SELECTION_SCROLLING)
370 "selectionscrolling,"
371#endif
372#if MOUSE_WHEEL
373 "wheel,"
374#endif
375#if MOUSE_SLIP_WHEELING
376 "slipwheel,"
377#endif
378#if defined(SMART_RESIZE)
379 "smart-resize,"
380#endif
381#if defined(CURSOR_BLINK)
382 "cursorBlink,"
383#endif
384#if defined(POINTER_BLANK)
385 "pointerBlank,"
386#endif
387#if defined(NO_RESOURCES)
388 "NoResources"
389#endif
390 "\nUsage: "; /* Usage */ 385 "\nUsage: "; /* Usage */
391 386
392#define INDENT 18 387#define INDENT 18
393 388
394/*{{{ usage: */ 389/*{{{ usage: */
… …
492 { 487 {
493 unsigned int entry, longopt = 0; 488 unsigned int entry, longopt = 0;
494 const char *flag, *opt; 489 const char *flag, *opt;
495 490
496 opt = argv[i]; 491 opt = argv[i];
497#ifdef DEBUG_RESOURCES 492
498 fprintf (stderr, "argv[%d] = %s: ", i, opt);
499#endif
500 if (*opt == '-') 493 if (*opt == '-')
501 { 494 {
502 flag = On; 495 flag = On;
503 if (*++opt == '-') 496 if (*++opt == '-')
504 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
… …
545 rs[optList[entry].doff] = flag == On && argv[i+1] 538 rs[optList[entry].doff] = flag == On && argv[i+1]
546 ? argv[++i] : 0; 539 ? argv[++i] : 0;
547 } 540 }
548 else 541 else
549 { /* boolean value */ 542 { /* boolean value */
550#ifdef DEBUG_RESOURCES
551 fprintf (stderr, "boolean (%s,%s) = %s\n",
552 optList[entry].opt, optList[entry].kw, flag);
553#endif
554 set_option (optList[entry].flag & Optflag_mask, flag == On); 543 set_option (optList[entry].flag & Optflag_mask, flag == On);
555 544
556 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag; 546 rs[optList[entry].doff] = flag;
558 } 547 }
… …
774} 763}
775 764
776const char * 765const char *
777rxvt_term::x_resource (const char *name) 766rxvt_term::x_resource (const char *name)
778{ 767{
779 XrmDatabase database = XrmGetDatabase (display->display); 768 XrmDatabase database = XrmGetDatabase (xdisp);
780 769
781 const char *p = get_res (database, rs[Rs_name], name); 770 const char *p = get_res (database, rs[Rs_name], name);
782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 771 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
783 772
784 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 773 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
836 825
837 /* 826 /*
838 * [R5 or later]: enumerate the resource database 827 * [R5 or later]: enumerate the resource database
839 */ 828 */
840# ifdef KEYSYM_RESOURCE 829# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (display->display); 830 XrmDatabase database = XrmGetDatabase (xdisp);
842 XrmName name_prefix[3]; 831 XrmName name_prefix[3];
843 XrmClass class_prefix[3]; 832 XrmClass class_prefix[3];
844 833
845 name_prefix[0] = XrmStringToName (rs[Rs_name]); 834 name_prefix[0] = XrmStringToName (rs[Rs_name]);
846 name_prefix[1] = XrmStringToName ("keysym"); 835 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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