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.129 by ayin, Mon Jan 7 12:31:49 2008 UTC vs.
Revision 1.134 by ayin, Sun Jan 27 16:52:13 2008 UTC

… …
63/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
64#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
66 66
67/* convenient macros */ 67/* convenient macros */
68#define optList_strlen(i) \ 68#define optList_isString(i) \
69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
70#define optList_isBool(i) \ 70#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 74#define optList_size \
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 174#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 176#endif
177#ifdef KEEP_SCROLLCOLOR 177#ifdef HAVE_SCROLLBARS
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#endif
180#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 181 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 182#endif
181#ifdef OPTION_HC 183#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183#endif 185#endif
184#ifndef NO_CURSORCOLOR 186#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
… …
215#if ENABLE_XEMBED 217#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 219#endif
218#if XFT 220#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 223#endif
221#if ENABLE_FRILLS 224#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 226 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
413 for (col = 1, i = 0; i < optList_size; i++) 416 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 417 if (optList[i].desc != NULL)
415 { 418 {
416 int len = 0; 419 int len = 0;
417 420
418 if (!optList_isBool (i)) 421 if (optList[i].arg)
419 { 422 len = strlen (optList[i].arg) + 1;
420 len = optList_strlen (i);
421 if (len > 0)
422 len++; /* account for space */
423 }
424#ifdef DEBUG_STRICT 423#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 424 assert (optList[i].opt != NULL);
426#endif 425#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 427 col += len;
… …
432 rxvt_log ("\n"); 431 rxvt_log ("\n");
433 col = 1 + len; 432 col = 1 + len;
434 } 433 }
435 434
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 436 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
439 else 438 else
440 rxvt_log ("]"); 439 rxvt_log ("]");
441 } 440 }
442 break; 441 break;
… …
494 int i, bad_option = 0; 493 int i, bad_option = 0;
495 494
496 for (i = 1; i < argc; i++) 495 for (i = 1; i < argc; i++)
497 { 496 {
498 unsigned int entry, longopt = 0; 497 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 498 const char *opt;
499 int flag;
500 500
501 opt = argv[i]; 501 opt = argv[i];
502 502
503 if (*opt == '-') 503 if (*opt == '-')
504 { 504 {
505 flag = resval_on; 505 flag = 1;
506 506
507 if (*++opt == '-') 507 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 508 longopt = *opt++; /* long option */
509 } 509 }
510 else if (*opt == '+') 510 else if (*opt == '+')
511 { 511 {
512 flag = resval_off; 512 flag = 0;
513 513
514 if (*++opt == '+') 514 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 515 longopt = *opt++; /* long option */
516 } 516 }
517 else 517 else
… …
535 break; 535 break;
536 536
537 if (entry < optList_size) 537 if (entry < optList_size)
538 { 538 {
539 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 540 flag = !flag;
541 541
542 if (optList_strlen (entry)) 542 if (optList_isString (entry))
543 { 543 {
544 /* 544 /*
545 * special cases are handled in main.c:main () to allow 545 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
547 * default values 547 * default values
548 */ 548 */
549 549
550 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
551 { 551 {
552 if (flag == resval_on && i+1 == argc) 552 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 554
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 556 }
557 } 557 }
558 else 558 else
559 { 559 {
560 /* boolean value */ 560 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 561 set_option (optList[entry].index, flag);
562 562
563 if (optList[entry].doff != -1) 563 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 564 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 565 }
566 } 566 }
567#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
569 { 569 {
… …
634{ 634{
635 const char *name; 635 const char *name;
636 unsigned short len; 636 unsigned short len;
637 unsigned short value; 637 unsigned short value;
638}; 638};
639keysym_vocabulary_t keysym_vocabulary[] = 639static const keysym_vocabulary_t keysym_vocabulary[] =
640{ 640{
641 { "ISOLevel3", 9, Level3Mask }, 641 { "ISOLevel3", 9, Level3Mask },
642 { "AppKeypad", 9, AppKeypadMask }, 642 { "AppKeypad", 9, AppKeypadMask },
643 { "Control", 7, ControlMask }, 643 { "Control", 7, ControlMask },
644 { "NumLock", 7, NumLockMask }, 644 { "NumLock", 7, NumLockMask },

Diff Legend

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