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.150 by root, Mon Feb 21 07:41:04 2011 UTC vs.
Revision 1.190 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
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 <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,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 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 205#endif
206#ifdef HAVE_XMU
207 RSTRG (Rs_pointerShape, "pointerShape", "string"),
197#endif 208#endif
198 /* fonts: command-line option = resource name */ 209 /* fonts: command-line option = resource name */
199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
200#if ENABLE_STYLES 211#if ENABLE_STYLES
201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
205#endif 216#endif
206#ifdef USE_XIM 217#if USE_XIM
207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
208 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 219 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"), 220 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"), 221 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
211#endif /* USE_XIM */ 222#endif /* USE_XIM */
… …
216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217#if ENABLE_XEMBED 228#if ENABLE_XEMBED
218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
219#endif 230#endif
220#if XFT 231#if XFT
232 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
233#endif
234#if ENABLE_FRILLS
221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 235 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 236 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
223#endif
224#if ENABLE_FRILLS
225 RSTRG (Rs_transient_for, "transient-for", "windowid"), 237 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"), 238 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"), 239 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"), 240 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"), 241 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
264#endif 276#endif
265#if ISO_14755 277#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 278 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 279 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
268#endif 280#endif
269#ifdef HAVE_AFTERIMAGE 281#ifndef NO_RESOURCES
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 282 RINFO ("xrm", "string"),
283#endif
284#ifdef KEYSYM_RESOURCE
285 RINFO ("keysym.sym", "keysym"),
271#endif 286#endif
272 INFO ("e", "command arg ...", "command to execute") 287 INFO ("e", "command arg ...", "command to execute")
273 }; 288 };
274 289
275#undef INFO 290#undef INFO
291#undef RINFO
276#undef STRG 292#undef STRG
277#undef RSTRG 293#undef RSTRG
278#undef SWCH 294#undef SWCH
279#undef BOOL 295#undef BOOL
280 296
… …
323#endif 339#endif
324#if defined(ENABLE_TRANSPARENCY) 340#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 341 "transparent,"
326 "tint," 342 "tint,"
327#endif 343#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#endif
331#if HAVE_PIXBUF 344#if HAVE_PIXBUF
332 "pixbuf," 345 "pixbuf,"
333#endif 346#endif
334#if defined(USE_XIM) 347#if defined(USE_XIM)
335 "XIM," 348 "XIM,"
… …
377#if defined(XTERM_SCROLLBAR) 390#if defined(XTERM_SCROLLBAR)
378 "+xterm" 391 "+xterm"
379#endif 392#endif
380 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
381 394
382#define INDENT 18 395#define INDENT 28
383 396
384const char rxvt_term::resval_undef [] = "<undef>"; 397const char rxvt_term::resval_undef [] = "<undef>";
385const char rxvt_term::resval_on [] = "on"; 398const char rxvt_term::resval_on [] = "on";
386const char rxvt_term::resval_off [] = "off"; 399const char rxvt_term::resval_off [] = "off";
387 400
388/*{{{ usage: */ 401/*{{{ usage: */
389/*----------------------------------------------------------------------*/ 402/*----------------------------------------------------------------------*/
390static void 403void
391rxvt_usage (int type) 404rxvt_term::rxvt_usage (int type)
392{ 405{
393 unsigned int i, col; 406 unsigned int i, col;
394 407
395 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 408 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
396 409
397 switch (type) 410 switch (type)
398 { 411 {
399 case 0: /* brief listing */ 412 case 0: /* brief listing */
400 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
401 414
402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) 415 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
403 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
404 { 417 {
405 int len = 0; 418 int len = 0;
406 419
407 if (optList[i].arg) 420 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 421 len = strlen (optList[i].arg) + 1;
422
409 assert (optList[i].opt != NULL); 423 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 425 col += len;
426
412 if (col > 79) 427 if (col > 79)
413 { 428 {
414 /* assume regular width */ 429 /* assume regular width */
415 rxvt_log ("\n"); 430 rxvt_log ("\n");
416 col = 1 + len; 431 col = 1 + len;
417 } 432 }
418 433
419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 434 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
435
420 if (optList[i].arg) 436 if (optList[i].arg)
421 rxvt_log (" %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
422 else 438 else
423 rxvt_log ("]"); 439 rxvt_log ("]");
424 } 440 }
425 break; 441 break;
426 442
427 case 1: /* full command-line listing */ 443 case 1: /* full command-line listing */
428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
429 445
430 for (i = 0; i < ARRAY_LENGTH(optList); i++) 446 for (i = 0; i < ecb_array_length (optList); i++)
431 if (optList[i].desc != NULL) 447 if (optList[i].desc != NULL)
432 { 448 {
433 assert (optList[i].opt != NULL); 449 assert (optList[i].opt != NULL);
434 rxvt_log (" %s%s %-*s%s%s\n", 450 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
437 + (optList_isBool (i) ? 0 : 2)), 453 + (optList_isBool (i) ? 0 : 2)),
438 (optList[i].arg ? optList[i].arg : ""), 454 (optList[i].arg ? optList[i].arg : ""),
439 (optList_isBool (i) ? "turn on/off " : ""), 455 (optList_isBool (i) ? "turn on/off " : ""),
440 optList[i].desc); 456 optList[i].desc);
441 } 457 }
458
459#if ENABLE_PERL
460 rxvt_perl.init (this);
461 rxvt_perl.usage (this, 1);
462#endif
463
442 rxvt_log ("\n --help to list long-options"); 464 rxvt_log ("\n --help to list long-options");
443 break; 465 break;
444 466
445 case 2: /* full resource listing */ 467 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 468 rxvt_log (" [options] [-e command args]\n\n"
447 "where resources (long-options) include:\n"); 469 "where resources (long-options) include:\n");
448 470
449 for (i = 0; i < ARRAY_LENGTH(optList); i++) 471 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].kw != NULL) 472 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 473 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 474 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 475 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 476 (optList_isBool (i) ? "boolean" : optList[i].arg));
455#ifdef KEYSYM_RESOURCE 477
456 rxvt_log (" " "keysym.sym" ": %*s%s\n", 478#if ENABLE_PERL
457 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 479 rxvt_perl.init (this);
458 "keysym"); 480 rxvt_perl.usage (this, 2);
459#endif 481#endif
482
460 rxvt_log ("\n -help to list options"); 483 rxvt_log ("\n -help to list options");
461 break; 484 break;
462 } 485 }
463 486
464 rxvt_log ("\n\n"); 487 rxvt_log ("\n\n");
465 rxvt_exit_failure (); 488 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 489}
468 490
469/*}}} */ 491/*}}} */
470 492
471/*{{{ get command-line options before getting resources */ 493/*{{{ get command-line options before getting resources */
472void 494const char **
473rxvt_term::get_options (int argc, const char *const *argv) 495rxvt_term::get_options (int argc, const char *const *argv)
474{ 496{
475 int i, bad_option = 0; 497 int i, bad_option = 0;
476 498
477 for (i = 1; i < argc; i++) 499 for (i = 1; i < argc; i++)
… …
508 530
509 if (!strcmp (opt, "h")) 531 if (!strcmp (opt, "h"))
510 rxvt_usage (0); 532 rxvt_usage (0);
511 533
512 /* feature: always try to match long-options */ 534 /* feature: always try to match long-options */
513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) 535 for (entry = 0; entry < ecb_array_length (optList); entry++)
514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 536 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
515 || (!longopt 537 || (!longopt
516 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 538 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
517 break; 539 break;
518 540
519 if (entry < ARRAY_LENGTH(optList)) 541 if (entry < ecb_array_length (optList)
542 && !optList_isInfo (entry))
520 { 543 {
521 if (optList_isReverse (entry)) 544 if (optList_isReverse (entry))
522 flag = !flag; 545 flag = !flag;
523 546
524 if (optList_isString (entry)) 547 if (optList_isString (entry))
525 { 548 {
526 /* 549 /*
527 * special cases are handled in main.c:main () to allow 550 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 551 * X resources to set these values before we settle for
529 * default values 552 * default values
530 */ 553 */
531 554
532 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
533 { 556 {
534 if (flag && i+1 == argc) 557 if (flag && i + 1 == argc)
535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 558 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
536 559
537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 560 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
538 } 561 }
539 } 562 }
… …
547 } 570 }
548 } 571 }
549#ifndef NO_RESOURCES 572#ifndef NO_RESOURCES
550 else if (!strcmp (opt, "xrm")) 573 else if (!strcmp (opt, "xrm"))
551 { 574 {
552 if (i+1 < argc) 575 if (i + 1 < argc)
553 XrmPutLineResource (&option_db, argv[++i]); 576 XrmPutLineResource (&option_db, argv[++i]);
554 } 577 }
555#endif 578#endif
556#ifdef KEYSYM_RESOURCE 579#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 580 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 { 581 {
559 if (i+1 < argc) 582 if (i + 1 < argc)
560 { 583 {
561 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 584 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 585 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 586 XrmPutLineResource (&option_db, res);
564 } 587 }
565 } 588 }
566#endif 589#endif
590 else if (!strcmp (opt, "e"))
591 {
592 if (i + 1 < argc)
593 return (const char **)argv + i + 1;
594
595 rxvt_warn ("option '-e' requires an argument, aborting.\n");
596 bad_option = 1;
597 }
567 else 598 else
568 { 599 {
600#if ENABLE_PERL
601 rxvt_perl.init (this);
602
603 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
604 {
605 if (flags & rxvt_perl.RESOURCE_ARG)
606 {
607 if (i + 1 == argc)
608 {
609 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
569 bad_option = 1; 610 bad_option = 1;
611 }
612 else
613 ++i;
614 }
615 }
616 else
617#endif
618 {
570 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 619 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
620 bad_option = 1;
621 }
571 } 622 }
572 } 623 }
573 624
574 if (bad_option) 625 if (bad_option)
575 rxvt_usage (0); 626 rxvt_usage (0);
627
628 return 0;
576} 629}
577 630
578/*}}} */ 631/*}}} */
579 632
580#ifndef NO_RESOURCES
581/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
582 634
583# ifdef KEYSYM_RESOURCE 635#ifdef KEYSYM_RESOURCE
636static void
637rxvt_define_key (rxvt_term *term, const char *k, const char *v)
638{
639 term->bind_action (k, v);
640}
641
584/* 642/*
585 * Define key from XrmEnumerateDatabase. 643 * Define key from XrmEnumerateDatabase.
586 * quarks will be something like 644 * quarks will be something like
587 * "rxvt" "keysym" "0xFF01" 645 * "rxvt" "keysym" "0xFF01"
588 * value will be a string 646 * value will be a string
589 */ 647 */
590/* ARGSUSED */ 648static int
591int 649rxvt_keysym_enumerate_helper (
592rxvt_define_key (XrmDatabase *database UNUSED, 650 XrmDatabase *database ecb_unused,
593 XrmBindingList bindings UNUSED, 651 XrmBindingList bindings ecb_unused,
594 XrmQuarkList quarks, 652 XrmQuarkList quarks,
595 XrmRepresentation *type UNUSED, 653 XrmRepresentation *type ecb_unused,
596 XrmValue *value, 654 XrmValue *value,
597 XPointer closure UNUSED) 655 XPointer closure
656)
598{ 657{
599 int last; 658 int last;
600 659
601 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 660 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
602 ; 661 ;
603 662
604 last--; 663 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
605 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 664 void (*cb)(rxvt_term *, const char *, const char *)
665 = (void (*)(rxvt_term *, const char *, const char *))
666 (((void **)closure)[1]);
667
668 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
669
606 return False; 670 return False;
607} 671}
608 672
609/* 673/*
610 * look for something like this (XK_Delete) 674 * look for something like this (XK_Delete)
… …
645 { "4", 1, Mod4Mask }, 709 { "4", 1, Mod4Mask },
646 { "5", 1, Mod5Mask }, 710 { "5", 1, Mod5Mask },
647}; 711};
648 712
649int 713int
650rxvt_term::parse_keysym (const char *str, const char *arg) 714rxvt_term::parse_keysym (const char *str, unsigned int &state)
651{ 715{
652 int sym; 716 int sym;
653 unsigned int state = 0;
654 const char *key = strrchr (str, '-'); 717 const char *key = strrchr (str, '-');
718
719 state = 0;
655 720
656 if (!key) 721 if (!key)
657 key = str; 722 key = str;
658 else 723 else
659 key++; 724 key++;
660 725
661 // string or key is empty 726 // string or key is empty
662 if (*arg == '\0' || *key == '\0') 727 if (*key == '\0')
663 return -1; 728 return -1;
664 729
665 // parse modifiers 730 // parse modifiers
666 while (str < key) 731 while (str < key)
667 { 732 {
668 unsigned int i; 733 unsigned int i;
669 734
670 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) 735 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
671 { 736 {
672 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 737 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
673 { 738 {
674 state |= keysym_vocabulary[i].value; 739 state |= keysym_vocabulary[i].value;
675 str += keysym_vocabulary[i].len; 740 str += keysym_vocabulary[i].len;
676 break; 741 break;
677 } 742 }
678 } 743 }
679 744
680 if (i >= ARRAY_LENGTH(keysym_vocabulary)) 745 if (i >= ecb_array_length (keysym_vocabulary))
681 return -1; 746 return -1;
682 747
683 if (*str == '-') 748 if (*str == '-')
684 ++str; 749 ++str;
685 } 750 }
… …
692 sym = strtol (str, &end, 16); 757 sym = strtol (str, &end, 16);
693 if (*end) 758 if (*end)
694 return -1; 759 return -1;
695 } 760 }
696 761
762 return sym;
763}
764
765int
766rxvt_term::bind_action (const char *str, const char *arg)
767{
768 int sym;
769 unsigned int state;
770
771 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
772 return -1;
773
774 wchar_t *ws = rxvt_mbstowcs (arg);
775 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); 776 keyboard->register_action (sym, state, ws);
777
778 free (ws);
698 return 1; 779 return 1;
699} 780}
700 781
701# endif /* KEYSYM_RESOURCE */ 782#endif /* KEYSYM_RESOURCE */
702#endif /* NO_RESOURCES */
703 783
704static char * 784static char *
705get_res (XrmDatabase database, const char *program, const char *option) 785get_res (XrmDatabase database, const char *program, const char *option)
706{ 786{
707 char resource[512]; 787 char resource[512];
… …
745 XrmMergeDatabases (option_db, &database); 825 XrmMergeDatabases (option_db, &database);
746 option_db = NULL; 826 option_db = NULL;
747 /* 827 /*
748 * Query resources for options that affect us 828 * Query resources for options that affect us
749 */ 829 */
750 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) 830 for (int entry = 0; entry < ecb_array_length (optList); entry++)
751 { 831 {
752 int s; 832 int s;
753 const char *kw = optList[entry].kw; 833 const char *kw = optList[entry].kw;
754 834
755 if (kw == NULL || rs[optList[entry].doff] != NULL) 835 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
775 855
776 set_option (optList[entry].index, s); 856 set_option (optList[entry].index, s);
777 } 857 }
778 } 858 }
779 } 859 }
860#endif /* NO_RESOURCES */
861}
780 862
863void
864rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
865{
781 /* 866 /*
782 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
783 */ 868 */
784# ifdef KEYSYM_RESOURCE 869#ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
875 XrmDatabase database = XrmGetDatabase (dpy);
785 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
786 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
787 878
788 name_prefix[0] = XrmStringToName (rs[Rs_name]);
789 name_prefix[1] = XrmStringToName ("keysym"); 879 name_prefix[1] = XrmStringToName ("keysym");
790 name_prefix[2] = NULLQUARK; 880 name_prefix[2] = NULLQUARK;
791 class_prefix[0] = XrmStringToName (RESCLASS);
792 class_prefix[1] = XrmStringToName ("Keysym"); 881 class_prefix[1] = XrmStringToName ("Keysym");
793 class_prefix[2] = NULLQUARK; 882 class_prefix[2] = NULLQUARK;
883
884# ifdef RESFALLBACK
885 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
794 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 886 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
795 XrmEnumerateDatabase (database, name_prefix, class_prefix, 887 XrmEnumerateDatabase (database, name_prefix, class_prefix,
796 XrmEnumOneLevel, rxvt_define_key, NULL); 888 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
797# ifdef RESFALLBACK 889# endif
798 name_prefix[0] = XrmStringToName (RESFALLBACK); 890
799 name_prefix[1] = XrmStringToName ("keysym");
800 class_prefix[0] = XrmStringToName (RESFALLBACK); 891 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, 892 XrmEnumerateDatabase (database, name_prefix, class_prefix,
804 XrmEnumOneLevel, rxvt_define_key, NULL); 893 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
805# endif 894
895 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
896 XrmEnumerateDatabase (database, name_prefix, class_prefix,
897 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
806# endif 898#endif
899}
807 900
808#endif /* NO_RESOURCES */ 901void
902rxvt_term::extract_keysym_resources ()
903{
904#ifdef KEYSYM_RESOURCE
905 enumerate_keysym_resources (rxvt_define_key);
906#endif
809} 907}
810 908
811/*----------------------- end-of-file (C source) -----------------------*/ 909/*----------------------- end-of-file (C source) -----------------------*/
910

Diff Legend

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