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.159 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.169 by sf-exg, Wed Jun 6 22:00:20 2012 UTC

… …
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 */
… …
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"),
194# if ENABLE_EWMH 200# if ENABLE_EWMH
195 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
196# endif 202# endif
… …
201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
205#endif 211#endif
206#ifdef USE_XIM 212#if USE_XIM
207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
208 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
209 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
211#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
264#endif 270#endif
265#if ISO_14755 271#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 273 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
268#endif 274#endif
269#ifdef HAVE_AFTERIMAGE 275#ifndef NO_RESOURCES
270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 RINFO ("xrm", "string"),
277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
271#endif 280#endif
272 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
273 }; 282 };
274 283
275#undef INFO 284#undef INFO
285#undef RINFO
276#undef STRG 286#undef STRG
277#undef RSTRG 287#undef RSTRG
278#undef SWCH 288#undef SWCH
279#undef BOOL 289#undef BOOL
280 290
… …
323#endif 333#endif
324#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
325 "transparent," 335 "transparent,"
326 "tint," 336 "tint,"
327#endif 337#endif
328#if HAVE_AFTERIMAGE
329 "afterimage,"
330#endif
331#if HAVE_PIXBUF 338#if HAVE_PIXBUF
332 "pixbuf," 339 "pixbuf,"
333#endif 340#endif
334#if defined(USE_XIM) 341#if defined(USE_XIM)
335 "XIM," 342 "XIM,"
… …
377#if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
378 "+xterm" 385 "+xterm"
379#endif 386#endif
380 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
381 388
382#define INDENT 18 389#define INDENT 28
383 390
384const char rxvt_term::resval_undef [] = "<undef>"; 391const char rxvt_term::resval_undef [] = "<undef>";
385const char rxvt_term::resval_on [] = "on"; 392const char rxvt_term::resval_on [] = "on";
386const char rxvt_term::resval_off [] = "off"; 393const char rxvt_term::resval_off [] = "off";
387 394
388/*{{{ usage: */ 395/*{{{ usage: */
389/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
390static void 397void
391rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
392{ 399{
393 unsigned int i, col; 400 unsigned int i, col;
394 401
395 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
396 403
… …
404 { 411 {
405 int len = 0; 412 int len = 0;
406 413
407 if (optList[i].arg) 414 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 415 len = strlen (optList[i].arg) + 1;
416
409 assert (optList[i].opt != NULL); 417 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 419 col += len;
420
412 if (col > 79) 421 if (col > 79)
413 { 422 {
414 /* assume regular width */ 423 /* assume regular width */
415 rxvt_log ("\n"); 424 rxvt_log ("\n");
416 col = 1 + len; 425 col = 1 + len;
417 } 426 }
418 427
419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
420 if (optList[i].arg) 430 if (optList[i].arg)
421 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
422 else 432 else
423 rxvt_log ("]"); 433 rxvt_log ("]");
424 } 434 }
… …
437 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
438 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
439 (optList_isBool (i) ? "turn on/off " : ""), 449 (optList_isBool (i) ? "turn on/off " : ""),
440 optList[i].desc); 450 optList[i].desc);
441 } 451 }
452
453#if ENABLE_PERL
454 rxvt_perl.init (this);
455 rxvt_perl.usage (this, 1);
456#endif
457
442 rxvt_log ("\n --help to list long-options"); 458 rxvt_log ("\n --help to list long-options");
443 break; 459 break;
444 460
445 case 2: /* full resource listing */ 461 case 2: /* full resource listing */
446 rxvt_log (" [options] [-e command args]\n\n" 462 rxvt_log (" [options] [-e command args]\n\n"
… …
448 464
449 for (i = 0; i < ecb_array_length (optList); i++) 465 for (i = 0; i < ecb_array_length (optList); i++)
450 if (optList[i].kw != NULL) 466 if (optList[i].kw != NULL)
451 rxvt_log (" %s: %*s%s\n", 467 rxvt_log (" %s: %*s%s\n",
452 optList[i].kw, 468 optList[i].kw,
453 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 469 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
454 (optList_isBool (i) ? "boolean" : optList[i].arg)); 470 (optList_isBool (i) ? "boolean" : optList[i].arg));
455#ifdef KEYSYM_RESOURCE 471
456 rxvt_log (" " "keysym.sym" ": %*s%s\n", 472#if ENABLE_PERL
457 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 473 rxvt_perl.init (this);
458 "keysym"); 474 rxvt_perl.usage (this, 2);
459#endif 475#endif
476
460 rxvt_log ("\n -help to list options"); 477 rxvt_log ("\n -help to list options");
461 break; 478 break;
462 } 479 }
463 480
464 rxvt_log ("\n\n"); 481 rxvt_log ("\n\n");
… …
466} 483}
467 484
468/*}}} */ 485/*}}} */
469 486
470/*{{{ get command-line options before getting resources */ 487/*{{{ get command-line options before getting resources */
471void 488const char **
472rxvt_term::get_options (int argc, const char *const *argv) 489rxvt_term::get_options (int argc, const char *const *argv)
473{ 490{
474 int i, bad_option = 0; 491 int i, bad_option = 0;
475 492
476 for (i = 1; i < argc; i++) 493 for (i = 1; i < argc; i++)
… …
513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 530 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
514 || (!longopt 531 || (!longopt
515 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 532 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
516 break; 533 break;
517 534
518 if (entry < ecb_array_length (optList)) 535 if (entry < ecb_array_length (optList)
536 && !optList_isInfo (entry))
519 { 537 {
520 if (optList_isReverse (entry)) 538 if (optList_isReverse (entry))
521 flag = !flag; 539 flag = !flag;
522 540
523 if (optList_isString (entry)) 541 if (optList_isString (entry))
… …
528 * default values 546 * default values
529 */ 547 */
530 548
531 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
532 { 550 {
533 if (flag && i+1 == argc) 551 if (flag && i + 1 == argc)
534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
535 553
536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
537 } 555 }
538 } 556 }
… …
546 } 564 }
547 } 565 }
548#ifndef NO_RESOURCES 566#ifndef NO_RESOURCES
549 else if (!strcmp (opt, "xrm")) 567 else if (!strcmp (opt, "xrm"))
550 { 568 {
551 if (i+1 < argc) 569 if (i + 1 < argc)
552 XrmPutLineResource (&option_db, argv[++i]); 570 XrmPutLineResource (&option_db, argv[++i]);
553 } 571 }
554#endif 572#endif
555#ifdef KEYSYM_RESOURCE 573#ifdef KEYSYM_RESOURCE
556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
557 { 575 {
558 if (i+1 < argc) 576 if (i + 1 < argc)
559 { 577 {
560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 578 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
561 sprintf (res, "*.%s: %s\n", opt, argv[i]); 579 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res); 580 XrmPutLineResource (&option_db, res);
563 } 581 }
564 } 582 }
565#endif 583#endif
584 else if (!strcmp (opt, "e"))
585 {
586 if (i + 1 < argc)
587 return (const char **)argv + i + 1;
588
589 rxvt_warn ("option '-e' requires an argument, aborting.\n");
590 bad_option = 1;
591 }
566 else 592 else
567 { 593 {
594#if ENABLE_PERL
595 rxvt_perl.init (this);
596
597 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
598 {
599 if (flags & rxvt_perl.RESOURCE_ARG)
600 {
601 if (i + 1 == argc)
602 {
603 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
568 bad_option = 1; 604 bad_option = 1;
605 }
606 else
607 ++i;
608 }
609 }
610 else
611#endif
612 {
569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 613 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
614 bad_option = 1;
615 }
570 } 616 }
571 } 617 }
572 618
573 if (bad_option) 619 if (bad_option)
574 rxvt_usage (0); 620 rxvt_usage (0);
621
622 return 0;
575} 623}
576 624
577/*}}} */ 625/*}}} */
578 626
579#ifndef NO_RESOURCES 627#ifndef NO_RESOURCES
… …
748 /* 796 /*
749 * Query resources for options that affect us 797 * Query resources for options that affect us
750 */ 798 */
751 for (int entry = 0; entry < ecb_array_length (optList); entry++) 799 for (int entry = 0; entry < ecb_array_length (optList); entry++)
752 { 800 {
753 int s;
754 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
755 802
756 if (kw == NULL || rs[optList[entry].doff] != NULL) 803 if (kw == NULL || rs[optList[entry].doff] != NULL)
757 continue; // previously set 804 continue; // previously set
758 805
… …
764 allocated.push_back ((void *)p); 811 allocated.push_back ((void *)p);
765 rs[optList[entry].doff] = p; 812 rs[optList[entry].doff] = p;
766 813
767 if (optList_isBool (entry)) 814 if (optList_isBool (entry))
768 { 815 {
769 s = strcasecmp (p, "TRUE") == 0 816 bool s = parse_bool_resource (p);
770 || strcasecmp (p, "YES") == 0
771 || strcasecmp (p, "ON") == 0
772 || strcasecmp (p, "1") == 0;
773 817
774 if (optList_isReverse (entry)) 818 if (optList_isReverse (entry))
775 s = !s; 819 s = !s;
776 820
777 set_option (optList[entry].index, s); 821 set_option (optList[entry].index, s);
… …
782} 826}
783 827
784void 828void
785rxvt_term::extract_keysym_resources () 829rxvt_term::extract_keysym_resources ()
786{ 830{
787#ifndef NO_RESOURCES 831#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
832 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
833#endif
834}
835
836#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
837void
838rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
839 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
840{
788 /* 841 /*
789 * [R5 or later]: enumerate the resource database 842 * [R5 or later]: enumerate the resource database
790 */ 843 */
791# ifdef KEYSYM_RESOURCE
792 XrmDatabase database = XrmGetDatabase (dpy); 844 XrmDatabase database = XrmGetDatabase (dpy);
793 XrmName name_prefix[3]; 845 XrmName name_prefix[3];
794 XrmClass class_prefix[3]; 846 XrmClass class_prefix[3];
795 847
796 name_prefix[0] = XrmStringToName (rs[Rs_name]); 848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
797 name_prefix[1] = XrmStringToName ("keysym"); 849 name_prefix[1] = XrmStringToName (n_prefix);
798 name_prefix[2] = NULLQUARK; 850 name_prefix[2] = NULLQUARK;
799 class_prefix[0] = XrmStringToName (RESCLASS); 851 class_prefix[0] = XrmStringToName (RESCLASS);
800 class_prefix[1] = XrmStringToName ("Keysym"); 852 class_prefix[1] = XrmStringToName (c_prefix);
801 class_prefix[2] = NULLQUARK; 853 class_prefix[2] = NULLQUARK;
802 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
803 XrmEnumerateDatabase (database, name_prefix, class_prefix, 855 XrmEnumerateDatabase (database, name_prefix, class_prefix,
804 XrmEnumOneLevel, rxvt_define_key, NULL); 856 mode, proc, NULL);
805# ifdef RESFALLBACK 857# ifdef RESFALLBACK
806 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 858 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
807 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
808 XrmEnumerateDatabase (database, name_prefix, class_prefix, 860 XrmEnumerateDatabase (database, name_prefix, class_prefix,
809 XrmEnumOneLevel, rxvt_define_key, NULL); 861 mode, proc, NULL);
810# endif 862# endif
811# endif
812
813#endif /* NO_RESOURCES */
814} 863}
864#endif
815 865
816/*----------------------- end-of-file (C source) -----------------------*/ 866/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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