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.140 by root, Sat May 30 08:51:23 2009 UTC vs.
Revision 1.170 by root, Thu Jun 7 16:04:45 2012 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 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 2 of the License, or
… …
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)
74#define optList_size \ 78#define optList_isInfo(i) \
75 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
76 80
77static const struct 81static const struct
78 { 82 {
79 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
112#if ENABLE_TRANSPARENCY 116#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117#endif 122#endif
118#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 126#endif
… …
177#ifdef RXVT_SCROLLBAR 182#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 184#endif
180#ifdef OPTION_HC 185#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 186 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
187 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 188#endif
183#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 191 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200# if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
194#endif 203#endif
195 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 206#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
202#endif 211#endif
203#ifdef USE_XIM 212#if USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 223#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 225#endif
217#if XFT 226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
220#endif
221#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 233 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 234 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 235 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 268 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
259 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 269 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 270 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
261#endif 271#endif
262#if ISO_14755 272#if ISO_14755
273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
264#endif 275#endif
265#ifdef HAVE_AFTERIMAGE 276#ifndef NO_RESOURCES
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 277 RINFO ("xrm", "string"),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
268# if ENABLE_EWMH
269 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
270# endif 278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
271#endif 281#endif
272 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
273 }; 283 };
274 284
275#undef INFO 285#undef INFO
286#undef RINFO
276#undef STRG 287#undef STRG
277#undef RSTRG 288#undef RSTRG
278#undef SWCH 289#undef SWCH
279#undef BOOL 290#undef BOOL
280 291
… …
323#endif 334#endif
324#if defined(ENABLE_TRANSPARENCY) 335#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 336 "transparent,"
326 "tint," 337 "tint,"
327#endif 338#endif
328#if HAVE_AFTERIMAGE 339#if HAVE_PIXBUF
329 "afterimage," 340 "pixbuf,"
330#endif 341#endif
331#if defined(USE_XIM) 342#if defined(USE_XIM)
332 "XIM," 343 "XIM,"
333#endif 344#endif
334#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
… …
374#if defined(XTERM_SCROLLBAR) 385#if defined(XTERM_SCROLLBAR)
375 "+xterm" 386 "+xterm"
376#endif 387#endif
377 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
378 389
379#define INDENT 18 390#define INDENT 28
380 391
381const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
382const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
383const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
384 395
385/*{{{ usage: */ 396/*{{{ usage: */
386/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
387static void 398void
388rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
389{ 400{
390 unsigned int i, col; 401 unsigned int i, col;
391 402
392 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
393 404
394 switch (type) 405 switch (type)
395 { 406 {
396 case 0: /* brief listing */ 407 case 0: /* brief listing */
397 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
398 409
399 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
400 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
401 { 412 {
402 int len = 0; 413 int len = 0;
403 414
404 if (optList[i].arg) 415 if (optList[i].arg)
405 len = strlen (optList[i].arg) + 1; 416 len = strlen (optList[i].arg) + 1;
406#ifdef DEBUG_STRICT 417
407 assert (optList[i].opt != NULL); 418 assert (optList[i].opt != NULL);
408#endif
409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
410 col += len; 420 col += len;
421
411 if (col > 79) 422 if (col > 79)
412 { 423 {
413 /* assume regular width */ 424 /* assume regular width */
414 rxvt_log ("\n"); 425 rxvt_log ("\n");
415 col = 1 + len; 426 col = 1 + len;
416 } 427 }
417 428
418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
419 if (optList[i].arg) 431 if (optList[i].arg)
420 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
421 else 433 else
422 rxvt_log ("]"); 434 rxvt_log ("]");
423 } 435 }
424 break; 436 break;
425 437
426 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
428 440
429 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
430 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
431 { 443 {
432#ifdef DEBUG_STRICT
433 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
434#endif
435 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
436 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
437 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
438 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
439 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
440 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
441 optList[i].desc); 451 optList[i].desc);
442 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
443 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
444 break; 460 break;
445 461
446 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
447 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
448 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
449 465
450 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
451 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
452 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
453 optList[i].kw, 469 optList[i].kw,
454 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
455 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
456#ifdef KEYSYM_RESOURCE 472
457 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
458 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
459 "keysym"); 475 rxvt_perl.usage (this, 2);
460#endif 476#endif
477
461 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
462 break; 479 break;
463 } 480 }
464 481
465 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
466 rxvt_exit_failure (); 483 rxvt_exit_failure ();
467 /* NOTREACHED */
468} 484}
469 485
470/*}}} */ 486/*}}} */
471 487
472/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
473void 489const char **
474rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
475{ 491{
476 int i, bad_option = 0; 492 int i, bad_option = 0;
477 493
478 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
… …
509 525
510 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
511 rxvt_usage (0); 527 rxvt_usage (0);
512 528
513 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
514 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
515 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
516 || (!longopt 532 || (!longopt
517 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
518 break; 534 break;
519 535
520 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
521 { 538 {
522 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
523 flag = !flag; 540 flag = !flag;
524 541
525 if (optList_isString (entry)) 542 if (optList_isString (entry))
526 { 543 {
527 /* 544 /*
528 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
529 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
530 * default values 547 * default values
531 */ 548 */
532 549
533 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
534 { 551 {
535 if (flag && i+1 == argc) 552 if (flag && i + 1 == argc)
536 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
537 554
538 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
539 } 556 }
540 } 557 }
… …
548 } 565 }
549 } 566 }
550#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
551 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
552 { 569 {
553 if (i+1 < argc) 570 if (i + 1 < argc)
554 XrmPutLineResource (&option_db, argv[++i]); 571 XrmPutLineResource (&option_db, argv[++i]);
555 } 572 }
556#endif 573#endif
557#ifdef KEYSYM_RESOURCE 574#ifdef KEYSYM_RESOURCE
558 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
559 { 576 {
560 if (i+1 < argc) 577 if (i + 1 < argc)
561 { 578 {
562 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 579 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
563 sprintf (res, "*.%s: %s\n", opt, argv[i]); 580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
564 XrmPutLineResource (&option_db, res); 581 XrmPutLineResource (&option_db, res);
565 free (res);
566 } 582 }
567 } 583 }
568#endif 584#endif
585 else if (!strcmp (opt, "e"))
586 {
587 if (i + 1 < argc)
588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
592 }
569 else 593 else
570 { 594 {
595#if ENABLE_PERL
596 rxvt_perl.init (this);
597
598 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
599 {
600 if (flags & rxvt_perl.RESOURCE_ARG)
601 {
602 if (i + 1 == argc)
603 {
604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
571 bad_option = 1; 605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
610 }
611 else
612#endif
613 {
572 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
616 }
573 } 617 }
574 } 618 }
575 619
576 if (bad_option) 620 if (bad_option)
577 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
578} 624}
579 625
580/*}}} */ 626/*}}} */
581 627
582#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
587 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
588 * quarks will be something like 634 * quarks will be something like
589 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
590 * value will be a string 636 * value will be a string
591 */ 637 */
592/* ARGSUSED */ 638static int
593int
594rxvt_define_key (XrmDatabase *database UNUSED, 639rxvt_define_key (XrmDatabase *database ecb_unused,
595 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
596 XrmQuarkList quarks, 641 XrmQuarkList quarks,
597 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
598 XrmValue *value, 643 XrmValue *value,
599 XPointer closure UNUSED) 644 XPointer closure ecb_unused)
600{ 645{
601 int last; 646 int last;
602 647
603 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 648 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
604 ; 649 ;
… …
667 // parse modifiers 712 // parse modifiers
668 while (str < key) 713 while (str < key)
669 { 714 {
670 unsigned int i; 715 unsigned int i;
671 716
672 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 717 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
673 { 718 {
674 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 719 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
675 { 720 {
676 state |= keysym_vocabulary[i].value; 721 state |= keysym_vocabulary[i].value;
677 str += keysym_vocabulary[i].len; 722 str += keysym_vocabulary[i].len;
678 break; 723 break;
679 } 724 }
680 } 725 }
681 726
682 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 727 if (i >= ecb_array_length (keysym_vocabulary))
683 return -1; 728 return -1;
684 729
685 if (*str == '-') 730 if (*str == '-')
686 ++str; 731 ++str;
687 } 732 }
… …
692 // fallback on hexadecimal parsing 737 // fallback on hexadecimal parsing
693 char *end; 738 char *end;
694 sym = strtol (str, &end, 16); 739 sym = strtol (str, &end, 16);
695 if (*end) 740 if (*end)
696 return -1; 741 return -1;
697 } 742 }
698 743
744 wchar_t *ws = rxvt_mbstowcs (arg);
745 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
699 keyboard->register_user_translation (sym, state, arg); 746 keyboard->register_user_translation (sym, state, ws);
747 free (ws);
700 return 1; 748 return 1;
701} 749}
702 750
703# endif /* KEYSYM_RESOURCE */ 751# endif /* KEYSYM_RESOURCE */
704#endif /* NO_RESOURCES */ 752#endif /* NO_RESOURCES */
… …
747 XrmMergeDatabases (option_db, &database); 795 XrmMergeDatabases (option_db, &database);
748 option_db = NULL; 796 option_db = NULL;
749 /* 797 /*
750 * Query resources for options that affect us 798 * Query resources for options that affect us
751 */ 799 */
752 for (int entry = 0; entry < optList_size; entry++) 800 for (int entry = 0; entry < ecb_array_length (optList); entry++)
753 { 801 {
754 int s;
755 const char *kw = optList[entry].kw; 802 const char *kw = optList[entry].kw;
756 803
757 if (kw == NULL || rs[optList[entry].doff] != NULL) 804 if (kw == NULL || rs[optList[entry].doff] != NULL)
758 continue; // previously set 805 continue; // previously set
759 806
… …
765 allocated.push_back ((void *)p); 812 allocated.push_back ((void *)p);
766 rs[optList[entry].doff] = p; 813 rs[optList[entry].doff] = p;
767 814
768 if (optList_isBool (entry)) 815 if (optList_isBool (entry))
769 { 816 {
770 s = strcasecmp (p, "TRUE") == 0 817 bool s = parse_bool_resource (p);
771 || strcasecmp (p, "YES") == 0
772 || strcasecmp (p, "ON") == 0
773 || strcasecmp (p, "1") == 0;
774 818
775 if (optList_isReverse (entry)) 819 if (optList_isReverse (entry))
776 s = !s; 820 s = !s;
777 821
778 set_option (optList[entry].index, s); 822 set_option (optList[entry].index, s);
779 } 823 }
780 } 824 }
781 } 825 }
826#endif /* NO_RESOURCES */
827}
782 828
829void
830rxvt_term::extract_keysym_resources ()
831{
832#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
833 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
834#endif
835}
836
837#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
838void
839rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
840 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
841{
783 /* 842 /*
784 * [R5 or later]: enumerate the resource database 843 * [R5 or later]: enumerate the resource database
785 */ 844 */
786# ifdef KEYSYM_RESOURCE 845 XrmDatabase database = XrmGetDatabase (dpy);
787 XrmName name_prefix[3]; 846 XrmName name_prefix[3];
788 XrmClass class_prefix[3]; 847 XrmClass class_prefix[3];
789 848
790 name_prefix[0] = XrmStringToName (rs[Rs_name]); 849 name_prefix[0] = XrmStringToName (rs[Rs_name]);
791 name_prefix[1] = XrmStringToName ("keysym"); 850 name_prefix[1] = XrmStringToName (n_prefix);
792 name_prefix[2] = NULLQUARK; 851 name_prefix[2] = NULLQUARK;
793 class_prefix[0] = XrmStringToName (RESCLASS); 852 class_prefix[0] = XrmStringToName (RESCLASS);
794 class_prefix[1] = XrmStringToName ("Keysym"); 853 class_prefix[1] = XrmStringToName (c_prefix);
795 class_prefix[2] = NULLQUARK; 854 class_prefix[2] = NULLQUARK;
796 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 855 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
797 XrmEnumerateDatabase (database, name_prefix, class_prefix, 856 XrmEnumerateDatabase (database, name_prefix, class_prefix,
798 XrmEnumOneLevel, rxvt_define_key, NULL); 857 mode, proc, NULL);
799# ifdef RESFALLBACK 858# ifdef RESFALLBACK
800 name_prefix[0] = XrmStringToName (RESFALLBACK);
801 name_prefix[1] = XrmStringToName ("keysym");
802 class_prefix[0] = XrmStringToName (RESFALLBACK); 859 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
803 class_prefix[1] = XrmStringToName ("Keysym");
804 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 860 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
805 XrmEnumerateDatabase (database, name_prefix, class_prefix, 861 XrmEnumerateDatabase (database, name_prefix, class_prefix,
806 XrmEnumOneLevel, rxvt_define_key, NULL); 862 mode, proc, NULL);
807# endif 863# endif
808# endif
809
810#endif /* NO_RESOURCES */
811} 864}
865#endif
812 866
813/*----------------------- end-of-file (C source) -----------------------*/ 867/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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