… | |
… | |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
6 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
7 | * - original version |
7 | * - original version |
8 | * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> |
8 | * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de> |
10 | * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> |
10 | * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> |
11 | * |
11 | * |
12 | * This program is free software; you can redistribute it and/or modify |
12 | * This program is free software; you can redistribute it and/or modify |
13 | * it under the terms of the GNU General Public License as published by |
13 | * it under the terms of the GNU General Public License as published by |
14 | * the Free Software Foundation; either version 2 of the License, or |
14 | * the Free Software Foundation; either version 2 of the License, or |
… | |
… | |
69 | (optList[i].flag == 0) |
69 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
70 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
71 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
72 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
73 | (optList[i].flag & Optflag_Reverse) |
74 | #define optList_size \ |
|
|
75 | (sizeof (optList) / sizeof (optList[0])) |
|
|
76 | |
74 | |
77 | static const struct |
75 | static const struct |
78 | { |
76 | { |
79 | const uint8_t index; /* Option index */ |
77 | const uint8_t index; /* Option index */ |
80 | const uint8_t flag; /* Option flag */ |
78 | const uint8_t flag; /* Option flag */ |
… | |
… | |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
89 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
90 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
91 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
92 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
93 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
|
|
94 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
96 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
97 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
98 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | 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"), |
101 | #if HAVE_SCROLLBARS |
|
|
102 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
100 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
103 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
101 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
104 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
102 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
103 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
104 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
105 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
108 | #endif |
|
|
109 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
111 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
112 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
113 | #if ENABLE_TRANSPARENCY |
110 | #if ENABLE_TRANSPARENCY |
114 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
115 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
112 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
116 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
113 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
117 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
114 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
|
|
115 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
118 | #endif |
116 | #endif |
119 | #if OFF_FOCUS_FADING |
117 | #if OFF_FOCUS_FADING |
120 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
118 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
121 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
122 | #endif |
120 | #endif |
… | |
… | |
172 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
170 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
173 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
171 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
174 | #if ENABLE_FRILLS |
172 | #if ENABLE_FRILLS |
175 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
173 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
176 | #endif |
174 | #endif |
177 | #ifdef KEEP_SCROLLCOLOR |
|
|
178 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
175 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
|
|
176 | #ifdef RXVT_SCROLLBAR |
179 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
177 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
180 | #endif /* KEEP_SCROLLCOLOR */ |
178 | #endif |
181 | #ifdef OPTION_HC |
179 | #ifdef OPTION_HC |
182 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
180 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
|
|
181 | RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"), |
183 | #endif |
182 | #endif |
184 | #ifndef NO_CURSORCOLOR |
183 | #ifndef NO_CURSORCOLOR |
185 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
186 | /* command-line option = resource name */ |
185 | /* command-line option = resource name */ |
187 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
… | |
… | |
190 | 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"), |
191 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
192 | #ifdef BG_IMAGE_FROM_FILE |
191 | #ifdef BG_IMAGE_FROM_FILE |
193 | RSTRG (Rs_path, "path", "search path"), |
192 | RSTRG (Rs_path, "path", "search path"), |
194 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
194 | # if ENABLE_EWMH |
|
|
195 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
196 | # endif |
195 | #endif |
197 | #endif |
196 | /* fonts: command-line option = resource name */ |
198 | /* fonts: command-line option = resource name */ |
197 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
199 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
198 | #if ENABLE_STYLES |
200 | #if ENABLE_STYLES |
199 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
201 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
228 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
230 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
229 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
231 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
230 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
232 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
231 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
233 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
232 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
234 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
235 | STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), |
233 | #endif |
236 | #endif |
234 | #ifdef BUILTIN_GLYPHS |
237 | #ifdef BUILTIN_GLYPHS |
235 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
238 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
236 | #endif |
239 | #endif |
237 | #ifdef POINTER_BLANK |
240 | #ifdef POINTER_BLANK |
… | |
… | |
245 | #endif |
248 | #endif |
246 | #ifdef PRINTPIPE |
249 | #ifdef PRINTPIPE |
247 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
250 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
248 | #endif |
251 | #endif |
249 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
252 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
250 | #ifdef CUTCHAR_RESOURCE |
|
|
251 | RSTRG (Rs_cutchars, "cutchars", "string"), |
253 | RSTRG (Rs_cutchars, "cutchars", "string"), |
252 | #endif /* CUTCHAR_RESOURCE */ |
|
|
253 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
254 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
254 | #ifndef NO_SECONDARY_SCREEN |
255 | #ifndef NO_SECONDARY_SCREEN |
255 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
256 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
256 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
257 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
257 | #endif |
258 | #endif |
… | |
… | |
260 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
261 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
261 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
262 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
262 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
263 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
263 | #endif |
264 | #endif |
264 | #if ISO_14755 |
265 | #if ISO_14755 |
|
|
266 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
265 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
267 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
266 | #endif |
268 | #endif |
267 | #ifdef HAVE_AFTERIMAGE |
269 | #ifdef HAVE_AFTERIMAGE |
268 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
270 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
269 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
|
|
270 | #endif |
271 | #endif |
271 | INFO ("e", "command arg ...", "command to execute") |
272 | INFO ("e", "command arg ...", "command to execute") |
272 | }; |
273 | }; |
273 | |
274 | |
274 | #undef INFO |
275 | #undef INFO |
… | |
… | |
325 | "tint," |
326 | "tint," |
326 | #endif |
327 | #endif |
327 | #if HAVE_AFTERIMAGE |
328 | #if HAVE_AFTERIMAGE |
328 | "afterimage," |
329 | "afterimage," |
329 | #endif |
330 | #endif |
|
|
331 | #if HAVE_PIXBUF |
|
|
332 | "pixbuf," |
|
|
333 | #endif |
330 | #if defined(USE_XIM) |
334 | #if defined(USE_XIM) |
331 | "XIM," |
335 | "XIM," |
332 | #endif |
336 | #endif |
333 | #if defined(NO_BACKSPACE_KEY) |
337 | #if defined(NO_BACKSPACE_KEY) |
334 | "no_backspace," |
338 | "no_backspace," |
… | |
… | |
361 | "pointerBlank," |
365 | "pointerBlank," |
362 | #endif |
366 | #endif |
363 | #if defined(NO_RESOURCES) |
367 | #if defined(NO_RESOURCES) |
364 | "NoResources," |
368 | "NoResources," |
365 | #endif |
369 | #endif |
366 | "scrollbars=" |
370 | "scrollbars=plain" |
367 | #if !defined(HAVE_SCROLLBARS) |
|
|
368 | "NONE" |
|
|
369 | #else |
|
|
370 | # if defined(PLAIN_SCROLLBAR) |
|
|
371 | "plain" |
|
|
372 | # if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
373 | "+" |
|
|
374 | # endif |
|
|
375 | # endif |
|
|
376 | # if defined(RXVT_SCROLLBAR) |
371 | #if defined(RXVT_SCROLLBAR) |
377 | "rxvt" |
372 | "+rxvt" |
378 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
379 | "+" |
|
|
380 | # endif |
|
|
381 | # endif |
373 | #endif |
382 | # if defined(NEXT_SCROLLBAR) |
374 | #if defined(NEXT_SCROLLBAR) |
383 | "NeXT" |
375 | "+NeXT" |
384 | # if defined(XTERM_SCROLLBAR) |
|
|
385 | "+" |
|
|
386 | # endif |
|
|
387 | # endif |
376 | #endif |
388 | # if defined(XTERM_SCROLLBAR) |
377 | #if defined(XTERM_SCROLLBAR) |
389 | "xterm" |
378 | "+xterm" |
390 | # endif |
|
|
391 | #endif |
379 | #endif |
392 | "\nUsage: "; /* Usage */ |
380 | "\nUsage: "; /* Usage */ |
393 | |
381 | |
394 | #define INDENT 18 |
382 | #define INDENT 18 |
395 | |
383 | |
… | |
… | |
409 | switch (type) |
397 | switch (type) |
410 | { |
398 | { |
411 | case 0: /* brief listing */ |
399 | case 0: /* brief listing */ |
412 | rxvt_log (" [-help] [--help]\n"); |
400 | rxvt_log (" [-help] [--help]\n"); |
413 | |
401 | |
414 | for (col = 1, i = 0; i < optList_size; i++) |
402 | for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) |
415 | if (optList[i].desc != NULL) |
403 | if (optList[i].desc != NULL) |
416 | { |
404 | { |
417 | int len = 0; |
405 | int len = 0; |
418 | |
406 | |
419 | if (optList[i].arg) |
407 | if (optList[i].arg) |
420 | len = strlen (optList[i].arg) + 1; |
408 | len = strlen (optList[i].arg) + 1; |
421 | #ifdef DEBUG_STRICT |
|
|
422 | assert (optList[i].opt != NULL); |
409 | assert (optList[i].opt != NULL); |
423 | #endif |
|
|
424 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
410 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
425 | col += len; |
411 | col += len; |
426 | if (col > 79) |
412 | if (col > 79) |
427 | { |
413 | { |
428 | /* assume regular width */ |
414 | /* assume regular width */ |
… | |
… | |
439 | break; |
425 | break; |
440 | |
426 | |
441 | case 1: /* full command-line listing */ |
427 | case 1: /* full command-line listing */ |
442 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
428 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
443 | |
429 | |
444 | for (i = 0; i < optList_size; i++) |
430 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
445 | if (optList[i].desc != NULL) |
431 | if (optList[i].desc != NULL) |
446 | { |
432 | { |
447 | #ifdef DEBUG_STRICT |
|
|
448 | assert (optList[i].opt != NULL); |
433 | assert (optList[i].opt != NULL); |
449 | #endif |
|
|
450 | rxvt_log (" %s%s %-*s%s%s\n", |
434 | rxvt_log (" %s%s %-*s%s%s\n", |
451 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
452 | (INDENT - strlen (optList[i].opt) |
436 | (INDENT - strlen (optList[i].opt) |
453 | + (optList_isBool (i) ? 0 : 2)), |
437 | + (optList_isBool (i) ? 0 : 2)), |
454 | (optList[i].arg ? optList[i].arg : ""), |
438 | (optList[i].arg ? optList[i].arg : ""), |
… | |
… | |
460 | |
444 | |
461 | case 2: /* full resource listing */ |
445 | case 2: /* full resource listing */ |
462 | rxvt_log (" [options] [-e command args]\n\n" |
446 | rxvt_log (" [options] [-e command args]\n\n" |
463 | "where resources (long-options) include:\n"); |
447 | "where resources (long-options) include:\n"); |
464 | |
448 | |
465 | for (i = 0; i < optList_size; i++) |
449 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
466 | if (optList[i].kw != NULL) |
450 | if (optList[i].kw != NULL) |
467 | rxvt_log (" %s: %*s%s\n", |
451 | rxvt_log (" %s: %*s%s\n", |
468 | optList[i].kw, |
452 | optList[i].kw, |
469 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
470 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
… | |
… | |
524 | |
508 | |
525 | if (!strcmp (opt, "h")) |
509 | if (!strcmp (opt, "h")) |
526 | rxvt_usage (0); |
510 | rxvt_usage (0); |
527 | |
511 | |
528 | /* feature: always try to match long-options */ |
512 | /* feature: always try to match long-options */ |
529 | for (entry = 0; entry < optList_size; entry++) |
513 | for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
530 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
514 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
531 | || (!longopt |
515 | || (!longopt |
532 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
516 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
533 | break; |
517 | break; |
534 | |
518 | |
535 | if (entry < optList_size) |
519 | if (entry < ARRAY_LENGTH(optList)) |
536 | { |
520 | { |
537 | if (optList_isReverse (entry)) |
521 | if (optList_isReverse (entry)) |
538 | flag = !flag; |
522 | flag = !flag; |
539 | |
523 | |
540 | if (optList_isString (entry)) |
524 | if (optList_isString (entry)) |
… | |
… | |
572 | #ifdef KEYSYM_RESOURCE |
556 | #ifdef KEYSYM_RESOURCE |
573 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
557 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
574 | { |
558 | { |
575 | if (i+1 < argc) |
559 | if (i+1 < argc) |
576 | { |
560 | { |
577 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
561 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
578 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
562 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
579 | XrmPutLineResource (&option_db, res); |
563 | XrmPutLineResource (&option_db, res); |
580 | free (res); |
|
|
581 | } |
564 | } |
582 | } |
565 | } |
583 | #endif |
566 | #endif |
584 | else |
567 | else |
585 | { |
568 | { |
… | |
… | |
682 | // parse modifiers |
665 | // parse modifiers |
683 | while (str < key) |
666 | while (str < key) |
684 | { |
667 | { |
685 | unsigned int i; |
668 | unsigned int i; |
686 | |
669 | |
687 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
670 | for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) |
688 | { |
671 | { |
689 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
672 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
690 | { |
673 | { |
691 | state |= keysym_vocabulary[i].value; |
674 | state |= keysym_vocabulary[i].value; |
692 | str += keysym_vocabulary[i].len; |
675 | str += keysym_vocabulary[i].len; |
693 | break; |
676 | break; |
694 | } |
677 | } |
695 | } |
678 | } |
696 | |
679 | |
697 | if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) |
680 | if (i >= ARRAY_LENGTH(keysym_vocabulary)) |
698 | return -1; |
681 | return -1; |
699 | |
682 | |
700 | if (*str == '-') |
683 | if (*str == '-') |
701 | ++str; |
684 | ++str; |
702 | } |
685 | } |
… | |
… | |
707 | // fallback on hexadecimal parsing |
690 | // fallback on hexadecimal parsing |
708 | char *end; |
691 | char *end; |
709 | sym = strtol (str, &end, 16); |
692 | sym = strtol (str, &end, 16); |
710 | if (*end) |
693 | if (*end) |
711 | return -1; |
694 | return -1; |
712 | } |
695 | } |
713 | |
696 | |
714 | keyboard->register_user_translation (sym, state, arg); |
697 | keyboard->register_user_translation (sym, state, arg); |
715 | return 1; |
698 | return 1; |
716 | } |
699 | } |
717 | |
700 | |
… | |
… | |
762 | XrmMergeDatabases (option_db, &database); |
745 | XrmMergeDatabases (option_db, &database); |
763 | option_db = NULL; |
746 | option_db = NULL; |
764 | /* |
747 | /* |
765 | * Query resources for options that affect us |
748 | * Query resources for options that affect us |
766 | */ |
749 | */ |
767 | for (int entry = 0; entry < optList_size; entry++) |
750 | for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
768 | { |
751 | { |
769 | int s; |
752 | int s; |
770 | const char *kw = optList[entry].kw; |
753 | const char *kw = optList[entry].kw; |
771 | |
754 | |
772 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
755 | if (kw == NULL || rs[optList[entry].doff] != NULL) |