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.98 by root, Tue May 1 14:46:23 2007 UTC vs.
Revision 1.106 by ayin, Sun Jun 10 14:27:58 2007 UTC

… …
32#endif 32#endif
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 35#define Optflag_Reverse 1
36#define Optflag_Boolean 2 36#define Optflag_Boolean 2
37#define Optflag_Switch 4
37 38
38/* monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
39/* 40/*
40 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
… …
54#define RSTRG(rsp, kw, arg) \ 55#define RSTRG(rsp, kw, arg) \
55 {0, 0, (rsp), (kw), NULL, (arg), NULL} 56 {0, 0, (rsp), (kw), NULL, (arg), NULL}
56 57
57/* BOOL () - regular boolean `-/+' flag */ 58/* BOOL () - regular boolean `-/+' flag */
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 61
61/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
63 { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 65
65/* convenient macros */ 66/* convenient macros */
66#define optList_strlen(i) \ 67#define optList_strlen(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
68#define optList_isBool(i) \ 69#define optList_isBool(i) \
… …
121#if TINTING 122#if TINTING
122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."), 123 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
123#endif 124#endif
124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 125 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
125#ifndef NO_BELL 126#ifndef NO_BELL
127# if ENABLE_FRILLS
128 BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
129# endif
126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), 130 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 131# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), 132 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
129# endif 133# endif
130#endif 134#endif
… …
255 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 259 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 260 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 261 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 262 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 263#endif
264#if ISO_14755
265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266#endif
267#ifdef HAVE_AFTERIMAGE
268 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
269 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
270#endif
260#ifndef NO_RESOURCES 271#ifndef NO_RESOURCES
261 INFO ("xrm", "string", "X resource"), 272 INFO ("xrm", "string", "X resource"),
262#endif 273#endif
263 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
264 }; 275 };
… …
549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 560 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
550 } 561 }
551 } 562 }
552 else 563 else
553 { /* boolean value */ 564 { /* boolean value */
554 set_option (1UL << optList[entry].index, flag == resval_on); 565 set_option (optList[entry].index, flag == resval_on);
555 566
556 if (optList[entry].doff != -1) 567 if (optList[entry].doff != -1)
557 rs[optList[entry].doff] = flag; 568 rs[optList[entry].doff] = flag;
558 } 569 }
559 } 570 }
… …
827 || strcasecmp (p, "1") == 0; 838 || strcasecmp (p, "1") == 0;
828 839
829 if (optList_isReverse (entry)) 840 if (optList_isReverse (entry))
830 s = !s; 841 s = !s;
831 842
832 set_option (1UL << optList[entry].index, s); 843 set_option (optList[entry].index, s);
833 } 844 }
834 } 845 }
835 } 846 }
836 847
837 /* 848 /*

Diff Legend

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