ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.152 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.181 by sf-exg, Wed Sep 3 18:20:37 2014 UTC

… …
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
… …
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
75static const struct 81static 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 */
… …
90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
91 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
92 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 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"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 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"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 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"),
100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
105 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"),
106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
107 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"),
108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
110#if ENABLE_TRANSPARENCY 118#if BG_IMAGE_FROM_ROOT
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
114 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 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"), 123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
… …
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
194# if ENABLE_EWMH 203#if ENABLE_EWMH
195 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
196# endif
197#endif 205#endif
198 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
200#if ENABLE_STYLES 208#if ENABLE_STYLES
201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 210 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 211 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
204 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"),
205#endif 213#endif
206#ifdef USE_XIM 214#if USE_XIM
207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 215 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
208 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"),
209 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"),
210 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"),
211#endif /* USE_XIM */ 219#endif /* USE_XIM */
… …
216 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"),
217#if ENABLE_XEMBED 225#if ENABLE_XEMBED
218 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"),
219#endif 227#endif
220#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
223#endif
224#if ENABLE_FRILLS
225 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 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"), 235 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"), 236 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"), 237 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"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
264#endif 273#endif
265#if ISO_14755 274#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 275 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 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),
268#endif 277#endif
269#ifdef HAVE_AFTERIMAGE 278#ifndef NO_RESOURCES
270 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"),
271#endif 283#endif
272 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
273 }; 285 };
274 286
275#undef INFO 287#undef INFO
288#undef RINFO
276#undef STRG 289#undef STRG
277#undef RSTRG 290#undef RSTRG
278#undef SWCH 291#undef SWCH
279#undef BOOL 292#undef BOOL
280 293
… …
323#endif 336#endif
324#if defined(ENABLE_TRANSPARENCY) 337#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 338 "transparent,"
326 "tint," 339 "tint,"
327#endif 340#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#endif
331#if HAVE_PIXBUF 341#if HAVE_PIXBUF
332 "pixbuf," 342 "pixbuf,"
333#endif 343#endif
334#if defined(USE_XIM) 344#if defined(USE_XIM)
335 "XIM," 345 "XIM,"
… …
377#if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
378 "+xterm" 388 "+xterm"
379#endif 389#endif
380 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
381 391
382#define INDENT 18 392#define INDENT 28
383 393
384const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
385const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
386const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
387 397
388/*{{{ usage: */ 398/*{{{ usage: */
389/*----------------------------------------------------------------------*/ 399/*----------------------------------------------------------------------*/
390static void 400void
391rxvt_usage (int type) 401rxvt_term::rxvt_usage (int type)
392{ 402{
393 unsigned int i, col; 403 unsigned int i, col;
394 404
395 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 405 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
396 406
397 switch (type) 407 switch (type)
398 { 408 {
399 case 0: /* brief listing */ 409 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 410 rxvt_log (" [-help] [--help]\n");
401 411
402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) 412 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) 413 if (optList[i].desc != NULL)
404 { 414 {
405 int len = 0; 415 int len = 0;
406 416
407 if (optList[i].arg) 417 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 418 len = strlen (optList[i].arg) + 1;
419
409 assert (optList[i].opt != NULL); 420 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 421 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 422 col += len;
423
412 if (col > 79) 424 if (col > 79)
413 { 425 {
414 /* assume regular width */ 426 /* assume regular width */
415 rxvt_log ("\n"); 427 rxvt_log ("\n");
416 col = 1 + len; 428 col = 1 + len;
417 } 429 }
418 430
419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432
420 if (optList[i].arg) 433 if (optList[i].arg)
421 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
422 else 435 else
423 rxvt_log ("]"); 436 rxvt_log ("]");
424 } 437 }
425 break; 438 break;
426 439
427 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
429 442
430 for (i = 0; i < ARRAY_LENGTH(optList); i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
431 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
432 { 445 {
433 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
434 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
437 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
438 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
439 (optList_isBool (i) ? "turn on/off " : ""), 452 (optList_isBool (i) ? "turn on/off " : ""),
440 optList[i].desc); 453 optList[i].desc);
441 } 454 }
455
456#if ENABLE_PERL
457 rxvt_perl.init (this);
458 rxvt_perl.usage (this, 1);
459#endif
460
442 rxvt_log ("\n --help to list long-options"); 461 rxvt_log ("\n --help to list long-options");
443 break; 462 break;
444 463
445 case 2: /* full resource listing */ 464 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 465 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 466 "where resources (long-options) include:\n");
448 467
449 for (i = 0; i < ARRAY_LENGTH(optList); i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 471 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
455#ifdef KEYSYM_RESOURCE 474
456 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475#if ENABLE_PERL
457 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 rxvt_perl.init (this);
458 "keysym"); 477 rxvt_perl.usage (this, 2);
459#endif 478#endif
479
460 rxvt_log ("\n -help to list options"); 480 rxvt_log ("\n -help to list options");
461 break; 481 break;
462 } 482 }
463 483
464 rxvt_log ("\n\n"); 484 rxvt_log ("\n\n");
465 rxvt_exit_failure (); 485 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 486}
468 487
469/*}}} */ 488/*}}} */
470 489
471/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
472void 491const char **
473rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
474{ 493{
475 int i, bad_option = 0; 494 int i, bad_option = 0;
476 495
477 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
… …
508 527
509 if (!strcmp (opt, "h")) 528 if (!strcmp (opt, "h"))
510 rxvt_usage (0); 529 rxvt_usage (0);
511 530
512 /* feature: always try to match long-options */ 531 /* feature: always try to match long-options */
513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) 532 for (entry = 0; entry < ecb_array_length (optList); entry++)
514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 533 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
515 || (!longopt 534 || (!longopt
516 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 535 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
517 break; 536 break;
518 537
519 if (entry < ARRAY_LENGTH(optList)) 538 if (entry < ecb_array_length (optList)
539 && !optList_isInfo (entry))
520 { 540 {
521 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
522 flag = !flag; 542 flag = !flag;
523 543
524 if (optList_isString (entry)) 544 if (optList_isString (entry))
525 { 545 {
526 /* 546 /*
527 * special cases are handled in main.c:main () to allow 547 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 548 * X resources to set these values before we settle for
529 * default values 549 * default values
530 */ 550 */
531 551
532 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
533 { 553 {
534 if (flag && i+1 == argc) 554 if (flag && i + 1 == argc)
535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
536 556
537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
538 } 558 }
539 } 559 }
… …
547 } 567 }
548 } 568 }
549#ifndef NO_RESOURCES 569#ifndef NO_RESOURCES
550 else if (!strcmp (opt, "xrm")) 570 else if (!strcmp (opt, "xrm"))
551 { 571 {
552 if (i+1 < argc) 572 if (i + 1 < argc)
553 XrmPutLineResource (&option_db, argv[++i]); 573 XrmPutLineResource (&option_db, argv[++i]);
554 } 574 }
555#endif 575#endif
556#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 577 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 { 578 {
559 if (i+1 < argc) 579 if (i + 1 < argc)
560 { 580 {
561 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);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 582 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 583 XrmPutLineResource (&option_db, res);
564 } 584 }
565 } 585 }
566#endif 586#endif
587 else if (!strcmp (opt, "e"))
588 {
589 if (i + 1 < argc)
590 return (const char **)argv + i + 1;
591
592 rxvt_warn ("option '-e' requires an argument, aborting.\n");
593 bad_option = 1;
594 }
567 else 595 else
568 { 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]);
569 bad_option = 1; 607 bad_option = 1;
608 }
609 else
610 ++i;
611 }
612 }
613 else
614#endif
615 {
570 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
617 bad_option = 1;
618 }
571 } 619 }
572 } 620 }
573 621
574 if (bad_option) 622 if (bad_option)
575 rxvt_usage (0); 623 rxvt_usage (0);
624
625 return 0;
576} 626}
577 627
578/*}}} */ 628/*}}} */
579 629
580#ifndef NO_RESOURCES 630#ifndef NO_RESOURCES
581/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
582 632
583# ifdef KEYSYM_RESOURCE 633# ifdef KEYSYM_RESOURCE
634static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{
637 term->bind_action (k, v);
638}
639
584/* 640/*
585 * Define key from XrmEnumerateDatabase. 641 * Define key from XrmEnumerateDatabase.
586 * quarks will be something like 642 * quarks will be something like
587 * "rxvt" "keysym" "0xFF01" 643 * "rxvt" "keysym" "0xFF01"
588 * value will be a string 644 * value will be a string
589 */ 645 */
590int 646static int
591rxvt_define_key (XrmDatabase *database UNUSED, 647rxvt_keysym_enumerate_helper (
592 XrmBindingList bindings UNUSED, 648 XrmDatabase *database ecb_unused,
649 XrmBindingList bindings ecb_unused,
593 XrmQuarkList quarks, 650 XrmQuarkList quarks,
594 XrmRepresentation *type UNUSED, 651 XrmRepresentation *type ecb_unused,
595 XrmValue *value, 652 XrmValue *value,
596 XPointer closure UNUSED) 653 XPointer closure
654)
597{ 655{
598 int last; 656 int last;
599 657
600 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 */
601 ; 659 ;
602 660
603 last--; 661 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
604 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
605 return False; 668 return False;
606} 669}
607 670
608/* 671/*
609 * look for something like this (XK_Delete) 672 * look for something like this (XK_Delete)
… …
644 { "4", 1, Mod4Mask }, 707 { "4", 1, Mod4Mask },
645 { "5", 1, Mod5Mask }, 708 { "5", 1, Mod5Mask },
646}; 709};
647 710
648int 711int
649rxvt_term::parse_keysym (const char *str, const char *arg) 712rxvt_term::bind_action (const char *str, const char *arg)
650{ 713{
651 int sym; 714 int sym;
652 unsigned int state = 0; 715 unsigned int state = 0;
653 const char *key = strrchr (str, '-'); 716 const char *key = strrchr (str, '-');
654 717
… …
664 // parse modifiers 727 // parse modifiers
665 while (str < key) 728 while (str < key)
666 { 729 {
667 unsigned int i; 730 unsigned int i;
668 731
669 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) 732 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
670 { 733 {
671 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 734 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
672 { 735 {
673 state |= keysym_vocabulary[i].value; 736 state |= keysym_vocabulary[i].value;
674 str += keysym_vocabulary[i].len; 737 str += keysym_vocabulary[i].len;
675 break; 738 break;
676 } 739 }
677 } 740 }
678 741
679 if (i >= ARRAY_LENGTH(keysym_vocabulary)) 742 if (i >= ecb_array_length (keysym_vocabulary))
680 return -1; 743 return -1;
681 744
682 if (*str == '-') 745 if (*str == '-')
683 ++str; 746 ++str;
684 } 747 }
… …
691 sym = strtol (str, &end, 16); 754 sym = strtol (str, &end, 16);
692 if (*end) 755 if (*end)
693 return -1; 756 return -1;
694 } 757 }
695 758
759 wchar_t *ws = rxvt_mbstowcs (arg);
696 keyboard->register_user_translation (sym, state, arg); 760 keyboard->register_action (sym, state, ws);
761
762 free (ws);
697 return 1; 763 return 1;
698} 764}
699 765
700# endif /* KEYSYM_RESOURCE */ 766# endif /* KEYSYM_RESOURCE */
701#endif /* NO_RESOURCES */ 767#endif /* NO_RESOURCES */
… …
744 XrmMergeDatabases (option_db, &database); 810 XrmMergeDatabases (option_db, &database);
745 option_db = NULL; 811 option_db = NULL;
746 /* 812 /*
747 * Query resources for options that affect us 813 * Query resources for options that affect us
748 */ 814 */
749 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) 815 for (int entry = 0; entry < ecb_array_length (optList); entry++)
750 { 816 {
751 int s; 817 int s;
752 const char *kw = optList[entry].kw; 818 const char *kw = optList[entry].kw;
753 819
754 if (kw == NULL || rs[optList[entry].doff] != NULL) 820 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
774 840
775 set_option (optList[entry].index, s); 841 set_option (optList[entry].index, s);
776 } 842 }
777 } 843 }
778 } 844 }
845#endif /* NO_RESOURCES */
846}
779 847
848void
849rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
850{
851#ifndef NO_RESOURCES
780 /* 852 /*
781 * [R5 or later]: enumerate the resource database 853 * [R5 or later]: enumerate the resource database
782 */ 854 */
783# ifdef KEYSYM_RESOURCE 855# ifdef KEYSYM_RESOURCE
856 void *closure[2] = {
857 (void *)this,
858 (void *)cb,
859 };
860
861 XrmDatabase database = XrmGetDatabase (dpy);
784 XrmName name_prefix[3]; 862 XrmName name_prefix[3];
785 XrmClass class_prefix[3]; 863 XrmClass class_prefix[3];
786 864
787 name_prefix[0] = XrmStringToName (rs[Rs_name]); 865 name_prefix[0] = XrmStringToName (rs[Rs_name]);
788 name_prefix[1] = XrmStringToName ("keysym"); 866 name_prefix[1] = XrmStringToName ("keysym");
… …
790 class_prefix[0] = XrmStringToName (RESCLASS); 868 class_prefix[0] = XrmStringToName (RESCLASS);
791 class_prefix[1] = XrmStringToName ("Keysym"); 869 class_prefix[1] = XrmStringToName ("Keysym");
792 class_prefix[2] = NULLQUARK; 870 class_prefix[2] = NULLQUARK;
793 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 871 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
794 XrmEnumerateDatabase (database, name_prefix, class_prefix, 872 XrmEnumerateDatabase (database, name_prefix, class_prefix,
795 XrmEnumOneLevel, rxvt_define_key, NULL); 873 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
796# ifdef RESFALLBACK 874# ifdef RESFALLBACK
797 name_prefix[0] = XrmStringToName (RESFALLBACK);
798 name_prefix[1] = XrmStringToName ("keysym");
799 class_prefix[0] = XrmStringToName (RESFALLBACK); 875 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
800 class_prefix[1] = XrmStringToName ("Keysym");
801 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 876 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
802 XrmEnumerateDatabase (database, name_prefix, class_prefix, 877 XrmEnumerateDatabase (database, name_prefix, class_prefix,
803 XrmEnumOneLevel, rxvt_define_key, NULL); 878 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
804# endif 879# endif
805# endif 880# endif
806 881
807#endif /* NO_RESOURCES */ 882#endif /* NO_RESOURCES */
808} 883}
809 884
885void
886rxvt_term::extract_keysym_resources ()
887{
888 enumerate_keysym_resources (rxvt_define_key);
889}
890
810/*----------------------- end-of-file (C source) -----------------------*/ 891/*----------------------- end-of-file (C source) -----------------------*/
892

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines