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.80 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.87 by root, Wed Jan 25 22:13:47 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
… …
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
218#if ENABLE_FRILLS 216#if ENABLE_FRILLS
219 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"),
220 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"),
221 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"),
222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 222 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 223 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 225 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 226 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
… …
317#if defined(TRANSPARENT) 317#if defined(TRANSPARENT)
318 "transparent," 318 "transparent,"
319#endif 319#endif
320#if TINTING 320#if TINTING
321 "tint," 321 "tint,"
322#endif
323#if defined(UTMP_SUPPORT)
324 "utmp,"
325#endif 322#endif
326#if defined(USE_XIM) 323#if defined(USE_XIM)
327 "XIM," 324 "XIM,"
328#endif 325#endif
329 "scrollbars=" 326 "scrollbars="
… …
363 "8bitctrls," 360 "8bitctrls,"
364#endif 361#endif
365#if defined(ENABLE_FRILLS) 362#if defined(ENABLE_FRILLS)
366 "frills," 363 "frills,"
367#endif 364#endif
368#if defined(PREFER_24BIT)
369 "24bit,"
370#endif
371#if defined(SELECTION_SCROLLING) 365#if defined(SELECTION_SCROLLING)
372 "selectionscrolling," 366 "selectionscrolling,"
373#endif 367#endif
374#if MOUSE_WHEEL 368#if MOUSE_WHEEL
375 "wheel," 369 "wheel,"
… …
385#endif 379#endif
386#if defined(POINTER_BLANK) 380#if defined(POINTER_BLANK)
387 "pointerBlank," 381 "pointerBlank,"
388#endif 382#endif
389#if defined(NO_RESOURCES) 383#if defined(NO_RESOURCES)
390 "NoResources" 384 "NoResources,"
391#endif 385#endif
386 "v" VERSION
392 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
393 388
394#define INDENT 18 389#define INDENT 18
395 390
396/*{{{ usage: */ 391/*{{{ usage: */
… …
494 { 489 {
495 unsigned int entry, longopt = 0; 490 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 491 const char *flag, *opt;
497 492
498 opt = argv[i]; 493 opt = argv[i];
499#ifdef DEBUG_RESOURCES 494
500 fprintf (stderr, "argv[%d] = %s: ", i, opt);
501#endif
502 if (*opt == '-') 495 if (*opt == '-')
503 { 496 {
504 flag = On; 497 flag = On;
505 if (*++opt == '-') 498 if (*++opt == '-')
506 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
… …
547 rs[optList[entry].doff] = flag == On && argv[i+1] 540 rs[optList[entry].doff] = flag == On && argv[i+1]
548 ? argv[++i] : 0; 541 ? argv[++i] : 0;
549 } 542 }
550 else 543 else
551 { /* boolean value */ 544 { /* boolean value */
552#ifdef DEBUG_RESOURCES
553 fprintf (stderr, "boolean (%s,%s) = %s\n",
554 optList[entry].opt, optList[entry].kw, flag);
555#endif
556 set_option (optList[entry].flag & Optflag_mask, flag == On); 545 set_option (optList[entry].flag & Optflag_mask, flag == On);
557 546
558 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
559 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag;
560 } 549 }
… …
593 * "rxvt" "keysym" "0xFF01" 582 * "rxvt" "keysym" "0xFF01"
594 * value will be a string 583 * value will be a string
595 */ 584 */
596/* ARGSUSED */ 585/* ARGSUSED */
597int 586int
598rxvt_define_key (XrmDatabase *database __attribute__((unused)), 587rxvt_define_key (XrmDatabase *database UNUSED,
599 XrmBindingList bindings __attribute__((unused)), 588 XrmBindingList bindings UNUSED,
600 XrmQuarkList quarks, 589 XrmQuarkList quarks,
601 XrmRepresentation *type __attribute__((unused)), 590 XrmRepresentation *type UNUSED,
602 XrmValue *value, 591 XrmValue *value,
603 XPointer closure __attribute__((unused))) 592 XPointer closure UNUSED)
604{ 593{
605 int last; 594 int last;
606 595
607 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 596 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
608 ; 597 ;
… …
776} 765}
777 766
778const char * 767const char *
779rxvt_term::x_resource (const char *name) 768rxvt_term::x_resource (const char *name)
780{ 769{
781 XrmDatabase database = XrmGetDatabase (display->display); 770 XrmDatabase database = XrmGetDatabase (xdisp);
782 771
783 const char *p = get_res (database, rs[Rs_name], name); 772 const char *p = get_res (database, rs[Rs_name], name);
784 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); 773 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
785 774
786 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 775 if (p == NULL || (p0 && strcmp (p, p0) == 0))
… …
838 827
839 /* 828 /*
840 * [R5 or later]: enumerate the resource database 829 * [R5 or later]: enumerate the resource database
841 */ 830 */
842# ifdef KEYSYM_RESOURCE 831# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (display->display); 832 XrmDatabase database = XrmGetDatabase (xdisp);
844 XrmName name_prefix[3]; 833 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 834 XrmClass class_prefix[3];
846 835
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 836 name_prefix[0] = XrmStringToName (rs[Rs_name]);
848 name_prefix[1] = XrmStringToName ("keysym"); 837 name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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