… | |
… | |
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 <pcg@goof.com> |
|
|
10 | * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> |
10 | * |
11 | * |
11 | * 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 |
12 | * 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 |
13 | * the Free Software Foundation; either version 2 of the License, or |
14 | * the Free Software Foundation; either version 2 of the License, or |
14 | * (at your option) any later version. |
15 | * (at your option) any later version. |
… | |
… | |
62 | /* SWCH () - `-' flag */ |
63 | /* SWCH () - `-' flag */ |
63 | #define SWCH(opt, option, flag, desc) \ |
64 | #define SWCH(opt, option, flag, desc) \ |
64 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | |
66 | |
66 | /* convenient macros */ |
67 | /* convenient macros */ |
67 | #define optList_strlen(i) \ |
68 | #define optList_isString(i) \ |
68 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
69 | (optList[i].flag == 0) |
69 | #define optList_isBool(i) \ |
70 | #define optList_isBool(i) \ |
70 | (optList[i].flag & Optflag_Boolean) |
71 | (optList[i].flag & Optflag_Boolean) |
71 | #define optList_isReverse(i) \ |
72 | #define optList_isReverse(i) \ |
72 | (optList[i].flag & Optflag_Reverse) |
73 | (optList[i].flag & Optflag_Reverse) |
73 | #define optList_size \ |
74 | #define optList_size \ |
… | |
… | |
90 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
91 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
92 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
93 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
94 | 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"), |
95 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
96 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
97 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
98 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
99 | 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"), |
100 | #if HAVE_SCROLLBARS |
|
|
101 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
102 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
102 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
103 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
103 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
104 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
104 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
105 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
106 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
107 | #endif |
|
|
108 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
108 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
109 | 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"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
111 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
111 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
112 | #if ENABLE_TRANSPARENCY |
112 | #if ENABLE_TRANSPARENCY |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
113 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
114 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
114 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
116 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), |
116 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
117 | #endif |
117 | #endif |
118 | #if OFF_FOCUS_FADING |
118 | #if OFF_FOCUS_FADING |
119 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
119 | STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), |
120 | 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"), |
121 | #endif |
121 | #endif |
122 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
122 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
123 | #ifndef NO_BELL |
123 | #ifndef NO_BELL |
124 | # if ENABLE_FRILLS |
124 | # if ENABLE_FRILLS |
… | |
… | |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
173 | #if ENABLE_FRILLS |
173 | #if ENABLE_FRILLS |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
175 | #endif |
175 | #endif |
176 | #ifdef KEEP_SCROLLCOLOR |
|
|
177 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
176 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
|
|
177 | #ifdef RXVT_SCROLLBAR |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
179 | #endif /* KEEP_SCROLLCOLOR */ |
179 | #endif |
180 | #ifdef OPTION_HC |
180 | #ifdef OPTION_HC |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
182 | #endif |
182 | #endif |
183 | #ifndef NO_CURSORCOLOR |
183 | #ifndef NO_CURSORCOLOR |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
184 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
… | |
… | |
214 | #if ENABLE_XEMBED |
214 | #if ENABLE_XEMBED |
215 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
215 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
216 | #endif |
216 | #endif |
217 | #if XFT |
217 | #if XFT |
218 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
218 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
|
|
219 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
219 | #endif |
220 | #endif |
220 | #if ENABLE_FRILLS |
221 | #if ENABLE_FRILLS |
221 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
222 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
222 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
223 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
223 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
224 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
… | |
… | |
225 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
226 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
226 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
227 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
228 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
228 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
229 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
229 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
230 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
|
|
231 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
232 | #endif |
|
|
233 | #ifdef BUILTIN_GLYPHS |
230 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
234 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
231 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
232 | #endif |
235 | #endif |
233 | #ifdef POINTER_BLANK |
236 | #ifdef POINTER_BLANK |
234 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
237 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
235 | #endif |
238 | #endif |
236 | #ifndef NO_BACKSPACE_KEY |
239 | #ifndef NO_BACKSPACE_KEY |
237 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
240 | RSTRG (Rs_backspace_key, "backspacekey", "string"), |
238 | #endif |
241 | #endif |
239 | #ifndef NO_DELETE_KEY |
242 | #ifndef NO_DELETE_KEY |
240 | RSTRG (Rs_delete_key, "deletekey", "string"), |
243 | RSTRG (Rs_delete_key, "deletekey", "string"), |
241 | #endif |
244 | #endif |
242 | RSTRG (Rs_selectstyle, "selectstyle", "mode"), |
|
|
243 | #ifdef PRINTPIPE |
245 | #ifdef PRINTPIPE |
244 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
245 | #endif |
247 | #endif |
246 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
248 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
247 | #ifdef CUTCHAR_RESOURCE |
|
|
248 | RSTRG (Rs_cutchars, "cutchars", "string"), |
249 | RSTRG (Rs_cutchars, "cutchars", "string"), |
249 | #endif /* CUTCHAR_RESOURCE */ |
|
|
250 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
250 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
251 | #ifndef NO_SECONDARY_SCREEN |
251 | #ifndef NO_SECONDARY_SCREEN |
252 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
252 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
253 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
253 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
254 | #endif |
254 | #endif |
… | |
… | |
261 | #if ISO_14755 |
261 | #if ISO_14755 |
262 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
262 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
263 | #endif |
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", "HxV", "Gaussian Blur radii to apply to the root background"), |
266 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
|
|
267 | # if ENABLE_EWMH |
|
|
268 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to aplication icon image"), |
|
|
269 | # endif |
267 | #endif |
270 | #endif |
268 | INFO ("e", "command arg ...", "command to execute") |
271 | INFO ("e", "command arg ...", "command to execute") |
269 | }; |
272 | }; |
270 | |
273 | |
271 | #undef INFO |
274 | #undef INFO |
… | |
… | |
358 | "pointerBlank," |
361 | "pointerBlank," |
359 | #endif |
362 | #endif |
360 | #if defined(NO_RESOURCES) |
363 | #if defined(NO_RESOURCES) |
361 | "NoResources," |
364 | "NoResources," |
362 | #endif |
365 | #endif |
363 | "scrollbars=" |
366 | "scrollbars=plain" |
364 | #if !defined(HAVE_SCROLLBARS) |
|
|
365 | "NONE" |
|
|
366 | #else |
|
|
367 | # if defined(PLAIN_SCROLLBAR) |
|
|
368 | "plain" |
|
|
369 | # if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
370 | "+" |
|
|
371 | # endif |
|
|
372 | # endif |
|
|
373 | # if defined(RXVT_SCROLLBAR) |
367 | #if defined(RXVT_SCROLLBAR) |
374 | "rxvt" |
368 | "+rxvt" |
375 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
376 | "+" |
|
|
377 | # endif |
|
|
378 | # endif |
369 | #endif |
379 | # if defined(NEXT_SCROLLBAR) |
370 | #if defined(NEXT_SCROLLBAR) |
380 | "NeXT" |
371 | "+NeXT" |
381 | # if defined(XTERM_SCROLLBAR) |
|
|
382 | "+" |
|
|
383 | # endif |
|
|
384 | # endif |
372 | #endif |
385 | # if defined(XTERM_SCROLLBAR) |
373 | #if defined(XTERM_SCROLLBAR) |
386 | "xterm" |
374 | "+xterm" |
387 | # endif |
|
|
388 | #endif |
375 | #endif |
389 | "\nUsage: "; /* Usage */ |
376 | "\nUsage: "; /* Usage */ |
390 | |
377 | |
391 | #define INDENT 18 |
378 | #define INDENT 18 |
392 | |
379 | |
… | |
… | |
411 | for (col = 1, i = 0; i < optList_size; i++) |
398 | for (col = 1, i = 0; i < optList_size; i++) |
412 | if (optList[i].desc != NULL) |
399 | if (optList[i].desc != NULL) |
413 | { |
400 | { |
414 | int len = 0; |
401 | int len = 0; |
415 | |
402 | |
416 | if (!optList_isBool (i)) |
403 | if (optList[i].arg) |
417 | { |
404 | len = strlen (optList[i].arg) + 1; |
418 | len = optList_strlen (i); |
|
|
419 | if (len > 0) |
|
|
420 | len++; /* account for space */ |
|
|
421 | } |
|
|
422 | #ifdef DEBUG_STRICT |
405 | #ifdef DEBUG_STRICT |
423 | assert (optList[i].opt != NULL); |
406 | assert (optList[i].opt != NULL); |
424 | #endif |
407 | #endif |
425 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
408 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
426 | col += len; |
409 | col += len; |
427 | if (col > 79) |
410 | if (col > 79) |
|
|
411 | { |
428 | { /* assume regular width */ |
412 | /* assume regular width */ |
429 | rxvt_log ("\n"); |
413 | rxvt_log ("\n"); |
430 | col = 1 + len; |
414 | col = 1 + len; |
431 | } |
415 | } |
432 | |
416 | |
433 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
417 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
434 | if (optList_strlen (i)) |
418 | if (optList[i].arg) |
435 | rxvt_log (" %s]", optList[i].arg); |
419 | rxvt_log (" %s]", optList[i].arg); |
436 | else |
420 | else |
437 | rxvt_log ("]"); |
421 | rxvt_log ("]"); |
438 | } |
422 | } |
439 | break; |
423 | break; |
… | |
… | |
491 | int i, bad_option = 0; |
475 | int i, bad_option = 0; |
492 | |
476 | |
493 | for (i = 1; i < argc; i++) |
477 | for (i = 1; i < argc; i++) |
494 | { |
478 | { |
495 | unsigned int entry, longopt = 0; |
479 | unsigned int entry, longopt = 0; |
496 | const char *flag, *opt; |
480 | const char *opt; |
|
|
481 | int flag; |
497 | |
482 | |
498 | opt = argv[i]; |
483 | opt = argv[i]; |
499 | |
484 | |
500 | if (*opt == '-') |
485 | if (*opt == '-') |
501 | { |
486 | { |
502 | flag = resval_on; |
487 | flag = 1; |
503 | |
488 | |
504 | if (*++opt == '-') |
489 | if (*++opt == '-') |
505 | longopt = *opt++; /* long option */ |
490 | longopt = *opt++; /* long option */ |
506 | } |
491 | } |
507 | else if (*opt == '+') |
492 | else if (*opt == '+') |
508 | { |
493 | { |
509 | flag = resval_off; |
494 | flag = 0; |
510 | |
495 | |
511 | if (*++opt == '+') |
496 | if (*++opt == '+') |
512 | longopt = *opt++; /* long option */ |
497 | longopt = *opt++; /* long option */ |
513 | } |
498 | } |
514 | else |
499 | else |
… | |
… | |
532 | break; |
517 | break; |
533 | |
518 | |
534 | if (entry < optList_size) |
519 | if (entry < optList_size) |
535 | { |
520 | { |
536 | if (optList_isReverse (entry)) |
521 | if (optList_isReverse (entry)) |
537 | flag = flag == resval_on ? resval_off : resval_on; |
522 | flag = !flag; |
538 | |
523 | |
539 | if (optList_strlen (entry)) |
524 | if (optList_isString (entry)) |
540 | { |
525 | { |
541 | /* |
526 | /* |
542 | * special cases are handled in main.c:main () to allow |
527 | * special cases are handled in main.c:main () to allow |
543 | * X resources to set these values before we settle for |
528 | * X resources to set these values before we settle for |
544 | * default values |
529 | * default values |
545 | */ |
530 | */ |
546 | |
531 | |
547 | if (optList[entry].doff != -1) |
532 | if (optList[entry].doff != -1) |
548 | { |
533 | { |
549 | if (flag == resval_on && i+1 == argc) |
534 | if (flag && i+1 == argc) |
550 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
535 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
551 | |
536 | |
552 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
537 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
553 | } |
538 | } |
554 | } |
539 | } |
555 | else |
540 | else |
|
|
541 | { |
556 | { /* boolean value */ |
542 | /* boolean value */ |
557 | set_option (optList[entry].index, flag == resval_on); |
543 | set_option (optList[entry].index, flag); |
558 | |
544 | |
559 | if (optList[entry].doff != -1) |
545 | if (optList[entry].doff != -1) |
560 | rs[optList[entry].doff] = flag; |
546 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
561 | } |
547 | } |
562 | } |
548 | } |
563 | #ifndef NO_RESOURCES |
549 | #ifndef NO_RESOURCES |
564 | else if (!strcmp (opt, "xrm")) |
550 | else if (!strcmp (opt, "xrm")) |
565 | { |
551 | { |
… | |
… | |
622 | } |
608 | } |
623 | |
609 | |
624 | /* |
610 | /* |
625 | * look for something like this (XK_Delete) |
611 | * look for something like this (XK_Delete) |
626 | * rxvt*keysym.0xFFFF: "\177" |
612 | * rxvt*keysym.0xFFFF: "\177" |
627 | * |
|
|
628 | * arg will be |
|
|
629 | * NULL for ~/.Xdefaults and |
|
|
630 | * non-NULL for command-line options (need to allocate) |
|
|
631 | */ |
613 | */ |
632 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
633 | |
614 | |
634 | struct keysym_vocabulary_t |
615 | struct keysym_vocabulary_t |
635 | { |
616 | { |
636 | const char *name; |
617 | const char *name; |
637 | unsigned short len; |
618 | unsigned short len; |
638 | unsigned short value; |
619 | unsigned short value; |
639 | }; |
620 | }; |
640 | keysym_vocabulary_t keysym_vocabulary[] = |
621 | static const keysym_vocabulary_t keysym_vocabulary[] = |
641 | { |
622 | { |
642 | { "ISOLevel3", 9, Level3Mask }, |
623 | { "ISOLevel3", 9, Level3Mask }, |
643 | { "AppKeypad", 9, AppKeypadMask }, |
624 | { "AppKeypad", 9, AppKeypadMask }, |
644 | { "Control", 7, ControlMask }, |
625 | { "Control", 7, ControlMask }, |
645 | { "NumLock", 7, NumLockMask }, |
626 | { "NumLock", 7, NumLockMask }, |
… | |
… | |
667 | }; |
648 | }; |
668 | |
649 | |
669 | int |
650 | int |
670 | rxvt_term::parse_keysym (const char *str, const char *arg) |
651 | rxvt_term::parse_keysym (const char *str, const char *arg) |
671 | { |
652 | { |
672 | int n, sym; |
653 | int sym; |
673 | unsigned int state = 0; |
654 | unsigned int state = 0; |
674 | const char *pmodend = NULL; |
655 | const char *key = strrchr (str, '-'); |
675 | char *newarg = NULL; |
|
|
676 | char newargstr[NEWARGLIM]; |
|
|
677 | |
656 | |
678 | if (arg == NULL) |
657 | if (!key) |
679 | { |
658 | key = str; |
680 | n = sizeof ("keysym.") - 1; |
|
|
681 | if (strncmp (str, "keysym.", n)) |
|
|
682 | return 0; |
|
|
683 | |
|
|
684 | str += n; /* skip `keysym.' */ |
|
|
685 | if (!(pmodend = strchr (str, ':'))) |
|
|
686 | return -1; |
|
|
687 | } |
|
|
688 | else |
659 | else |
689 | pmodend = str + strlen(str); |
660 | key++; |
690 | |
661 | |
691 | for (--pmodend; str < pmodend; --pmodend) |
662 | // string or key is empty |
692 | if (*pmodend == '-') |
663 | if (*arg == '\0' || *key == '\0') |
693 | break; |
664 | return -1; |
694 | |
665 | |
|
|
666 | // parse modifiers |
695 | while (str < pmodend) |
667 | while (str < key) |
696 | { |
668 | { |
697 | unsigned int i; |
669 | unsigned int i; |
698 | |
670 | |
699 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
671 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
700 | { |
672 | { |
… | |
… | |
711 | |
683 | |
712 | if (*str == '-') |
684 | if (*str == '-') |
713 | ++str; |
685 | ++str; |
714 | } |
686 | } |
715 | |
687 | |
716 | /* some scanf () have trouble with a 0x prefix */ |
688 | // convert keysym name to keysym number |
717 | if (str[0] == '0' && toupper (str[1]) == 'X') |
689 | if ((sym = XStringToKeysym (str)) == None) |
718 | { |
690 | { |
719 | str += 2; |
691 | // fallback on hexadecimal parsing |
720 | |
692 | char *end; |
|
|
693 | sym = strtol (str, &end, 16); |
721 | if (arg) |
694 | if (*end) |
722 | { |
|
|
723 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
|
|
724 | return -1; |
|
|
725 | } |
|
|
726 | else |
|
|
727 | { |
|
|
728 | if (sscanf (str, "%x:", &sym) != 1) |
|
|
729 | return -1; |
|
|
730 | |
|
|
731 | /* cue to ':', it's there since sscanf () worked */ |
|
|
732 | strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); |
|
|
733 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
734 | newarg = newargstr; |
|
|
735 | } |
|
|
736 | } |
|
|
737 | else |
|
|
738 | { |
|
|
739 | /* |
|
|
740 | * convert keysym name to keysym number |
|
|
741 | */ |
|
|
742 | strncpy (newargstr, str, NEWARGLIM - 1); |
|
|
743 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
744 | |
|
|
745 | if (arg == NULL) |
|
|
746 | { |
|
|
747 | if ((newarg = strchr (newargstr, ':')) == NULL) |
|
|
748 | return -1; |
|
|
749 | |
|
|
750 | *newarg++ = '\0'; /* terminate keysym name */ |
|
|
751 | } |
|
|
752 | |
|
|
753 | if ((sym = XStringToKeysym (newargstr)) == None) |
|
|
754 | return -1; |
695 | return -1; |
755 | } |
696 | } |
756 | |
697 | |
757 | if (newarg == NULL) |
|
|
758 | { |
|
|
759 | strncpy (newargstr, arg, NEWARGLIM - 1); |
|
|
760 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
761 | newarg = newargstr; |
|
|
762 | } |
|
|
763 | |
|
|
764 | if (*newarg == '\0') |
|
|
765 | return -1; |
|
|
766 | |
|
|
767 | keyboard->register_user_translation (sym, state, newarg); |
698 | keyboard->register_user_translation (sym, state, arg); |
768 | return 1; |
699 | return 1; |
769 | } |
700 | } |
770 | |
701 | |
771 | # endif /* KEYSYM_RESOURCE */ |
702 | # endif /* KEYSYM_RESOURCE */ |
772 | #endif /* NO_RESOURCES */ |
703 | #endif /* NO_RESOURCES */ |