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.149 by sf-exg, Sat Dec 18 18:17:39 2010 UTC vs.
Revision 1.196 by root, Wed Jun 23 11:24:34 2021 UTC

… …
4 * 4 *
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 <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007,2015 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
111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
112 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
113 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
114 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"),
116#endif
117#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 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"),
120#endif 121#endif
121 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
… …
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
194# if ENABLE_EWMH 192#if ENABLE_EWMH
195 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
196# endif 194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
197#endif 197#endif
198 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
200#if ENABLE_STYLES 200#if ENABLE_STYLES
201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
205#endif 205#endif
206#ifdef USE_XIM 206#if USE_XIM
207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
208 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 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"), 209 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"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
211#endif /* USE_XIM */ 211#endif /* USE_XIM */
… …
216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217#if ENABLE_XEMBED 217#if ENABLE_XEMBED
218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
219#endif 219#endif
220#if XFT 220#if XFT
221 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
222#endif
223#if ENABLE_FRILLS
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 225 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
223#endif
224#if ENABLE_FRILLS
225 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 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"), 227 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"), 228 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"), 229 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"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
264#endif 265#endif
265#if ISO_14755 266#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 268 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
268#endif 269#endif
269#ifdef HAVE_AFTERIMAGE 270#ifndef NO_RESOURCES
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 271 RINFO ("xrm", "string"),
272#endif
273#ifdef KEYSYM_RESOURCE
274 RINFO ("keysym.sym", "keysym"),
271#endif 275#endif
272 INFO ("e", "command arg ...", "command to execute") 276 INFO ("e", "command arg ...", "command to execute")
273 }; 277 };
274 278
275#undef INFO 279#undef INFO
280#undef RINFO
276#undef STRG 281#undef STRG
277#undef RSTRG 282#undef RSTRG
278#undef SWCH 283#undef SWCH
279#undef BOOL 284#undef BOOL
280 285
… …
323#endif 328#endif
324#if defined(ENABLE_TRANSPARENCY) 329#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 330 "transparent,"
326 "tint," 331 "tint,"
327#endif 332#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#endif
331#if HAVE_PIXBUF 333#if HAVE_PIXBUF
332 "pixbuf," 334 "pixbuf,"
333#endif 335#endif
334#if defined(USE_XIM) 336#if defined(USE_XIM)
335 "XIM," 337 "XIM,"
… …
377#if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
378 "+xterm" 380 "+xterm"
379#endif 381#endif
380 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
381 383
382#define INDENT 18 384#define INDENT 28
383 385
384const char rxvt_term::resval_undef [] = "<undef>"; 386const char rxvt_term::resval_undef [] = "<undef>";
385const char rxvt_term::resval_on [] = "on"; 387const char rxvt_term::resval_on [] = "on";
386const char rxvt_term::resval_off [] = "off"; 388const char rxvt_term::resval_off [] = "off";
387 389
388/*{{{ usage: */ 390/*{{{ usage: */
389/*----------------------------------------------------------------------*/ 391/*----------------------------------------------------------------------*/
390static void 392void
391rxvt_usage (int type) 393rxvt_term::rxvt_usage (int type)
392{ 394{
393 unsigned int i, col; 395 unsigned int i, col;
394 396
395 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 397 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
396 398
397 switch (type) 399 switch (type)
398 { 400 {
399 case 0: /* brief listing */ 401 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 402 rxvt_log (" [-help] [--help]\n");
401 403
402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) 404 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) 405 if (optList[i].desc != NULL)
404 { 406 {
405 int len = 0; 407 int len = 0;
406 408
407 if (optList[i].arg) 409 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 410 len = strlen (optList[i].arg) + 1;
411
409 assert (optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 414 col += len;
415
412 if (col > 79) 416 if (col > 79)
413 { 417 {
414 /* assume regular width */ 418 /* assume regular width */
415 rxvt_log ("\n"); 419 rxvt_log ("\n");
416 col = 1 + len; 420 col = 1 + len;
417 } 421 }
418 422
419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 423 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
424
420 if (optList[i].arg) 425 if (optList[i].arg)
421 rxvt_log (" %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
422 else 427 else
423 rxvt_log ("]"); 428 rxvt_log ("]");
424 } 429 }
425 break; 430 break;
426 431
427 case 1: /* full command-line listing */ 432 case 1: /* full command-line listing */
428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 433 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
429 434
430 for (i = 0; i < ARRAY_LENGTH(optList); i++) 435 for (i = 0; i < ecb_array_length (optList); i++)
431 if (optList[i].desc != NULL) 436 if (optList[i].desc != NULL)
432 { 437 {
433 assert (optList[i].opt != NULL); 438 assert (optList[i].opt != NULL);
434 rxvt_log (" %s%s %-*s%s%s\n", 439 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 440 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
437 + (optList_isBool (i) ? 0 : 2)), 442 + (optList_isBool (i) ? 0 : 2)),
438 (optList[i].arg ? optList[i].arg : ""), 443 (optList[i].arg ? optList[i].arg : ""),
439 (optList_isBool (i) ? "turn on/off " : ""), 444 (optList_isBool (i) ? "turn on/off " : ""),
440 optList[i].desc); 445 optList[i].desc);
441 } 446 }
447
448#if ENABLE_PERL
449 rxvt_perl.init (this);
450 rxvt_perl.usage (this, 1);
451#endif
452
442 rxvt_log ("\n --help to list long-options"); 453 rxvt_log ("\n --help to list long-options");
443 break; 454 break;
444 455
445 case 2: /* full resource listing */ 456 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 457 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 458 "where resources (long-options) include:\n");
448 459
449 for (i = 0; i < ARRAY_LENGTH(optList); i++) 460 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].kw != NULL) 461 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 462 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 463 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 464 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 465 (optList_isBool (i) ? "boolean" : optList[i].arg));
455#ifdef KEYSYM_RESOURCE 466
456 rxvt_log (" " "keysym.sym" ": %*s%s\n", 467#if ENABLE_PERL
457 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 468 rxvt_perl.init (this);
458 "keysym"); 469 rxvt_perl.usage (this, 2);
459#endif 470#endif
471
460 rxvt_log ("\n -help to list options"); 472 rxvt_log ("\n -help to list options");
461 break; 473 break;
462 } 474 }
463 475
464 rxvt_log ("\n\n"); 476 rxvt_log ("\n\n");
465 rxvt_exit_failure (); 477 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 478}
468 479
469/*}}} */ 480/*}}} */
470 481
471/*{{{ get command-line options before getting resources */ 482/*{{{ get command-line options before getting resources */
472void 483const char **
473rxvt_term::get_options (int argc, const char *const *argv) 484rxvt_term::get_options (int argc, const char *const *argv)
474{ 485{
475 int i, bad_option = 0; 486 int i, bad_option = 0;
476 487
477 for (i = 1; i < argc; i++) 488 for (i = 1; i < argc; i++)
… …
508 519
509 if (!strcmp (opt, "h")) 520 if (!strcmp (opt, "h"))
510 rxvt_usage (0); 521 rxvt_usage (0);
511 522
512 /* feature: always try to match long-options */ 523 /* feature: always try to match long-options */
513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) 524 for (entry = 0; entry < ecb_array_length (optList); entry++)
514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 525 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
515 || (!longopt 526 || (!longopt
516 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 527 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
517 break; 528 break;
518 529
519 if (entry < ARRAY_LENGTH(optList)) 530 if (entry < ecb_array_length (optList)
531 && !optList_isInfo (entry))
520 { 532 {
521 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
522 flag = !flag; 534 flag = !flag;
523 535
524 if (optList_isString (entry)) 536 if (optList_isString (entry))
525 { 537 {
526 /* 538 /*
527 * special cases are handled in main.c:main () to allow 539 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
529 * default values 541 * default values
530 */ 542 */
531 543
532 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
533 { 545 {
534 if (flag && i+1 == argc) 546 if (flag && i + 1 == argc)
535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 547 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
536 548
537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 549 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
538 } 550 }
539 } 551 }
… …
547 } 559 }
548 } 560 }
549#ifndef NO_RESOURCES 561#ifndef NO_RESOURCES
550 else if (!strcmp (opt, "xrm")) 562 else if (!strcmp (opt, "xrm"))
551 { 563 {
552 if (i+1 < argc) 564 if (i + 1 < argc)
553 XrmPutLineResource (&option_db, argv[++i]); 565 XrmPutLineResource (&option_db, argv[++i]);
554 } 566 }
555#endif 567#endif
556#ifdef KEYSYM_RESOURCE 568#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 569 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 { 570 {
559 if (i+1 < argc) 571 if (i + 1 < argc)
560 { 572 {
561 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 573 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 574 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 575 XrmPutLineResource (&option_db, res);
564 } 576 }
565 } 577 }
566#endif 578#endif
579 else if (!strcmp (opt, "e"))
580 {
581 if (i + 1 < argc)
582 return (const char **)argv + i + 1;
583
584 rxvt_warn ("option '-e' requires an argument, aborting.\n");
585 bad_option = 1;
586 }
567 else 587 else
568 { 588 {
589#if ENABLE_PERL
590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
593 {
594 if (flags & rxvt_perl.RESOURCE_ARG)
595 {
596 if (i + 1 == argc)
597 {
598 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
569 bad_option = 1; 599 bad_option = 1;
600 }
601 else
602 ++i;
603 }
604 }
605 else
606#endif
607 {
570 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 608 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1;
610 }
571 } 611 }
572 } 612 }
573 613
574 if (bad_option) 614 if (bad_option)
575 rxvt_usage (0); 615 rxvt_usage (0);
616
617 return 0;
576} 618}
577 619
578/*}}} */ 620/*}}} */
579 621
580#ifndef NO_RESOURCES
581/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
582 623
583# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
584/* 625static void
585 * Define key from XrmEnumerateDatabase. 626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
586 * quarks will be something like
587 * "rxvt" "keysym" "0xFF01"
588 * value will be a string
589 */
590/* ARGSUSED */
591int
592rxvt_define_key (XrmDatabase *database UNUSED,
593 XrmBindingList bindings UNUSED,
594 XrmQuarkList quarks,
595 XrmRepresentation *type UNUSED,
596 XrmValue *value,
597 XPointer closure UNUSED)
598{ 627{
599 int last; 628 term->bind_action (k, v);
600
601 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
602 ;
603
604 last--;
605 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
606 return False;
607} 629}
608 630
609/* 631/*
610 * look for something like this (XK_Delete) 632 * look for something like this (XK_Delete)
611 * rxvt*keysym.0xFFFF: "\177" 633 * rxvt*keysym.0xFFFF: "\177"
… …
645 { "4", 1, Mod4Mask }, 667 { "4", 1, Mod4Mask },
646 { "5", 1, Mod5Mask }, 668 { "5", 1, Mod5Mask },
647}; 669};
648 670
649int 671int
650rxvt_term::parse_keysym (const char *str, const char *arg) 672rxvt_term::parse_keysym (const char *str, unsigned int &state)
651{ 673{
652 int sym; 674 int sym;
653 unsigned int state = 0;
654 const char *key = strrchr (str, '-'); 675 const char *key = strrchr (str, '-');
676
677 state = 0;
655 678
656 if (!key) 679 if (!key)
657 key = str; 680 key = str;
658 else 681 else
659 key++; 682 key++;
660 683
661 // string or key is empty 684 // string or key is empty
662 if (*arg == '\0' || *key == '\0') 685 if (*key == '\0')
663 return -1; 686 return -1;
664 687
665 // parse modifiers 688 // parse modifiers
666 while (str < key) 689 while (str < key)
667 { 690 {
668 unsigned int i; 691 unsigned int i;
669 692
670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) 693 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
671 { 694 {
672 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 695 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
673 { 696 {
674 state |= keysym_vocabulary[i].value; 697 state |= keysym_vocabulary[i].value;
675 str += keysym_vocabulary[i].len; 698 str += keysym_vocabulary[i].len;
676 break; 699 break;
677 } 700 }
678 } 701 }
679 702
680 if (i >= ARRAY_LENGTH(keysym_vocabulary)) 703 if (i >= ecb_array_length (keysym_vocabulary))
681 return -1; 704 return -1;
682 705
683 if (*str == '-') 706 if (*str == '-')
684 ++str; 707 ++str;
685 } 708 }
… …
692 sym = strtol (str, &end, 16); 715 sym = strtol (str, &end, 16);
693 if (*end) 716 if (*end)
694 return -1; 717 return -1;
695 } 718 }
696 719
720 return sym;
721}
722
723int
724rxvt_term::bind_action (const char *str, const char *arg)
725{
726 int sym;
727 unsigned int state;
728
729 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
730 return -1;
731
732 wchar_t *ws = rxvt_mbstowcs (arg);
733 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); 734 keyboard->register_action (sym, state, ws);
735
736 free (ws);
698 return 1; 737 return 1;
699} 738}
700 739
701# endif /* KEYSYM_RESOURCE */ 740#endif /* KEYSYM_RESOURCE */
702#endif /* NO_RESOURCES */
703 741
704static char * 742static char *
705get_res (XrmDatabase database, const char *program, const char *option) 743get_res (XrmDatabase database, const char *program, const char *option)
706{ 744{
707 char resource[512]; 745 char resource[512];
… …
745 XrmMergeDatabases (option_db, &database); 783 XrmMergeDatabases (option_db, &database);
746 option_db = NULL; 784 option_db = NULL;
747 /* 785 /*
748 * Query resources for options that affect us 786 * Query resources for options that affect us
749 */ 787 */
750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) 788 for (int entry = 0; entry < ecb_array_length (optList); entry++)
751 { 789 {
752 int s; 790 int s;
753 const char *kw = optList[entry].kw; 791 const char *kw = optList[entry].kw;
754 792
755 if (kw == NULL || rs[optList[entry].doff] != NULL) 793 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
775 813
776 set_option (optList[entry].index, s); 814 set_option (optList[entry].index, s);
777 } 815 }
778 } 816 }
779 } 817 }
818#endif /* NO_RESOURCES */
819}
780 820
821struct rxvt_enumerate_closure
822{
823 rxvt_term *term;
824 void (*cb)(rxvt_term *, const char *, const char *);
825 int specific; // iterate over only a specific subhierarchy
826};
827
828/*
829 * Define key from XrmEnumerateDatabase.
830 * quarks will be something like
831 * "rxvt" "keysym" "0xFF01"
832 * value will be a string
833 */
834static int
835rxvt_enumerate_helper (
836 XrmDatabase *database ecb_unused,
837 XrmBindingList bindings ecb_unused,
838 XrmQuarkList quarks,
839 XrmRepresentation *type ecb_unused,
840 XrmValue *value,
841 XPointer closure
842)
843{
844 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
845
846 if (*quarks == NULLQUARK) return False;
847
848 // if the quark list starts with a tightly bound quark, we skip it,
849 // as it exactly matched the prefix. Otherwise, it matched because
850 // it started with "*", in which case we assume the prefix is part
851 // of the "*".
852 if (*bindings == XrmBindTightly)
853 {
854 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
855 if (*quarks == NULLQUARK) return False;
856 }
857
858 // specific, a bit misleadingly named, is used when a specific "subclass"
859 // is iterated over, e.g. "keysym", and is used to skip one more
860 // component, as well as all generic prefixes
861 // this is a bit of a hack, ideally, keysym (the only user) should use its
862 // own iteration function, but this ought to be less bloated
863 if (data->specific)
864 {
865 ++quarks, ++bindings;
866 if (*quarks == NULLQUARK) return False;
867 }
868
869 char *pattern;
870 if (quarks[1] == NULLQUARK)
871 pattern = XrmQuarkToString (quarks[0]); // single component, fast path
872 else
873 {
874 // multiple components, slow path - should be rare, don't optimize for speed
875 int size = 0;
876
877 for (int i = 0; quarks[i] != NULLQUARK; ++i)
878 size += strlen (XrmQuarkToString (quarks[i])) + 1;
879
880 pattern = rxvt_temp_buf<char> (size + 1);
881
882 // now print all components
883 {
884 char *cur = pattern;
885
886 for (int i = 0; quarks[i] != NULLQUARK; ++i)
887 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
888 }
889
890 ++pattern; // skip initial dot
891 }
892
893 data->cb (data->term, pattern, (char *)value->addr);
894
895 return False;
896}
897
898void
899rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
900{
781 /* 901 /*
782 * [R5 or later]: enumerate the resource database 902 * [R5 or later]: enumerate the resource database
783 */ 903 */
904 assert (!name_p == !class_p); // both must be specified, or missing
905
784# ifdef KEYSYM_RESOURCE 906#ifdef KEYSYM_RESOURCE
907 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
908
909 XrmDatabase database = XrmGetDatabase (dpy);
785 XrmName name_prefix[3]; 910 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 911 XrmClass class_prefix[3];
787 912
788 name_prefix[0] = XrmStringToName (rs[Rs_name]); 913 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
789 name_prefix[1] = XrmStringToName ("keysym");
790 name_prefix[2] = NULLQUARK; 914 name_prefix[2] = NULLQUARK;
791 class_prefix[0] = XrmStringToName (RESCLASS); 915 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
792 class_prefix[1] = XrmStringToName ("Keysym");
793 class_prefix[2] = NULLQUARK; 916 class_prefix[2] = NULLQUARK;
794 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 917
918# ifdef RESFALLBACK
919 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
795 XrmEnumerateDatabase (database, name_prefix, class_prefix, 920 XrmEnumerateDatabase (database, name_prefix, class_prefix,
796 XrmEnumOneLevel, rxvt_define_key, NULL); 921 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
797# ifdef RESFALLBACK 922# endif
798 name_prefix[0] = XrmStringToName (RESFALLBACK); 923
799 name_prefix[1] = XrmStringToName ("keysym");
800 class_prefix[0] = XrmStringToName (RESFALLBACK); 924 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
801 class_prefix[1] = XrmStringToName ("Keysym");
802 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
803 XrmEnumerateDatabase (database, name_prefix, class_prefix, 925 XrmEnumerateDatabase (database, name_prefix, class_prefix,
804 XrmEnumOneLevel, rxvt_define_key, NULL); 926 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
805# endif 927
928 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
929 XrmEnumerateDatabase (database, name_prefix, class_prefix,
930 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
806# endif 931#endif
932}
807 933
808#endif /* NO_RESOURCES */ 934void
935rxvt_term::extract_keysym_resources ()
936{
937#ifdef KEYSYM_RESOURCE
938 enumerate_keysym_resources (rxvt_define_key);
939#endif
809} 940}
810 941
811/*----------------------- end-of-file (C source) -----------------------*/ 942/*----------------------- end-of-file (C source) -----------------------*/
943

Diff Legend

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