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.136 by ayin, Sat Feb 16 15:56:41 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 \
… …
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 108 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 111#if ENABLE_TRANSPARENCY
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 172#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 174#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 178#endif
181#ifdef OPTION_HC 179#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
183#endif 181#endif
184#ifndef NO_CURSORCOLOR 182#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
… …
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 XFT 216#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 219#endif
221#if ENABLE_FRILLS 220#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 221 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"), 222 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"), 223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
244#endif 243#endif
245#ifdef PRINTPIPE 244#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 245 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 246#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 247 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 248 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 253#endif
… …
360 "pointerBlank," 357 "pointerBlank,"
361#endif 358#endif
362#if defined(NO_RESOURCES) 359#if defined(NO_RESOURCES)
363 "NoResources," 360 "NoResources,"
364#endif 361#endif
365 "scrollbars=" 362 "scrollbars=plain"
366#if !defined(HAVE_SCROLLBARS)
367 "NONE"
368#else
369# if defined(PLAIN_SCROLLBAR)
370 "plain"
371# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
372 "+"
373# endif
374# endif
375# if defined(RXVT_SCROLLBAR) 363#if defined(RXVT_SCROLLBAR)
376 "rxvt" 364 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 365#endif
381# if defined(NEXT_SCROLLBAR) 366#if defined(NEXT_SCROLLBAR)
382 "NeXT" 367 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 368#endif
387# if defined(XTERM_SCROLLBAR) 369#if defined(XTERM_SCROLLBAR)
388 "xterm" 370 "+xterm"
389# endif
390#endif 371#endif
391 "\nUsage: "; /* Usage */ 372 "\nUsage: "; /* Usage */
392 373
393#define INDENT 18 374#define INDENT 18
394 375
… …
413 for (col = 1, i = 0; i < optList_size; i++) 394 for (col = 1, i = 0; i < optList_size; i++)
414 if (optList[i].desc != NULL) 395 if (optList[i].desc != NULL)
415 { 396 {
416 int len = 0; 397 int len = 0;
417 398
418 if (!optList_isBool (i)) 399 if (optList[i].arg)
419 { 400 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 401#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 402 assert (optList[i].opt != NULL);
426#endif 403#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
428 col += len; 405 col += len;
… …
432 rxvt_log ("\n"); 409 rxvt_log ("\n");
433 col = 1 + len; 410 col = 1 + len;
434 } 411 }
435 412
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 413 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 414 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 415 rxvt_log (" %s]", optList[i].arg);
439 else 416 else
440 rxvt_log ("]"); 417 rxvt_log ("]");
441 } 418 }
442 break; 419 break;
… …
494 int i, bad_option = 0; 471 int i, bad_option = 0;
495 472
496 for (i = 1; i < argc; i++) 473 for (i = 1; i < argc; i++)
497 { 474 {
498 unsigned int entry, longopt = 0; 475 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 476 const char *opt;
477 int flag;
500 478
501 opt = argv[i]; 479 opt = argv[i];
502 480
503 if (*opt == '-') 481 if (*opt == '-')
504 { 482 {
505 flag = resval_on; 483 flag = 1;
506 484
507 if (*++opt == '-') 485 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 486 longopt = *opt++; /* long option */
509 } 487 }
510 else if (*opt == '+') 488 else if (*opt == '+')
511 { 489 {
512 flag = resval_off; 490 flag = 0;
513 491
514 if (*++opt == '+') 492 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 493 longopt = *opt++; /* long option */
516 } 494 }
517 else 495 else
… …
535 break; 513 break;
536 514
537 if (entry < optList_size) 515 if (entry < optList_size)
538 { 516 {
539 if (optList_isReverse (entry)) 517 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 518 flag = !flag;
541 519
542 if (optList_strlen (entry)) 520 if (optList_isString (entry))
543 { 521 {
544 /* 522 /*
545 * special cases are handled in main.c:main () to allow 523 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 524 * X resources to set these values before we settle for
547 * default values 525 * default values
548 */ 526 */
549 527
550 if (optList[entry].doff != -1) 528 if (optList[entry].doff != -1)
551 { 529 {
552 if (flag == resval_on && i+1 == argc) 530 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 531 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 532
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 533 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 534 }
557 } 535 }
558 else 536 else
559 { 537 {
560 /* boolean value */ 538 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 539 set_option (optList[entry].index, flag);
562 540
563 if (optList[entry].doff != -1) 541 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 542 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 543 }
566 } 544 }
567#ifndef NO_RESOURCES 545#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 546 else if (!strcmp (opt, "xrm"))
569 { 547 {
… …
634{ 612{
635 const char *name; 613 const char *name;
636 unsigned short len; 614 unsigned short len;
637 unsigned short value; 615 unsigned short value;
638}; 616};
639keysym_vocabulary_t keysym_vocabulary[] = 617static const keysym_vocabulary_t keysym_vocabulary[] =
640{ 618{
641 { "ISOLevel3", 9, Level3Mask }, 619 { "ISOLevel3", 9, Level3Mask },
642 { "AppKeypad", 9, AppKeypadMask }, 620 { "AppKeypad", 9, AppKeypadMask },
643 { "Control", 7, ControlMask }, 621 { "Control", 7, ControlMask },
644 { "NumLock", 7, NumLockMask }, 622 { "NumLock", 7, NumLockMask },

Diff Legend

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