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.84 by root, Tue Jan 24 19:40:12 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
319 "transparent," 317 "transparent,"
320#endif 318#endif
321#if TINTING 319#if TINTING
322 "tint," 320 "tint,"
323#endif 321#endif
324#if defined(UTMP_SUPPORT)
325 "utmp,"
326#endif
327#if defined(USE_XIM) 322#if defined(USE_XIM)
328 "XIM," 323 "XIM,"
329#endif 324#endif
330 "scrollbars=" 325 "scrollbars="
331#if !defined(HAVE_SCROLLBARS) 326#if !defined(HAVE_SCROLLBARS)
495 { 490 {
496 unsigned int entry, longopt = 0; 491 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 492 const char *flag, *opt;
498 493
499 opt = argv[i]; 494 opt = argv[i];
500#ifdef DEBUG_RESOURCES 495
501 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif
503 if (*opt == '-') 496 if (*opt == '-')
504 { 497 {
505 flag = On; 498 flag = On;
506 if (*++opt == '-') 499 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 500 longopt = *opt++; /* long option */
548 rs[optList[entry].doff] = flag == On && argv[i+1] 541 rs[optList[entry].doff] = flag == On && argv[i+1]
549 ? argv[++i] : 0; 542 ? argv[++i] : 0;
550 } 543 }
551 else 544 else
552 { /* boolean value */ 545 { /* 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); 546 set_option (optList[entry].flag & Optflag_mask, flag == On);
558 547
559 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 549 rs[optList[entry].doff] = flag;
561 } 550 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines