… | |
… | |
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 |
… | |
… | |
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 | #endif |
267 | #endif |
268 | #ifndef NO_RESOURCES |
|
|
269 | INFO ("xrm", "string", "X resource"), |
|
|
270 | #endif |
|
|
271 | INFO ("e", "command arg ...", "command to execute") |
268 | INFO ("e", "command arg ...", "command to execute") |
272 | }; |
269 | }; |
273 | |
270 | |
274 | #undef INFO |
271 | #undef INFO |
275 | #undef STRG |
272 | #undef STRG |
… | |
… | |
361 | "pointerBlank," |
358 | "pointerBlank," |
362 | #endif |
359 | #endif |
363 | #if defined(NO_RESOURCES) |
360 | #if defined(NO_RESOURCES) |
364 | "NoResources," |
361 | "NoResources," |
365 | #endif |
362 | #endif |
366 | "scrollbars=" |
363 | "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) |
364 | #if defined(RXVT_SCROLLBAR) |
377 | "rxvt" |
365 | "+rxvt" |
378 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
379 | "+" |
|
|
380 | # endif |
|
|
381 | # endif |
366 | #endif |
382 | # if defined(NEXT_SCROLLBAR) |
367 | #if defined(NEXT_SCROLLBAR) |
383 | "NeXT" |
368 | "+NeXT" |
384 | # if defined(XTERM_SCROLLBAR) |
|
|
385 | "+" |
|
|
386 | # endif |
|
|
387 | # endif |
369 | #endif |
388 | # if defined(XTERM_SCROLLBAR) |
370 | #if defined(XTERM_SCROLLBAR) |
389 | "xterm" |
371 | "+xterm" |
390 | # endif |
|
|
391 | #endif |
372 | #endif |
392 | "\nUsage: "; /* Usage */ |
373 | "\nUsage: "; /* Usage */ |
393 | |
374 | |
394 | #define INDENT 18 |
375 | #define INDENT 18 |
395 | |
376 | |
… | |
… | |
414 | for (col = 1, i = 0; i < optList_size; i++) |
395 | for (col = 1, i = 0; i < optList_size; i++) |
415 | if (optList[i].desc != NULL) |
396 | if (optList[i].desc != NULL) |
416 | { |
397 | { |
417 | int len = 0; |
398 | int len = 0; |
418 | |
399 | |
419 | if (!optList_isBool (i)) |
400 | if (optList[i].arg) |
420 | { |
401 | len = strlen (optList[i].arg) + 1; |
421 | len = optList_strlen (i); |
|
|
422 | if (len > 0) |
|
|
423 | len++; /* account for space */ |
|
|
424 | } |
|
|
425 | #ifdef DEBUG_STRICT |
402 | #ifdef DEBUG_STRICT |
426 | assert (optList[i].opt != NULL); |
403 | assert (optList[i].opt != NULL); |
427 | #endif |
404 | #endif |
428 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
405 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
429 | col += len; |
406 | col += len; |
430 | if (col > 79) |
407 | if (col > 79) |
|
|
408 | { |
431 | { /* assume regular width */ |
409 | /* assume regular width */ |
432 | rxvt_log ("\n"); |
410 | rxvt_log ("\n"); |
433 | col = 1 + len; |
411 | col = 1 + len; |
434 | } |
412 | } |
435 | |
413 | |
436 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
414 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
437 | if (optList_strlen (i)) |
415 | if (optList[i].arg) |
438 | rxvt_log (" %s]", optList[i].arg); |
416 | rxvt_log (" %s]", optList[i].arg); |
439 | else |
417 | else |
440 | rxvt_log ("]"); |
418 | rxvt_log ("]"); |
441 | } |
419 | } |
442 | break; |
420 | break; |
… | |
… | |
494 | int i, bad_option = 0; |
472 | int i, bad_option = 0; |
495 | |
473 | |
496 | for (i = 1; i < argc; i++) |
474 | for (i = 1; i < argc; i++) |
497 | { |
475 | { |
498 | unsigned int entry, longopt = 0; |
476 | unsigned int entry, longopt = 0; |
499 | const char *flag, *opt; |
477 | const char *opt; |
|
|
478 | int flag; |
500 | |
479 | |
501 | opt = argv[i]; |
480 | opt = argv[i]; |
502 | |
481 | |
503 | if (*opt == '-') |
482 | if (*opt == '-') |
504 | { |
483 | { |
505 | flag = resval_on; |
484 | flag = 1; |
506 | |
485 | |
507 | if (*++opt == '-') |
486 | if (*++opt == '-') |
508 | longopt = *opt++; /* long option */ |
487 | longopt = *opt++; /* long option */ |
509 | } |
488 | } |
510 | else if (*opt == '+') |
489 | else if (*opt == '+') |
511 | { |
490 | { |
512 | flag = resval_off; |
491 | flag = 0; |
513 | |
492 | |
514 | if (*++opt == '+') |
493 | if (*++opt == '+') |
515 | longopt = *opt++; /* long option */ |
494 | longopt = *opt++; /* long option */ |
516 | } |
495 | } |
517 | else |
496 | else |
… | |
… | |
535 | break; |
514 | break; |
536 | |
515 | |
537 | if (entry < optList_size) |
516 | if (entry < optList_size) |
538 | { |
517 | { |
539 | if (optList_isReverse (entry)) |
518 | if (optList_isReverse (entry)) |
540 | flag = flag == resval_on ? resval_off : resval_on; |
519 | flag = !flag; |
541 | |
520 | |
542 | if (optList_strlen (entry)) |
521 | if (optList_isString (entry)) |
543 | { |
522 | { |
544 | /* |
523 | /* |
545 | * special cases are handled in main.c:main () to allow |
524 | * special cases are handled in main.c:main () to allow |
546 | * X resources to set these values before we settle for |
525 | * X resources to set these values before we settle for |
547 | * default values |
526 | * default values |
548 | */ |
527 | */ |
549 | |
528 | |
550 | if (optList[entry].doff != -1) |
529 | if (optList[entry].doff != -1) |
551 | { |
530 | { |
552 | if (flag == resval_on && i+1 == argc) |
531 | if (flag && i+1 == argc) |
553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
532 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
554 | |
533 | |
555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
534 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
556 | } |
535 | } |
557 | } |
536 | } |
558 | else |
537 | else |
|
|
538 | { |
559 | { /* boolean value */ |
539 | /* boolean value */ |
560 | set_option (optList[entry].index, flag == resval_on); |
540 | set_option (optList[entry].index, flag); |
561 | |
541 | |
562 | if (optList[entry].doff != -1) |
542 | if (optList[entry].doff != -1) |
563 | rs[optList[entry].doff] = flag; |
543 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
564 | } |
544 | } |
565 | } |
545 | } |
|
|
546 | #ifndef NO_RESOURCES |
|
|
547 | else if (!strcmp (opt, "xrm")) |
|
|
548 | { |
|
|
549 | if (i+1 < argc) |
|
|
550 | XrmPutLineResource (&option_db, argv[++i]); |
|
|
551 | } |
|
|
552 | #endif |
566 | #ifdef KEYSYM_RESOURCE |
553 | #ifdef KEYSYM_RESOURCE |
567 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
554 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
568 | { |
555 | { |
569 | if (i+1 < argc) |
556 | if (i+1 < argc) |
570 | parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]); |
557 | { |
|
|
558 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
|
|
559 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
|
|
560 | XrmPutLineResource (&option_db, res); |
|
|
561 | free (res); |
|
|
562 | } |
571 | } |
563 | } |
572 | #endif |
564 | #endif |
573 | else |
565 | else |
574 | { |
566 | { |
575 | bad_option = 1; |
567 | bad_option = 1; |
… | |
… | |
613 | } |
605 | } |
614 | |
606 | |
615 | /* |
607 | /* |
616 | * look for something like this (XK_Delete) |
608 | * look for something like this (XK_Delete) |
617 | * rxvt*keysym.0xFFFF: "\177" |
609 | * rxvt*keysym.0xFFFF: "\177" |
618 | * |
|
|
619 | * arg will be |
|
|
620 | * NULL for ~/.Xdefaults and |
|
|
621 | * non-NULL for command-line options (need to allocate) |
|
|
622 | */ |
610 | */ |
623 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
624 | |
611 | |
625 | struct keysym_vocabulary_t |
612 | struct keysym_vocabulary_t |
626 | { |
613 | { |
627 | const char *name; |
614 | const char *name; |
628 | unsigned short len; |
615 | unsigned short len; |
629 | unsigned short value; |
616 | unsigned short value; |
630 | }; |
617 | }; |
631 | keysym_vocabulary_t keysym_vocabulary[] = |
618 | static const keysym_vocabulary_t keysym_vocabulary[] = |
632 | { |
619 | { |
633 | { "ISOLevel3", 9, Level3Mask }, |
620 | { "ISOLevel3", 9, Level3Mask }, |
634 | { "AppKeypad", 9, AppKeypadMask }, |
621 | { "AppKeypad", 9, AppKeypadMask }, |
635 | { "Control", 7, ControlMask }, |
622 | { "Control", 7, ControlMask }, |
636 | { "NumLock", 7, NumLockMask }, |
623 | { "NumLock", 7, NumLockMask }, |
… | |
… | |
658 | }; |
645 | }; |
659 | |
646 | |
660 | int |
647 | int |
661 | rxvt_term::parse_keysym (const char *str, const char *arg) |
648 | rxvt_term::parse_keysym (const char *str, const char *arg) |
662 | { |
649 | { |
663 | int n, sym; |
650 | int sym; |
664 | unsigned int state = 0; |
651 | unsigned int state = 0; |
665 | const char *pmodend = NULL; |
652 | const char *key = strrchr (str, '-'); |
666 | char *newarg = NULL; |
|
|
667 | char newargstr[NEWARGLIM]; |
|
|
668 | |
653 | |
669 | if (arg == NULL) |
654 | if (!key) |
670 | { |
655 | key = str; |
671 | n = sizeof ("keysym.") - 1; |
|
|
672 | if (strncmp (str, "keysym.", n)) |
|
|
673 | return 0; |
|
|
674 | |
|
|
675 | str += n; /* skip `keysym.' */ |
|
|
676 | if (!(pmodend = strchr (str, ':'))) |
|
|
677 | return -1; |
|
|
678 | } |
|
|
679 | else |
656 | else |
680 | pmodend = str + strlen(str); |
657 | key++; |
681 | |
658 | |
682 | for (--pmodend; str < pmodend; --pmodend) |
659 | // string or key is empty |
683 | if (*pmodend == '-') |
660 | if (*arg == '\0' || *key == '\0') |
684 | break; |
661 | return -1; |
685 | |
662 | |
|
|
663 | // parse modifiers |
686 | while (str < pmodend) |
664 | while (str < key) |
687 | { |
665 | { |
688 | unsigned int i; |
666 | unsigned int i; |
689 | |
667 | |
690 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
668 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
691 | { |
669 | { |
… | |
… | |
702 | |
680 | |
703 | if (*str == '-') |
681 | if (*str == '-') |
704 | ++str; |
682 | ++str; |
705 | } |
683 | } |
706 | |
684 | |
707 | /* some scanf () have trouble with a 0x prefix */ |
685 | // convert keysym name to keysym number |
708 | if (str[0] == '0' && toupper (str[1]) == 'X') |
686 | if ((sym = XStringToKeysym (str)) == None) |
709 | { |
687 | { |
710 | str += 2; |
688 | // fallback on hexadecimal parsing |
711 | |
689 | char *end; |
|
|
690 | sym = strtol (str, &end, 16); |
712 | if (arg) |
691 | if (*end) |
713 | { |
|
|
714 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
|
|
715 | return -1; |
|
|
716 | } |
|
|
717 | else |
|
|
718 | { |
|
|
719 | if (sscanf (str, "%x:", &sym) != 1) |
|
|
720 | return -1; |
|
|
721 | |
|
|
722 | /* cue to ':', it's there since sscanf () worked */ |
|
|
723 | strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); |
|
|
724 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
725 | newarg = newargstr; |
|
|
726 | } |
|
|
727 | } |
|
|
728 | else |
|
|
729 | { |
|
|
730 | /* |
|
|
731 | * convert keysym name to keysym number |
|
|
732 | */ |
|
|
733 | strncpy (newargstr, str, NEWARGLIM - 1); |
|
|
734 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
735 | |
|
|
736 | if (arg == NULL) |
|
|
737 | { |
|
|
738 | if ((newarg = strchr (newargstr, ':')) == NULL) |
|
|
739 | return -1; |
|
|
740 | |
|
|
741 | *newarg++ = '\0'; /* terminate keysym name */ |
|
|
742 | } |
|
|
743 | |
|
|
744 | if ((sym = XStringToKeysym (newargstr)) == None) |
|
|
745 | return -1; |
692 | return -1; |
746 | } |
693 | } |
747 | |
694 | |
748 | if (newarg == NULL) |
|
|
749 | { |
|
|
750 | strncpy (newargstr, arg, NEWARGLIM - 1); |
|
|
751 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
752 | newarg = newargstr; |
|
|
753 | } |
|
|
754 | |
|
|
755 | if (*newarg == '\0') |
|
|
756 | return -1; |
|
|
757 | |
|
|
758 | keyboard->register_user_translation (sym, state, newarg); |
695 | keyboard->register_user_translation (sym, state, arg); |
759 | return 1; |
696 | return 1; |
760 | } |
697 | } |
761 | |
698 | |
762 | # endif /* KEYSYM_RESOURCE */ |
699 | # endif /* KEYSYM_RESOURCE */ |
763 | #endif /* NO_RESOURCES */ |
700 | #endif /* NO_RESOURCES */ |
… | |
… | |
800 | |
737 | |
801 | void |
738 | void |
802 | rxvt_term::extract_resources () |
739 | rxvt_term::extract_resources () |
803 | { |
740 | { |
804 | #ifndef NO_RESOURCES |
741 | #ifndef NO_RESOURCES |
|
|
742 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
743 | XrmMergeDatabases (option_db, &database); |
|
|
744 | option_db = NULL; |
805 | /* |
745 | /* |
806 | * Query resources for options that affect us |
746 | * Query resources for options that affect us |
807 | */ |
747 | */ |
808 | for (int entry = 0; entry < optList_size; entry++) |
748 | for (int entry = 0; entry < optList_size; entry++) |
809 | { |
749 | { |
… | |
… | |
838 | |
778 | |
839 | /* |
779 | /* |
840 | * [R5 or later]: enumerate the resource database |
780 | * [R5 or later]: enumerate the resource database |
841 | */ |
781 | */ |
842 | # ifdef KEYSYM_RESOURCE |
782 | # ifdef KEYSYM_RESOURCE |
843 | XrmDatabase database = XrmGetDatabase (dpy); |
|
|
844 | XrmName name_prefix[3]; |
783 | XrmName name_prefix[3]; |
845 | XrmClass class_prefix[3]; |
784 | XrmClass class_prefix[3]; |
846 | |
785 | |
847 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
786 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
848 | name_prefix[1] = XrmStringToName ("keysym"); |
787 | name_prefix[1] = XrmStringToName ("keysym"); |