… | |
… | |
34 | |
34 | |
35 | /* place holders used for parsing command-line options */ |
35 | /* place holders used for parsing command-line options */ |
36 | #define Optflag_Reverse 1 |
36 | #define Optflag_Reverse 1 |
37 | #define Optflag_Boolean 2 |
37 | #define Optflag_Boolean 2 |
38 | #define Optflag_Switch 4 |
38 | #define Optflag_Switch 4 |
|
|
39 | #define Optflag_Info 8 |
39 | |
40 | |
40 | /* monolithic option/resource structure: */ |
41 | /* monolithic option/resource structure: */ |
41 | /* |
42 | /* |
42 | * `string' options MUST have a usage argument |
43 | * `string' options MUST have a usage argument |
43 | * `switch' and `boolean' options have no argument |
44 | * `switch' and `boolean' options have no argument |
44 | * if there's no desc (ription), it won't appear in rxvt_usage () |
45 | * if there's no desc (ription), it won't appear in rxvt_usage () |
45 | */ |
46 | */ |
46 | |
47 | |
47 | /* INFO () - descriptive information only */ |
48 | /* INFO () - descriptive information only */ |
48 | #define INFO(opt, arg, desc) \ |
49 | #define INFO(opt, arg, desc) \ |
49 | {0, 0, -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} |
50 | |
54 | |
51 | /* STRG () - command-line option, with/without resource */ |
55 | /* STRG () - command-line option, with/without resource */ |
52 | #define STRG(rsp, kw, opt, arg, desc) \ |
56 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
57 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | |
58 | |
… | |
… | |
69 | (optList[i].flag == 0) |
73 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
74 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
75 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
76 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
77 | (optList[i].flag & Optflag_Reverse) |
|
|
78 | #define optList_isInfo(i) \ |
|
|
79 | (optList[i].flag & Optflag_Info) |
74 | |
80 | |
75 | static const struct |
81 | static const struct |
76 | { |
82 | { |
77 | const uint8_t index; /* Option index */ |
83 | const uint8_t index; /* Option index */ |
78 | const uint8_t flag; /* Option flag */ |
84 | const uint8_t flag; /* Option flag */ |
… | |
… | |
105 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
111 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
112 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
113 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
114 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
115 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
110 | #if ENABLE_TRANSPARENCY |
116 | #if BG_IMAGE_FROM_ROOT |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
117 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
112 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
118 | BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), |
113 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
119 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
114 | STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), |
120 | 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"), |
121 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
… | |
… | |
186 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
192 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
187 | #endif /* NO_CURSORCOLOR */ |
193 | #endif /* NO_CURSORCOLOR */ |
188 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
194 | STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), |
189 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
195 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
190 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
196 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
191 | #ifdef BG_IMAGE_FROM_FILE |
197 | #if BG_IMAGE_FROM_FILE |
192 | RSTRG (Rs_path, "path", "search path"), |
198 | RSTRG (Rs_path, "path", "search path"), |
193 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
199 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
200 | #endif |
194 | # if ENABLE_EWMH |
201 | #if ENABLE_EWMH |
195 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
202 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
196 | # endif |
|
|
197 | #endif |
203 | #endif |
198 | /* fonts: command-line option = resource name */ |
204 | /* fonts: command-line option = resource name */ |
199 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
205 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
200 | #if ENABLE_STYLES |
206 | #if ENABLE_STYLES |
201 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
207 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
202 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
208 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
203 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
209 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
204 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
210 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
205 | #endif |
211 | #endif |
206 | #ifdef USE_XIM |
212 | #if USE_XIM |
207 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
213 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
208 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
214 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
209 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
215 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
210 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
216 | STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), |
211 | #endif /* USE_XIM */ |
217 | #endif /* USE_XIM */ |
… | |
… | |
216 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
222 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
217 | #if ENABLE_XEMBED |
223 | #if ENABLE_XEMBED |
218 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
224 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
219 | #endif |
225 | #endif |
220 | #if XFT |
226 | #if XFT |
|
|
227 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
|
|
228 | #endif |
|
|
229 | #if ENABLE_FRILLS |
221 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
230 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
222 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
231 | STRG (Rs_visual, "visual", "visual", "number", "visual id to request"), |
223 | #endif |
|
|
224 | #if ENABLE_FRILLS |
|
|
225 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
232 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
226 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
233 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
227 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
234 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
228 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
235 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
229 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
236 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
… | |
… | |
264 | #endif |
271 | #endif |
265 | #if ISO_14755 |
272 | #if ISO_14755 |
266 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
273 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
267 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
274 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
268 | #endif |
275 | #endif |
269 | #ifdef HAVE_AFTERIMAGE |
276 | #ifndef NO_RESOURCES |
270 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
277 | RINFO ("xrm", "string"), |
|
|
278 | #endif |
|
|
279 | #ifdef KEYSYM_RESOURCE |
|
|
280 | RINFO ("keysym.sym", "keysym"), |
271 | #endif |
281 | #endif |
272 | INFO ("e", "command arg ...", "command to execute") |
282 | INFO ("e", "command arg ...", "command to execute") |
273 | }; |
283 | }; |
274 | |
284 | |
275 | #undef INFO |
285 | #undef INFO |
|
|
286 | #undef RINFO |
276 | #undef STRG |
287 | #undef STRG |
277 | #undef RSTRG |
288 | #undef RSTRG |
278 | #undef SWCH |
289 | #undef SWCH |
279 | #undef BOOL |
290 | #undef BOOL |
280 | |
291 | |
… | |
… | |
323 | #endif |
334 | #endif |
324 | #if defined(ENABLE_TRANSPARENCY) |
335 | #if defined(ENABLE_TRANSPARENCY) |
325 | "transparent," |
336 | "transparent," |
326 | "tint," |
337 | "tint," |
327 | #endif |
338 | #endif |
328 | #if HAVE_AFTERIMAGE |
|
|
329 | "afterimage," |
|
|
330 | #endif |
|
|
331 | #if HAVE_PIXBUF |
339 | #if HAVE_PIXBUF |
332 | "pixbuf," |
340 | "pixbuf," |
333 | #endif |
341 | #endif |
334 | #if defined(USE_XIM) |
342 | #if defined(USE_XIM) |
335 | "XIM," |
343 | "XIM," |
… | |
… | |
377 | #if defined(XTERM_SCROLLBAR) |
385 | #if defined(XTERM_SCROLLBAR) |
378 | "+xterm" |
386 | "+xterm" |
379 | #endif |
387 | #endif |
380 | "\nUsage: "; /* Usage */ |
388 | "\nUsage: "; /* Usage */ |
381 | |
389 | |
382 | #define INDENT 18 |
390 | #define INDENT 28 |
383 | |
391 | |
384 | const char rxvt_term::resval_undef [] = "<undef>"; |
392 | const char rxvt_term::resval_undef [] = "<undef>"; |
385 | const char rxvt_term::resval_on [] = "on"; |
393 | const char rxvt_term::resval_on [] = "on"; |
386 | const char rxvt_term::resval_off [] = "off"; |
394 | const char rxvt_term::resval_off [] = "off"; |
387 | |
395 | |
388 | /*{{{ usage: */ |
396 | /*{{{ usage: */ |
389 | /*----------------------------------------------------------------------*/ |
397 | /*----------------------------------------------------------------------*/ |
390 | static void |
398 | void |
391 | rxvt_usage (int type) |
399 | rxvt_term::rxvt_usage (int type) |
392 | { |
400 | { |
393 | unsigned int i, col; |
401 | unsigned int i, col; |
394 | |
402 | |
395 | rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); |
403 | rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); |
396 | |
404 | |
397 | switch (type) |
405 | switch (type) |
398 | { |
406 | { |
399 | case 0: /* brief listing */ |
407 | case 0: /* brief listing */ |
400 | rxvt_log (" [-help] [--help]\n"); |
408 | rxvt_log (" [-help] [--help]\n"); |
401 | |
409 | |
402 | for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) |
410 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
403 | if (optList[i].desc != NULL) |
411 | if (optList[i].desc != NULL) |
404 | { |
412 | { |
405 | int len = 0; |
413 | int len = 0; |
406 | |
414 | |
407 | if (optList[i].arg) |
415 | if (optList[i].arg) |
408 | len = strlen (optList[i].arg) + 1; |
416 | len = strlen (optList[i].arg) + 1; |
|
|
417 | |
409 | assert (optList[i].opt != NULL); |
418 | assert (optList[i].opt != NULL); |
410 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
419 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
411 | col += len; |
420 | col += len; |
|
|
421 | |
412 | if (col > 79) |
422 | if (col > 79) |
413 | { |
423 | { |
414 | /* assume regular width */ |
424 | /* assume regular width */ |
415 | rxvt_log ("\n"); |
425 | rxvt_log ("\n"); |
416 | col = 1 + len; |
426 | col = 1 + len; |
417 | } |
427 | } |
418 | |
428 | |
419 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
429 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
|
|
430 | |
420 | if (optList[i].arg) |
431 | if (optList[i].arg) |
421 | rxvt_log (" %s]", optList[i].arg); |
432 | rxvt_log (" %s]", optList[i].arg); |
422 | else |
433 | else |
423 | rxvt_log ("]"); |
434 | rxvt_log ("]"); |
424 | } |
435 | } |
425 | break; |
436 | break; |
426 | |
437 | |
427 | case 1: /* full command-line listing */ |
438 | case 1: /* full command-line listing */ |
428 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
439 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
429 | |
440 | |
430 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
441 | for (i = 0; i < ecb_array_length (optList); i++) |
431 | if (optList[i].desc != NULL) |
442 | if (optList[i].desc != NULL) |
432 | { |
443 | { |
433 | assert (optList[i].opt != NULL); |
444 | assert (optList[i].opt != NULL); |
434 | rxvt_log (" %s%s %-*s%s%s\n", |
445 | rxvt_log (" %s%s %-*s%s%s\n", |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
446 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
… | |
… | |
437 | + (optList_isBool (i) ? 0 : 2)), |
448 | + (optList_isBool (i) ? 0 : 2)), |
438 | (optList[i].arg ? optList[i].arg : ""), |
449 | (optList[i].arg ? optList[i].arg : ""), |
439 | (optList_isBool (i) ? "turn on/off " : ""), |
450 | (optList_isBool (i) ? "turn on/off " : ""), |
440 | optList[i].desc); |
451 | optList[i].desc); |
441 | } |
452 | } |
|
|
453 | |
|
|
454 | #if ENABLE_PERL |
|
|
455 | rxvt_perl.init (this); |
|
|
456 | rxvt_perl.usage (this, 1); |
|
|
457 | #endif |
|
|
458 | |
442 | rxvt_log ("\n --help to list long-options"); |
459 | rxvt_log ("\n --help to list long-options"); |
443 | break; |
460 | break; |
444 | |
461 | |
445 | case 2: /* full resource listing */ |
462 | case 2: /* full resource listing */ |
446 | rxvt_log (" [options] [-e command args]\n\n" |
463 | rxvt_log (" [options] [-e command args]\n\n" |
447 | "where resources (long-options) include:\n"); |
464 | "where resources (long-options) include:\n"); |
448 | |
465 | |
449 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
466 | for (i = 0; i < ecb_array_length (optList); i++) |
450 | if (optList[i].kw != NULL) |
467 | if (optList[i].kw != NULL) |
451 | rxvt_log (" %s: %*s%s\n", |
468 | rxvt_log (" %s: %*s%s\n", |
452 | optList[i].kw, |
469 | optList[i].kw, |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
470 | (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */ |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
471 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
455 | #ifdef KEYSYM_RESOURCE |
472 | |
456 | rxvt_log (" " "keysym.sym" ": %*s%s\n", |
473 | #if ENABLE_PERL |
457 | (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ |
474 | rxvt_perl.init (this); |
458 | "keysym"); |
475 | rxvt_perl.usage (this, 2); |
459 | #endif |
476 | #endif |
|
|
477 | |
460 | rxvt_log ("\n -help to list options"); |
478 | rxvt_log ("\n -help to list options"); |
461 | break; |
479 | break; |
462 | } |
480 | } |
463 | |
481 | |
464 | rxvt_log ("\n\n"); |
482 | rxvt_log ("\n\n"); |
465 | rxvt_exit_failure (); |
483 | rxvt_exit_failure (); |
466 | /* NOTREACHED */ |
|
|
467 | } |
484 | } |
468 | |
485 | |
469 | /*}}} */ |
486 | /*}}} */ |
470 | |
487 | |
471 | /*{{{ get command-line options before getting resources */ |
488 | /*{{{ get command-line options before getting resources */ |
472 | void |
489 | const char ** |
473 | rxvt_term::get_options (int argc, const char *const *argv) |
490 | rxvt_term::get_options (int argc, const char *const *argv) |
474 | { |
491 | { |
475 | int i, bad_option = 0; |
492 | int i, bad_option = 0; |
476 | |
493 | |
477 | for (i = 1; i < argc; i++) |
494 | for (i = 1; i < argc; i++) |
… | |
… | |
508 | |
525 | |
509 | if (!strcmp (opt, "h")) |
526 | if (!strcmp (opt, "h")) |
510 | rxvt_usage (0); |
527 | rxvt_usage (0); |
511 | |
528 | |
512 | /* feature: always try to match long-options */ |
529 | /* feature: always try to match long-options */ |
513 | for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
530 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
514 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
531 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
515 | || (!longopt |
532 | || (!longopt |
516 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
533 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
517 | break; |
534 | break; |
518 | |
535 | |
519 | if (entry < ARRAY_LENGTH(optList)) |
536 | if (entry < ecb_array_length (optList) |
|
|
537 | && !optList_isInfo (entry)) |
520 | { |
538 | { |
521 | if (optList_isReverse (entry)) |
539 | if (optList_isReverse (entry)) |
522 | flag = !flag; |
540 | flag = !flag; |
523 | |
541 | |
524 | if (optList_isString (entry)) |
542 | if (optList_isString (entry)) |
525 | { |
543 | { |
526 | /* |
544 | /* |
527 | * special cases are handled in main.c:main () to allow |
545 | * special cases are handled in init_resources () to allow |
528 | * X resources to set these values before we settle for |
546 | * X resources to set these values before we settle for |
529 | * default values |
547 | * default values |
530 | */ |
548 | */ |
531 | |
549 | |
532 | if (optList[entry].doff != -1) |
550 | if (optList[entry].doff != -1) |
533 | { |
551 | { |
534 | if (flag && i+1 == argc) |
552 | if (flag && i + 1 == argc) |
535 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
536 | |
554 | |
537 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
555 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
538 | } |
556 | } |
539 | } |
557 | } |
… | |
… | |
547 | } |
565 | } |
548 | } |
566 | } |
549 | #ifndef NO_RESOURCES |
567 | #ifndef NO_RESOURCES |
550 | else if (!strcmp (opt, "xrm")) |
568 | else if (!strcmp (opt, "xrm")) |
551 | { |
569 | { |
552 | if (i+1 < argc) |
570 | if (i + 1 < argc) |
553 | XrmPutLineResource (&option_db, argv[++i]); |
571 | XrmPutLineResource (&option_db, argv[++i]); |
554 | } |
572 | } |
555 | #endif |
573 | #endif |
556 | #ifdef KEYSYM_RESOURCE |
574 | #ifdef KEYSYM_RESOURCE |
557 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
575 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
558 | { |
576 | { |
559 | if (i+1 < argc) |
577 | if (i + 1 < argc) |
560 | { |
578 | { |
561 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
579 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
562 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
580 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
563 | XrmPutLineResource (&option_db, res); |
581 | XrmPutLineResource (&option_db, res); |
564 | } |
582 | } |
565 | } |
583 | } |
566 | #endif |
584 | #endif |
|
|
585 | else if (!strcmp (opt, "e")) |
|
|
586 | { |
|
|
587 | if (i + 1 < argc) |
|
|
588 | return (const char **)argv + i + 1; |
|
|
589 | |
|
|
590 | rxvt_warn ("option '-e' requires an argument, aborting.\n"); |
|
|
591 | bad_option = 1; |
|
|
592 | } |
567 | else |
593 | else |
568 | { |
594 | { |
|
|
595 | #if ENABLE_PERL |
|
|
596 | rxvt_perl.init (this); |
|
|
597 | |
|
|
598 | if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1])) |
|
|
599 | { |
|
|
600 | if (flags & rxvt_perl.RESOURCE_ARG) |
|
|
601 | { |
|
|
602 | if (i + 1 == argc) |
|
|
603 | { |
|
|
604 | rxvt_warn ("option '%s' requires an argument.\n", argv [i]); |
569 | bad_option = 1; |
605 | bad_option = 1; |
|
|
606 | } |
|
|
607 | else |
|
|
608 | ++i; |
|
|
609 | } |
|
|
610 | } |
|
|
611 | else |
|
|
612 | #endif |
|
|
613 | { |
570 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
614 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
|
|
615 | bad_option = 1; |
|
|
616 | } |
571 | } |
617 | } |
572 | } |
618 | } |
573 | |
619 | |
574 | if (bad_option) |
620 | if (bad_option) |
575 | rxvt_usage (0); |
621 | rxvt_usage (0); |
|
|
622 | |
|
|
623 | return 0; |
576 | } |
624 | } |
577 | |
625 | |
578 | /*}}} */ |
626 | /*}}} */ |
579 | |
627 | |
580 | #ifndef NO_RESOURCES |
628 | #ifndef NO_RESOURCES |
… | |
… | |
585 | * Define key from XrmEnumerateDatabase. |
633 | * Define key from XrmEnumerateDatabase. |
586 | * quarks will be something like |
634 | * quarks will be something like |
587 | * "rxvt" "keysym" "0xFF01" |
635 | * "rxvt" "keysym" "0xFF01" |
588 | * value will be a string |
636 | * value will be a string |
589 | */ |
637 | */ |
590 | /* ARGSUSED */ |
638 | static int |
591 | int |
|
|
592 | rxvt_define_key (XrmDatabase *database UNUSED, |
639 | rxvt_define_key (XrmDatabase *database ecb_unused, |
593 | XrmBindingList bindings UNUSED, |
640 | XrmBindingList bindings ecb_unused, |
594 | XrmQuarkList quarks, |
641 | XrmQuarkList quarks, |
595 | XrmRepresentation *type UNUSED, |
642 | XrmRepresentation *type ecb_unused, |
596 | XrmValue *value, |
643 | XrmValue *value, |
597 | XPointer closure UNUSED) |
644 | XPointer closure) |
598 | { |
645 | { |
|
|
646 | rxvt_term *term = (rxvt_term *)closure; |
599 | int last; |
647 | int last; |
600 | |
648 | |
601 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
649 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
602 | ; |
650 | ; |
603 | |
651 | |
604 | last--; |
652 | last--; |
605 | GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO |
653 | term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr); |
606 | return False; |
654 | return False; |
607 | } |
655 | } |
608 | |
656 | |
609 | /* |
657 | /* |
610 | * look for something like this (XK_Delete) |
658 | * look for something like this (XK_Delete) |
… | |
… | |
645 | { "4", 1, Mod4Mask }, |
693 | { "4", 1, Mod4Mask }, |
646 | { "5", 1, Mod5Mask }, |
694 | { "5", 1, Mod5Mask }, |
647 | }; |
695 | }; |
648 | |
696 | |
649 | int |
697 | int |
650 | rxvt_term::parse_keysym (const char *str, const char *arg) |
698 | rxvt_term::bind_action (const char *str, const char *arg) |
651 | { |
699 | { |
652 | int sym; |
700 | int sym; |
653 | unsigned int state = 0; |
701 | unsigned int state = 0; |
654 | const char *key = strrchr (str, '-'); |
702 | const char *key = strrchr (str, '-'); |
655 | |
703 | |
… | |
… | |
665 | // parse modifiers |
713 | // parse modifiers |
666 | while (str < key) |
714 | while (str < key) |
667 | { |
715 | { |
668 | unsigned int i; |
716 | unsigned int i; |
669 | |
717 | |
670 | for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) |
718 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
671 | { |
719 | { |
672 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
720 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
673 | { |
721 | { |
674 | state |= keysym_vocabulary[i].value; |
722 | state |= keysym_vocabulary[i].value; |
675 | str += keysym_vocabulary[i].len; |
723 | str += keysym_vocabulary[i].len; |
676 | break; |
724 | break; |
677 | } |
725 | } |
678 | } |
726 | } |
679 | |
727 | |
680 | if (i >= ARRAY_LENGTH(keysym_vocabulary)) |
728 | if (i >= ecb_array_length (keysym_vocabulary)) |
681 | return -1; |
729 | return -1; |
682 | |
730 | |
683 | if (*str == '-') |
731 | if (*str == '-') |
684 | ++str; |
732 | ++str; |
685 | } |
733 | } |
… | |
… | |
692 | sym = strtol (str, &end, 16); |
740 | sym = strtol (str, &end, 16); |
693 | if (*end) |
741 | if (*end) |
694 | return -1; |
742 | return -1; |
695 | } |
743 | } |
696 | |
744 | |
|
|
745 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
746 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
697 | keyboard->register_user_translation (sym, state, arg); |
747 | keyboard->register_user_translation (sym, state, ws); |
|
|
748 | |
|
|
749 | free (ws); |
698 | return 1; |
750 | return 1; |
699 | } |
751 | } |
700 | |
752 | |
701 | # endif /* KEYSYM_RESOURCE */ |
753 | # endif /* KEYSYM_RESOURCE */ |
702 | #endif /* NO_RESOURCES */ |
754 | #endif /* NO_RESOURCES */ |
… | |
… | |
745 | XrmMergeDatabases (option_db, &database); |
797 | XrmMergeDatabases (option_db, &database); |
746 | option_db = NULL; |
798 | option_db = NULL; |
747 | /* |
799 | /* |
748 | * Query resources for options that affect us |
800 | * Query resources for options that affect us |
749 | */ |
801 | */ |
750 | for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
802 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
751 | { |
803 | { |
752 | int s; |
804 | int s; |
753 | const char *kw = optList[entry].kw; |
805 | const char *kw = optList[entry].kw; |
754 | |
806 | |
755 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
807 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
… | |
… | |
775 | |
827 | |
776 | set_option (optList[entry].index, s); |
828 | set_option (optList[entry].index, s); |
777 | } |
829 | } |
778 | } |
830 | } |
779 | } |
831 | } |
|
|
832 | #endif /* NO_RESOURCES */ |
|
|
833 | } |
780 | |
834 | |
|
|
835 | void |
|
|
836 | rxvt_term::extract_keysym_resources () |
|
|
837 | { |
|
|
838 | #ifndef NO_RESOURCES |
781 | /* |
839 | /* |
782 | * [R5 or later]: enumerate the resource database |
840 | * [R5 or later]: enumerate the resource database |
783 | */ |
841 | */ |
784 | # ifdef KEYSYM_RESOURCE |
842 | # ifdef KEYSYM_RESOURCE |
|
|
843 | XrmDatabase database = XrmGetDatabase (dpy); |
785 | XrmName name_prefix[3]; |
844 | XrmName name_prefix[3]; |
786 | XrmClass class_prefix[3]; |
845 | XrmClass class_prefix[3]; |
787 | |
846 | |
788 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
847 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
789 | name_prefix[1] = XrmStringToName ("keysym"); |
848 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
791 | class_prefix[0] = XrmStringToName (RESCLASS); |
850 | class_prefix[0] = XrmStringToName (RESCLASS); |
792 | class_prefix[1] = XrmStringToName ("Keysym"); |
851 | class_prefix[1] = XrmStringToName ("Keysym"); |
793 | class_prefix[2] = NULLQUARK; |
852 | class_prefix[2] = NULLQUARK; |
794 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
853 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
795 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
854 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
796 | XrmEnumOneLevel, rxvt_define_key, NULL); |
855 | XrmEnumOneLevel, rxvt_define_key, (XPointer)this); |
797 | # ifdef RESFALLBACK |
856 | # ifdef RESFALLBACK |
798 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
799 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
800 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
857 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
801 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
802 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
858 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
803 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
859 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
804 | XrmEnumOneLevel, rxvt_define_key, NULL); |
860 | XrmEnumOneLevel, rxvt_define_key, (XPointer)this); |
805 | # endif |
861 | # endif |
806 | # endif |
862 | # endif |
807 | |
863 | |
808 | #endif /* NO_RESOURCES */ |
864 | #endif /* NO_RESOURCES */ |
809 | } |
865 | } |