… | |
… | |
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 |
… | |
… | |
58 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
59 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
59 | { (option), (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), (Optflag_Boolean | (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) \ |
… | |
… | |
92 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
93 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
93 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
94 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
94 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
97 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
|
|
98 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
97 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
99 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
98 | #if HAVE_SCROLLBARS |
100 | #if HAVE_SCROLLBARS |
99 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
101 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
100 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
102 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
101 | 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 | #endif |
107 | #endif |
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
108 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
107 | 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"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
111 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
110 | #if TRANSPARENT |
112 | #if ENABLE_TRANSPARENCY |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
112 | SWCH ("tr", Opt_transparent, 0, NULL), |
114 | SWCH ("tr", Opt_transparent, 0, NULL), |
113 | # if TINTING |
|
|
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | # endif |
116 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), |
116 | #endif |
117 | #endif |
117 | #if OFF_FOCUS_FADING |
118 | #if OFF_FOCUS_FADING |
118 | 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"), |
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
120 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
120 | #endif |
|
|
121 | #if TINTING |
|
|
122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."), |
|
|
123 | #endif |
121 | #endif |
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
122 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
125 | #ifndef NO_BELL |
123 | #ifndef NO_BELL |
126 | # if ENABLE_FRILLS |
124 | # if ENABLE_FRILLS |
127 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
125 | BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL), |
… | |
… | |
188 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
189 | #endif /* NO_CURSORCOLOR */ |
187 | #endif /* NO_CURSORCOLOR */ |
190 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
191 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
192 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
193 | #ifdef XPM_BACKGROUND |
191 | #ifdef BG_IMAGE_FROM_FILE |
194 | RSTRG (Rs_path, "path", "search path"), |
192 | RSTRG (Rs_path, "path", "search path"), |
195 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
196 | #endif |
194 | #endif |
197 | /* fonts: command-line option = resource name */ |
195 | /* fonts: command-line option = resource name */ |
198 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
… | |
… | |
258 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
256 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),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_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
260 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
258 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
261 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
259 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
262 | #endif |
260 | #endif |
263 | |
261 | #if ISO_14755 |
|
|
262 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
|
|
263 | #endif |
264 | #ifdef HAVE_AFTERIMAGE |
264 | #ifdef HAVE_AFTERIMAGE |
265 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
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"), |
266 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
267 | #endif |
267 | #endif |
268 | #ifndef NO_RESOURCES |
268 | #ifndef NO_RESOURCES |
269 | INFO ("xrm", "string", "X resource"), |
269 | INFO ("xrm", "string", "X resource"), |
270 | #endif |
270 | #endif |
271 | INFO ("e", "command arg ...", "command to execute") |
271 | INFO ("e", "command arg ...", "command to execute") |
… | |
… | |
318 | #endif |
318 | #endif |
319 | "," |
319 | "," |
320 | #if OFF_FOCUS_FADING |
320 | #if OFF_FOCUS_FADING |
321 | "fade," |
321 | "fade," |
322 | #endif |
322 | #endif |
323 | #if defined(XPM_BACKGROUND) |
|
|
324 | "XPM," |
|
|
325 | #endif |
|
|
326 | #if defined(TRANSPARENT) |
323 | #if defined(ENABLE_TRANSPARENCY) |
327 | "transparent," |
324 | "transparent," |
328 | #endif |
|
|
329 | #if TINTING |
|
|
330 | "tint," |
325 | "tint," |
|
|
326 | #endif |
|
|
327 | #if HAVE_AFTERIMAGE |
|
|
328 | "afterimage," |
331 | #endif |
329 | #endif |
332 | #if defined(USE_XIM) |
330 | #if defined(USE_XIM) |
333 | "XIM," |
331 | "XIM," |
334 | #endif |
332 | #endif |
335 | #if defined(NO_BACKSPACE_KEY) |
333 | #if defined(NO_BACKSPACE_KEY) |
… | |
… | |
546 | /* |
544 | /* |
547 | * special cases are handled in main.c:main () to allow |
545 | * special cases are handled in main.c:main () to allow |
548 | * X resources to set these values before we settle for |
546 | * X resources to set these values before we settle for |
549 | * default values |
547 | * default values |
550 | */ |
548 | */ |
|
|
549 | |
551 | if (optList[entry].doff != -1) |
550 | if (optList[entry].doff != -1) |
552 | { |
551 | { |
553 | if (flag == resval_on && !argv [i+1]) |
552 | if (flag == resval_on && i+1 == argc) |
554 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
553 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
555 | |
554 | |
556 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
557 | } |
556 | } |
558 | } |
557 | } |
… | |
… | |
564 | rs[optList[entry].doff] = flag; |
563 | rs[optList[entry].doff] = flag; |
565 | } |
564 | } |
566 | } |
565 | } |
567 | else |
566 | else |
568 | #ifdef KEYSYM_RESOURCE |
567 | #ifdef KEYSYM_RESOURCE |
569 | /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ |
568 | if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
570 | if (rxvt_Str_match (opt, "keysym.")) |
|
|
571 | { |
569 | { |
572 | const char *str = argv[++i]; |
570 | if (i+1 < argc) |
573 | |
|
|
574 | if (str != NULL) |
|
|
575 | parse_keysym (opt + sizeof ("keysym.") - 1, str); |
571 | parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); |
576 | } |
572 | } |
577 | else |
573 | else |
578 | #endif |
574 | #endif |
579 | { |
575 | { |
580 | bad_option = 1; |
576 | bad_option = 1; |
… | |
… | |
671 | char *newarg = NULL; |
667 | char *newarg = NULL; |
672 | char newargstr[NEWARGLIM]; |
668 | char newargstr[NEWARGLIM]; |
673 | |
669 | |
674 | if (arg == NULL) |
670 | if (arg == NULL) |
675 | { |
671 | { |
676 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
672 | n = sizeof ("keysym.") - 1; |
|
|
673 | if (strncmp (str, "keysym.", n)) |
677 | return 0; |
674 | return 0; |
678 | |
675 | |
679 | str += n; /* skip `keysym.' */ |
676 | str += n; /* skip `keysym.' */ |
680 | if (!(pmodend = strchr (str, ':'))) |
677 | if (!(pmodend = strchr (str, ':'))) |
681 | return -1; |
678 | return -1; |
… | |
… | |
754 | strncpy (newargstr, arg, NEWARGLIM - 1); |
751 | strncpy (newargstr, arg, NEWARGLIM - 1); |
755 | newargstr[NEWARGLIM - 1] = '\0'; |
752 | newargstr[NEWARGLIM - 1] = '\0'; |
756 | newarg = newargstr; |
753 | newarg = newargstr; |
757 | } |
754 | } |
758 | |
755 | |
759 | rxvt_Str_trim (newarg); |
756 | if (*newarg == '\0') |
760 | if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) |
|
|
761 | return -1; |
757 | return -1; |
762 | |
758 | |
763 | keyboard->register_user_translation (sym, state, newarg); |
759 | keyboard->register_user_translation (sym, state, newarg); |
764 | return 1; |
760 | return 1; |
765 | } |
761 | } |