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.114 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.119 by ayin, Sun Oct 28 11:06:59 2007 UTC

109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 112#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 SWCH ("tr", Opt_transparent, 0, NULL), 114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
117#endif 117#endif
118#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
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 && !argv [i+1]) 552 if (flag == resval_on && i+1 == argc)
553 rxvt_fatal ("option '%s' needs 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 == resval_on ? argv[++i] : resval_undef;
556 } 556 }
557 } 557 }
558 else 558 else
565 } 565 }
566 else 566 else
567#ifdef KEYSYM_RESOURCE 567#ifdef KEYSYM_RESOURCE
568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 568 if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
569 { 569 {
570 const char *str = argv[++i]; 570 if (i+1 < argc)
571
572 if (str != NULL)
573 parse_keysym (opt + sizeof ("keysym.") - 1, str); 571 parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
574 } 572 }
575 else 573 else
576#endif 574#endif
577 { 575 {
578 bad_option = 1; 576 bad_option = 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines