… | |
… | |
9 | * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de> |
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 3 of the License, or |
15 | * (at your option) any later version. |
15 | * (at your option) any later version. |
16 | * |
16 | * |
17 | * This program is distributed in the hope that it will be useful, |
17 | * This program is distributed in the hope that it will be useful, |
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
46 | */ |
46 | */ |
47 | |
47 | |
48 | /* INFO () - descriptive information only */ |
48 | /* INFO () - descriptive information only */ |
49 | #define INFO(opt, arg, desc) \ |
49 | #define INFO(opt, arg, desc) \ |
50 | {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)} |
50 | {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)} |
|
|
51 | |
|
|
52 | #define RINFO(kw, arg) \ |
|
|
53 | {0, Optflag_Info, -1, (kw), NULL, (arg), NULL} |
51 | |
54 | |
52 | /* STRG () - command-line option, with/without resource */ |
55 | /* STRG () - command-line option, with/without resource */ |
53 | #define STRG(rsp, kw, opt, arg, desc) \ |
56 | #define STRG(rsp, kw, opt, arg, desc) \ |
54 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
57 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
55 | |
58 | |
… | |
… | |
93 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
96 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
94 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
97 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
95 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
98 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
96 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
99 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
97 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
100 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
|
|
101 | SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"), |
98 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
102 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
99 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
103 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
|
|
104 | STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"), |
100 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
105 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
101 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
106 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
102 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
107 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
103 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
108 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
104 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
109 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
… | |
… | |
108 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
113 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
109 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
114 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
115 | 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"), |
116 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
112 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
117 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
113 | #if ENABLE_TRANSPARENCY |
118 | #if BG_IMAGE_FROM_ROOT |
114 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
119 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
115 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
120 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
116 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
121 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
117 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
122 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
118 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
123 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
… | |
… | |
189 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
194 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
190 | #endif /* NO_CURSORCOLOR */ |
195 | #endif /* NO_CURSORCOLOR */ |
191 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
196 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
192 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
197 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
193 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
198 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
194 | #ifdef BG_IMAGE_FROM_FILE |
199 | #if BG_IMAGE_FROM_FILE |
195 | RSTRG (Rs_path, "path", "search path"), |
200 | RSTRG (Rs_path, "path", "search path"), |
196 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
201 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
202 | #endif |
197 | # if ENABLE_EWMH |
203 | #if ENABLE_EWMH |
198 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
204 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
199 | # endif |
|
|
200 | #endif |
205 | #endif |
201 | /* fonts: command-line option = resource name */ |
206 | /* fonts: command-line option = resource name */ |
202 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
207 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
203 | #if ENABLE_STYLES |
208 | #if ENABLE_STYLES |
204 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
209 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
205 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
210 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
206 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
211 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
207 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
212 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
208 | #endif |
213 | #endif |
209 | #ifdef USE_XIM |
214 | #if USE_XIM |
210 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
215 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
211 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
216 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
212 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
217 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
213 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
218 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
214 | #endif /* USE_XIM */ |
219 | #endif /* USE_XIM */ |
… | |
… | |
219 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
224 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
220 | #if ENABLE_XEMBED |
225 | #if ENABLE_XEMBED |
221 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
226 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
222 | #endif |
227 | #endif |
223 | #if XFT |
228 | #if XFT |
|
|
229 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
|
|
230 | #endif |
|
|
231 | #if ENABLE_FRILLS |
224 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
232 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
225 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
233 | STRG (Rs_visual, "visual", "visual", "number", "visual id to request"), |
226 | #endif |
|
|
227 | #if ENABLE_FRILLS |
|
|
228 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
234 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
229 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
235 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
230 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
236 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
231 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
237 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
232 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
238 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
… | |
… | |
267 | #endif |
273 | #endif |
268 | #if ISO_14755 |
274 | #if ISO_14755 |
269 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
275 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
270 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
276 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
271 | #endif |
277 | #endif |
272 | #ifdef HAVE_AFTERIMAGE |
278 | #ifndef NO_RESOURCES |
273 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
279 | RINFO ("xrm", "string"), |
|
|
280 | #endif |
|
|
281 | #ifdef KEYSYM_RESOURCE |
|
|
282 | RINFO ("keysym.sym", "keysym"), |
274 | #endif |
283 | #endif |
275 | INFO ("e", "command arg ...", "command to execute") |
284 | INFO ("e", "command arg ...", "command to execute") |
276 | }; |
285 | }; |
277 | |
286 | |
278 | #undef INFO |
287 | #undef INFO |
|
|
288 | #undef RINFO |
279 | #undef STRG |
289 | #undef STRG |
280 | #undef RSTRG |
290 | #undef RSTRG |
281 | #undef SWCH |
291 | #undef SWCH |
282 | #undef BOOL |
292 | #undef BOOL |
283 | |
293 | |
… | |
… | |
326 | #endif |
336 | #endif |
327 | #if defined(ENABLE_TRANSPARENCY) |
337 | #if defined(ENABLE_TRANSPARENCY) |
328 | "transparent," |
338 | "transparent," |
329 | "tint," |
339 | "tint," |
330 | #endif |
340 | #endif |
331 | #if HAVE_AFTERIMAGE |
|
|
332 | "afterimage," |
|
|
333 | #endif |
|
|
334 | #if HAVE_PIXBUF |
341 | #if HAVE_PIXBUF |
335 | "pixbuf," |
342 | "pixbuf," |
336 | #endif |
343 | #endif |
337 | #if defined(USE_XIM) |
344 | #if defined(USE_XIM) |
338 | "XIM," |
345 | "XIM," |
… | |
… | |
380 | #if defined(XTERM_SCROLLBAR) |
387 | #if defined(XTERM_SCROLLBAR) |
381 | "+xterm" |
388 | "+xterm" |
382 | #endif |
389 | #endif |
383 | "\nUsage: "; /* Usage */ |
390 | "\nUsage: "; /* Usage */ |
384 | |
391 | |
385 | #define INDENT 18 |
392 | #define INDENT 28 |
386 | |
393 | |
387 | const char rxvt_term::resval_undef [] = "<undef>"; |
394 | const char rxvt_term::resval_undef [] = "<undef>"; |
388 | const char rxvt_term::resval_on [] = "on"; |
395 | const char rxvt_term::resval_on [] = "on"; |
389 | const char rxvt_term::resval_off [] = "off"; |
396 | const char rxvt_term::resval_off [] = "off"; |
390 | |
397 | |
391 | /*{{{ usage: */ |
398 | /*{{{ usage: */ |
392 | /*----------------------------------------------------------------------*/ |
399 | /*----------------------------------------------------------------------*/ |
393 | static void |
400 | void |
394 | rxvt_usage (int type) |
401 | rxvt_term::rxvt_usage (int type) |
395 | { |
402 | { |
396 | unsigned int i, col; |
403 | unsigned int i, col; |
397 | |
404 | |
398 | rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); |
405 | rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); |
399 | |
406 | |
… | |
… | |
407 | { |
414 | { |
408 | int len = 0; |
415 | int len = 0; |
409 | |
416 | |
410 | if (optList[i].arg) |
417 | if (optList[i].arg) |
411 | len = strlen (optList[i].arg) + 1; |
418 | len = strlen (optList[i].arg) + 1; |
|
|
419 | |
412 | assert (optList[i].opt != NULL); |
420 | assert (optList[i].opt != NULL); |
413 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
421 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
414 | col += len; |
422 | col += len; |
|
|
423 | |
415 | if (col > 79) |
424 | if (col > 79) |
416 | { |
425 | { |
417 | /* assume regular width */ |
426 | /* assume regular width */ |
418 | rxvt_log ("\n"); |
427 | rxvt_log ("\n"); |
419 | col = 1 + len; |
428 | col = 1 + len; |
420 | } |
429 | } |
421 | |
430 | |
422 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
431 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
|
|
432 | |
423 | if (optList[i].arg) |
433 | if (optList[i].arg) |
424 | rxvt_log (" %s]", optList[i].arg); |
434 | rxvt_log (" %s]", optList[i].arg); |
425 | else |
435 | else |
426 | rxvt_log ("]"); |
436 | rxvt_log ("]"); |
427 | } |
437 | } |
… | |
… | |
440 | + (optList_isBool (i) ? 0 : 2)), |
450 | + (optList_isBool (i) ? 0 : 2)), |
441 | (optList[i].arg ? optList[i].arg : ""), |
451 | (optList[i].arg ? optList[i].arg : ""), |
442 | (optList_isBool (i) ? "turn on/off " : ""), |
452 | (optList_isBool (i) ? "turn on/off " : ""), |
443 | optList[i].desc); |
453 | optList[i].desc); |
444 | } |
454 | } |
|
|
455 | |
|
|
456 | #if ENABLE_PERL |
|
|
457 | rxvt_perl.init (this); |
|
|
458 | rxvt_perl.usage (this, 1); |
|
|
459 | #endif |
|
|
460 | |
445 | rxvt_log ("\n --help to list long-options"); |
461 | rxvt_log ("\n --help to list long-options"); |
446 | break; |
462 | break; |
447 | |
463 | |
448 | case 2: /* full resource listing */ |
464 | case 2: /* full resource listing */ |
449 | rxvt_log (" [options] [-e command args]\n\n" |
465 | rxvt_log (" [options] [-e command args]\n\n" |
… | |
… | |
451 | |
467 | |
452 | for (i = 0; i < ecb_array_length (optList); i++) |
468 | for (i = 0; i < ecb_array_length (optList); i++) |
453 | if (optList[i].kw != NULL) |
469 | if (optList[i].kw != NULL) |
454 | rxvt_log (" %s: %*s%s\n", |
470 | rxvt_log (" %s: %*s%s\n", |
455 | optList[i].kw, |
471 | optList[i].kw, |
456 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
472 | (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */ |
457 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
473 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
458 | #ifdef KEYSYM_RESOURCE |
474 | |
459 | rxvt_log (" " "keysym.sym" ": %*s%s\n", |
475 | #if ENABLE_PERL |
460 | (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ |
476 | rxvt_perl.init (this); |
461 | "keysym"); |
477 | rxvt_perl.usage (this, 2); |
462 | #endif |
478 | #endif |
|
|
479 | |
463 | rxvt_log ("\n -help to list options"); |
480 | rxvt_log ("\n -help to list options"); |
464 | break; |
481 | break; |
465 | } |
482 | } |
466 | |
483 | |
467 | rxvt_log ("\n\n"); |
484 | rxvt_log ("\n\n"); |
… | |
… | |
532 | * default values |
549 | * default values |
533 | */ |
550 | */ |
534 | |
551 | |
535 | if (optList[entry].doff != -1) |
552 | if (optList[entry].doff != -1) |
536 | { |
553 | { |
537 | if (flag && i+1 == argc) |
554 | if (flag && i + 1 == argc) |
538 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
555 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
539 | |
556 | |
540 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
557 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
541 | } |
558 | } |
542 | } |
559 | } |
… | |
… | |
550 | } |
567 | } |
551 | } |
568 | } |
552 | #ifndef NO_RESOURCES |
569 | #ifndef NO_RESOURCES |
553 | else if (!strcmp (opt, "xrm")) |
570 | else if (!strcmp (opt, "xrm")) |
554 | { |
571 | { |
555 | if (i+1 < argc) |
572 | if (i + 1 < argc) |
556 | XrmPutLineResource (&option_db, argv[++i]); |
573 | XrmPutLineResource (&option_db, argv[++i]); |
557 | } |
574 | } |
558 | #endif |
575 | #endif |
559 | #ifdef KEYSYM_RESOURCE |
576 | #ifdef KEYSYM_RESOURCE |
560 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
577 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
561 | { |
578 | { |
562 | if (i+1 < argc) |
579 | if (i + 1 < argc) |
563 | { |
580 | { |
564 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
581 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
565 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
582 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
566 | XrmPutLineResource (&option_db, res); |
583 | XrmPutLineResource (&option_db, res); |
567 | } |
584 | } |
568 | } |
585 | } |
569 | #endif |
586 | #endif |
570 | else if (!strcmp (opt, "e")) |
587 | else if (!strcmp (opt, "e")) |
571 | { |
588 | { |
572 | if (i+1 == argc) |
589 | if (i + 1 < argc) |
573 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
574 | |
|
|
575 | return (const char **)argv + i + 1; |
590 | return (const char **)argv + i + 1; |
|
|
591 | |
|
|
592 | rxvt_warn ("option '-e' requires an argument, aborting.\n"); |
|
|
593 | bad_option = 1; |
576 | } |
594 | } |
577 | else |
595 | else |
578 | { |
596 | { |
|
|
597 | #if ENABLE_PERL |
|
|
598 | rxvt_perl.init (this); |
|
|
599 | |
|
|
600 | if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1])) |
|
|
601 | { |
|
|
602 | if (flags & rxvt_perl.RESOURCE_ARG) |
|
|
603 | { |
|
|
604 | if (i + 1 == argc) |
|
|
605 | { |
|
|
606 | rxvt_warn ("option '%s' requires an argument.\n", argv [i]); |
579 | bad_option = 1; |
607 | bad_option = 1; |
|
|
608 | } |
|
|
609 | else |
|
|
610 | ++i; |
|
|
611 | } |
|
|
612 | } |
|
|
613 | else |
|
|
614 | #endif |
|
|
615 | { |
580 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
616 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
|
|
617 | bad_option = 1; |
|
|
618 | } |
581 | } |
619 | } |
582 | } |
620 | } |
583 | |
621 | |
584 | if (bad_option) |
622 | if (bad_option) |
585 | rxvt_usage (0); |
623 | rxvt_usage (0); |
… | |
… | |
591 | |
629 | |
592 | #ifndef NO_RESOURCES |
630 | #ifndef NO_RESOURCES |
593 | /*----------------------------------------------------------------------*/ |
631 | /*----------------------------------------------------------------------*/ |
594 | |
632 | |
595 | # ifdef KEYSYM_RESOURCE |
633 | # ifdef KEYSYM_RESOURCE |
|
|
634 | static void |
|
|
635 | rxvt_define_key (rxvt_term *term, const char *k, const char *v) |
|
|
636 | { |
|
|
637 | term->bind_action (k, v); |
|
|
638 | } |
|
|
639 | |
596 | /* |
640 | /* |
597 | * Define key from XrmEnumerateDatabase. |
641 | * Define key from XrmEnumerateDatabase. |
598 | * quarks will be something like |
642 | * quarks will be something like |
599 | * "rxvt" "keysym" "0xFF01" |
643 | * "rxvt" "keysym" "0xFF01" |
600 | * value will be a string |
644 | * value will be a string |
601 | */ |
645 | */ |
602 | static int |
646 | static int |
|
|
647 | rxvt_keysym_enumerate_helper ( |
603 | rxvt_define_key (XrmDatabase *database ecb_unused, |
648 | XrmDatabase *database ecb_unused, |
604 | XrmBindingList bindings ecb_unused, |
649 | XrmBindingList bindings ecb_unused, |
605 | XrmQuarkList quarks, |
650 | XrmQuarkList quarks, |
606 | XrmRepresentation *type ecb_unused, |
651 | XrmRepresentation *type ecb_unused, |
607 | XrmValue *value, |
652 | XrmValue *value, |
608 | XPointer closure ecb_unused) |
653 | XPointer closure |
|
|
654 | ) |
609 | { |
655 | { |
610 | int last; |
656 | int last; |
611 | |
657 | |
612 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
658 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
613 | ; |
659 | ; |
614 | |
660 | |
615 | last--; |
661 | rxvt_term *term = (rxvt_term *)(((void **)closure)[0]); |
616 | GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO |
662 | void (*cb)(rxvt_term *, const char *, const char *) |
|
|
663 | = (void (*)(rxvt_term *, const char *, const char *)) |
|
|
664 | (((void **)closure)[1]); |
|
|
665 | |
|
|
666 | cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr); |
|
|
667 | |
617 | return False; |
668 | return False; |
618 | } |
669 | } |
619 | |
670 | |
620 | /* |
671 | /* |
621 | * look for something like this (XK_Delete) |
672 | * look for something like this (XK_Delete) |
… | |
… | |
656 | { "4", 1, Mod4Mask }, |
707 | { "4", 1, Mod4Mask }, |
657 | { "5", 1, Mod5Mask }, |
708 | { "5", 1, Mod5Mask }, |
658 | }; |
709 | }; |
659 | |
710 | |
660 | int |
711 | int |
661 | rxvt_term::parse_keysym (const char *str, const char *arg) |
712 | rxvt_term::parse_keysym (const char *str, unsigned int &state) |
662 | { |
713 | { |
663 | int sym; |
714 | int sym; |
664 | unsigned int state = 0; |
|
|
665 | const char *key = strrchr (str, '-'); |
715 | const char *key = strrchr (str, '-'); |
|
|
716 | |
|
|
717 | state = 0; |
666 | |
718 | |
667 | if (!key) |
719 | if (!key) |
668 | key = str; |
720 | key = str; |
669 | else |
721 | else |
670 | key++; |
722 | key++; |
671 | |
723 | |
672 | // string or key is empty |
724 | // string or key is empty |
673 | if (*arg == '\0' || *key == '\0') |
725 | if (*key == '\0') |
674 | return -1; |
726 | return -1; |
675 | |
727 | |
676 | // parse modifiers |
728 | // parse modifiers |
677 | while (str < key) |
729 | while (str < key) |
678 | { |
730 | { |
… | |
… | |
703 | sym = strtol (str, &end, 16); |
755 | sym = strtol (str, &end, 16); |
704 | if (*end) |
756 | if (*end) |
705 | return -1; |
757 | return -1; |
706 | } |
758 | } |
707 | |
759 | |
|
|
760 | return sym; |
|
|
761 | } |
|
|
762 | |
|
|
763 | int |
|
|
764 | rxvt_term::bind_action (const char *str, const char *arg) |
|
|
765 | { |
|
|
766 | int sym; |
|
|
767 | unsigned int state; |
|
|
768 | |
|
|
769 | if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1) |
|
|
770 | return -1; |
|
|
771 | |
708 | wchar_t *ws = rxvt_mbstowcs (arg); |
772 | wchar_t *ws = rxvt_mbstowcs (arg); |
709 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
|
|
710 | keyboard->register_user_translation (sym, state, ws); |
773 | keyboard->register_action (sym, state, ws); |
|
|
774 | |
711 | free (ws); |
775 | free (ws); |
712 | return 1; |
776 | return 1; |
713 | } |
777 | } |
714 | |
778 | |
715 | # endif /* KEYSYM_RESOURCE */ |
779 | # endif /* KEYSYM_RESOURCE */ |
… | |
… | |
793 | } |
857 | } |
794 | #endif /* NO_RESOURCES */ |
858 | #endif /* NO_RESOURCES */ |
795 | } |
859 | } |
796 | |
860 | |
797 | void |
861 | void |
798 | rxvt_term::extract_keysym_resources () |
862 | rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) |
799 | { |
863 | { |
800 | #ifndef NO_RESOURCES |
864 | #ifndef NO_RESOURCES |
801 | /* |
865 | /* |
802 | * [R5 or later]: enumerate the resource database |
866 | * [R5 or later]: enumerate the resource database |
803 | */ |
867 | */ |
804 | # ifdef KEYSYM_RESOURCE |
868 | # ifdef KEYSYM_RESOURCE |
|
|
869 | void *closure[2] = { |
|
|
870 | (void *)this, |
|
|
871 | (void *)cb, |
|
|
872 | }; |
|
|
873 | |
805 | XrmDatabase database = XrmGetDatabase (dpy); |
874 | XrmDatabase database = XrmGetDatabase (dpy); |
806 | XrmName name_prefix[3]; |
875 | XrmName name_prefix[3]; |
807 | XrmClass class_prefix[3]; |
876 | XrmClass class_prefix[3]; |
808 | |
877 | |
809 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
878 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
… | |
… | |
812 | class_prefix[0] = XrmStringToName (RESCLASS); |
881 | class_prefix[0] = XrmStringToName (RESCLASS); |
813 | class_prefix[1] = XrmStringToName ("Keysym"); |
882 | class_prefix[1] = XrmStringToName ("Keysym"); |
814 | class_prefix[2] = NULLQUARK; |
883 | class_prefix[2] = NULLQUARK; |
815 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
884 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
816 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
885 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
817 | XrmEnumOneLevel, rxvt_define_key, NULL); |
886 | XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); |
818 | # ifdef RESFALLBACK |
887 | # ifdef RESFALLBACK |
819 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
888 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
820 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
889 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
821 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
890 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
822 | XrmEnumOneLevel, rxvt_define_key, NULL); |
891 | XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); |
823 | # endif |
892 | # endif |
824 | # endif |
893 | # endif |
825 | |
894 | |
826 | #endif /* NO_RESOURCES */ |
895 | #endif /* NO_RESOURCES */ |
827 | } |
896 | } |
828 | |
897 | |
|
|
898 | void |
|
|
899 | rxvt_term::extract_keysym_resources () |
|
|
900 | { |
|
|
901 | enumerate_keysym_resources (rxvt_define_key); |
|
|
902 | } |
|
|
903 | |
829 | /*----------------------- end-of-file (C source) -----------------------*/ |
904 | /*----------------------- end-of-file (C source) -----------------------*/ |
|
|
905 | |