… | |
… | |
54 | #define RSTRG(rsp, kw, arg) \ |
54 | #define RSTRG(rsp, kw, arg) \ |
55 | {0, 0, (rsp), (kw), NULL, (arg), NULL} |
55 | {0, 0, (rsp), (kw), NULL, (arg), NULL} |
56 | |
56 | |
57 | /* BOOL () - regular boolean `-/+' flag */ |
57 | /* BOOL () - regular boolean `-/+' flag */ |
58 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
58 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
59 | { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
59 | { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
60 | |
60 | |
61 | /* SWCH () - `-' flag */ |
61 | /* SWCH () - `-' flag */ |
62 | #define SWCH(opt, option, flag, desc) \ |
62 | #define SWCH(opt, option, flag, desc) \ |
63 | { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)} |
63 | { (option), (flag), -1, NULL, (opt), NULL, (desc)} |
64 | |
64 | |
65 | /* convenient macros */ |
65 | /* convenient macros */ |
66 | #define optList_strlen(i) \ |
66 | #define optList_strlen(i) \ |
67 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
67 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
68 | #define optList_isBool(i) \ |
68 | #define optList_isBool(i) \ |
… | |
… | |
74 | |
74 | |
75 | static const struct |
75 | static const struct |
76 | { |
76 | { |
77 | const uint8_t index; /* Option index */ |
77 | const uint8_t index; /* Option index */ |
78 | const uint8_t flag; /* Option flag */ |
78 | const uint8_t flag; /* Option flag */ |
79 | const int doff; /* data offset */ |
79 | const int16_t doff; /* resource value index or -1 */ |
80 | const char *kw; /* keyword */ |
80 | const char *kw; /* keyword */ |
81 | const char *opt; /* option */ |
81 | const char *opt; /* option */ |
82 | const char *arg; /* argument */ |
82 | const char *arg; /* argument */ |
83 | const char *desc; /* description */ |
83 | const char *desc; /* description */ |
84 | } |
84 | } |
… | |
… | |
121 | #if TINTING |
121 | #if TINTING |
122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."), |
122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."), |
123 | #endif |
123 | #endif |
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
125 | #ifndef NO_BELL |
125 | #ifndef NO_BELL |
|
|
126 | # if ENABLE_FRILLS |
|
|
127 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
|
|
128 | # endif |
126 | BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), |
129 | BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), |
127 | # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) |
130 | # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) |
128 | BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), |
131 | BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), |
129 | # endif |
132 | # endif |
130 | #endif |
133 | #endif |
… | |
… | |
255 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
258 | 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 |
259 | 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 |
260 | 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"), |
261 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
259 | #endif |
262 | #endif |
|
|
263 | |
|
|
264 | #ifdef HAVE_AFTERIMAGE |
|
|
265 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
|
|
266 | STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"), |
|
|
267 | #endif |
260 | #ifndef NO_RESOURCES |
268 | #ifndef NO_RESOURCES |
261 | INFO ("xrm", "string", "X resource"), |
269 | INFO ("xrm", "string", "X resource"), |
262 | #endif |
270 | #endif |
263 | INFO ("e", "command arg ...", "command to execute") |
271 | INFO ("e", "command arg ...", "command to execute") |
264 | }; |
272 | }; |
… | |
… | |
549 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
557 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
550 | } |
558 | } |
551 | } |
559 | } |
552 | else |
560 | else |
553 | { /* boolean value */ |
561 | { /* boolean value */ |
554 | set_option (1UL << optList[entry].index, flag == resval_on); |
562 | set_option (optList[entry].index, flag == resval_on); |
555 | |
563 | |
556 | if (optList[entry].doff != -1) |
564 | if (optList[entry].doff != -1) |
557 | rs[optList[entry].doff] = flag; |
565 | rs[optList[entry].doff] = flag; |
558 | } |
566 | } |
559 | } |
567 | } |
… | |
… | |
827 | || strcasecmp (p, "1") == 0; |
835 | || strcasecmp (p, "1") == 0; |
828 | |
836 | |
829 | if (optList_isReverse (entry)) |
837 | if (optList_isReverse (entry)) |
830 | s = !s; |
838 | s = !s; |
831 | |
839 | |
832 | set_option (1UL << optList[entry].index, s); |
840 | set_option (optList[entry].index, s); |
833 | } |
841 | } |
834 | } |
842 | } |
835 | } |
843 | } |
836 | |
844 | |
837 | /* |
845 | /* |