… | |
… | |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
|
|
96 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
96 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
101 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
… | |
… | |
111 | #if ENABLE_TRANSPARENCY |
112 | #if ENABLE_TRANSPARENCY |
112 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
114 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
116 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
|
|
117 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
116 | #endif |
118 | #endif |
117 | #if OFF_FOCUS_FADING |
119 | #if OFF_FOCUS_FADING |
118 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
120 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
121 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
120 | #endif |
122 | #endif |
… | |
… | |
176 | #ifdef RXVT_SCROLLBAR |
178 | #ifdef RXVT_SCROLLBAR |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | #endif |
180 | #endif |
179 | #ifdef OPTION_HC |
181 | #ifdef OPTION_HC |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
182 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
|
|
183 | RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"), |
181 | #endif |
184 | #endif |
182 | #ifndef NO_CURSORCOLOR |
185 | #ifndef NO_CURSORCOLOR |
183 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
186 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | /* command-line option = resource name */ |
187 | /* command-line option = resource name */ |
185 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
188 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
… | |
… | |
188 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
191 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
189 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
192 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | #ifdef BG_IMAGE_FROM_FILE |
193 | #ifdef BG_IMAGE_FROM_FILE |
191 | RSTRG (Rs_path, "path", "search path"), |
194 | RSTRG (Rs_path, "path", "search path"), |
192 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
195 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
196 | # if ENABLE_EWMH |
|
|
197 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
198 | # endif |
193 | #endif |
199 | #endif |
194 | /* fonts: command-line option = resource name */ |
200 | /* fonts: command-line option = resource name */ |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
201 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | #if ENABLE_STYLES |
202 | #if ENABLE_STYLES |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
203 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
226 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
232 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
233 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
228 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
234 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
229 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
235 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
230 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
236 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
237 | STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), |
231 | #endif |
238 | #endif |
232 | #ifdef BUILTIN_GLYPHS |
239 | #ifdef BUILTIN_GLYPHS |
233 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
240 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
234 | #endif |
241 | #endif |
235 | #ifdef POINTER_BLANK |
242 | #ifdef POINTER_BLANK |
… | |
… | |
243 | #endif |
250 | #endif |
244 | #ifdef PRINTPIPE |
251 | #ifdef PRINTPIPE |
245 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
252 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
246 | #endif |
253 | #endif |
247 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
254 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
248 | #ifdef CUTCHAR_RESOURCE |
|
|
249 | RSTRG (Rs_cutchars, "cutchars", "string"), |
255 | RSTRG (Rs_cutchars, "cutchars", "string"), |
250 | #endif /* CUTCHAR_RESOURCE */ |
|
|
251 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
256 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
252 | #ifndef NO_SECONDARY_SCREEN |
257 | #ifndef NO_SECONDARY_SCREEN |
253 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
258 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
254 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
259 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
255 | #endif |
260 | #endif |
… | |
… | |
258 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
263 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
259 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
264 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
260 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
265 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
261 | #endif |
266 | #endif |
262 | #if ISO_14755 |
267 | #if ISO_14755 |
|
|
268 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
263 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
269 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
264 | #endif |
270 | #endif |
265 | #ifdef HAVE_AFTERIMAGE |
271 | #ifdef HAVE_AFTERIMAGE |
266 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
272 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
267 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
|
|
268 | #endif |
273 | #endif |
269 | INFO ("e", "command arg ...", "command to execute") |
274 | INFO ("e", "command arg ...", "command to execute") |
270 | }; |
275 | }; |
271 | |
276 | |
272 | #undef INFO |
277 | #undef INFO |
… | |
… | |
398 | { |
403 | { |
399 | int len = 0; |
404 | int len = 0; |
400 | |
405 | |
401 | if (optList[i].arg) |
406 | if (optList[i].arg) |
402 | len = strlen (optList[i].arg) + 1; |
407 | len = strlen (optList[i].arg) + 1; |
403 | #ifdef DEBUG_STRICT |
|
|
404 | assert (optList[i].opt != NULL); |
408 | assert (optList[i].opt != NULL); |
405 | #endif |
|
|
406 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
409 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
407 | col += len; |
410 | col += len; |
408 | if (col > 79) |
411 | if (col > 79) |
409 | { |
412 | { |
410 | /* assume regular width */ |
413 | /* assume regular width */ |
… | |
… | |
424 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
427 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
425 | |
428 | |
426 | for (i = 0; i < optList_size; i++) |
429 | for (i = 0; i < optList_size; i++) |
427 | if (optList[i].desc != NULL) |
430 | if (optList[i].desc != NULL) |
428 | { |
431 | { |
429 | #ifdef DEBUG_STRICT |
|
|
430 | assert (optList[i].opt != NULL); |
432 | assert (optList[i].opt != NULL); |
431 | #endif |
|
|
432 | rxvt_log (" %s%s %-*s%s%s\n", |
433 | rxvt_log (" %s%s %-*s%s%s\n", |
433 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
434 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
434 | (INDENT - strlen (optList[i].opt) |
435 | (INDENT - strlen (optList[i].opt) |
435 | + (optList_isBool (i) ? 0 : 2)), |
436 | + (optList_isBool (i) ? 0 : 2)), |
436 | (optList[i].arg ? optList[i].arg : ""), |
437 | (optList[i].arg ? optList[i].arg : ""), |
… | |
… | |
554 | #ifdef KEYSYM_RESOURCE |
555 | #ifdef KEYSYM_RESOURCE |
555 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
556 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
556 | { |
557 | { |
557 | if (i+1 < argc) |
558 | if (i+1 < argc) |
558 | { |
559 | { |
559 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
560 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
560 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
561 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
561 | XrmPutLineResource (&option_db, res); |
562 | XrmPutLineResource (&option_db, res); |
562 | free (res); |
|
|
563 | } |
563 | } |
564 | } |
564 | } |
565 | #endif |
565 | #endif |
566 | else |
566 | else |
567 | { |
567 | { |
… | |
… | |
689 | // fallback on hexadecimal parsing |
689 | // fallback on hexadecimal parsing |
690 | char *end; |
690 | char *end; |
691 | sym = strtol (str, &end, 16); |
691 | sym = strtol (str, &end, 16); |
692 | if (*end) |
692 | if (*end) |
693 | return -1; |
693 | return -1; |
694 | } |
694 | } |
695 | |
695 | |
696 | keyboard->register_user_translation (sym, state, arg); |
696 | keyboard->register_user_translation (sym, state, arg); |
697 | return 1; |
697 | return 1; |
698 | } |
698 | } |
699 | |
699 | |