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.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC vs.
Revision 1.168 by root, Wed Jun 6 11:46:11 2012 UTC

… …
46 */ 46 */
47 47
48/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
49#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
50 {0, Optflag_Info, -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}
51 54
52/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
53#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
54 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
55 58
… …
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 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"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
194#ifdef BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
195 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197# if ENABLE_EWMH 200# if ENABLE_EWMH
198 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
199# endif 202# endif
… …
204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 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"),
208#endif 211#endif
209#ifdef USE_XIM 212#if USE_XIM
210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
211 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"),
212 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"),
213 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"),
214#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
267#endif 270#endif
268#if ISO_14755 271#if ISO_14755
269 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
270 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),
271#endif 274#endif
272#ifdef HAVE_AFTERIMAGE 275#ifndef NO_RESOURCES
273 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"),
274#endif 280#endif
275 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
276 }; 282 };
277 283
278#undef INFO 284#undef INFO
285#undef RINFO
279#undef STRG 286#undef STRG
280#undef RSTRG 287#undef RSTRG
281#undef SWCH 288#undef SWCH
282#undef BOOL 289#undef BOOL
283 290
… …
326#endif 333#endif
327#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 335 "transparent,"
329 "tint," 336 "tint,"
330#endif 337#endif
331#if HAVE_AFTERIMAGE
332 "afterimage,"
333#endif
334#if HAVE_PIXBUF 338#if HAVE_PIXBUF
335 "pixbuf," 339 "pixbuf,"
336#endif 340#endif
337#if defined(USE_XIM) 341#if defined(USE_XIM)
338 "XIM," 342 "XIM,"
… …
380#if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
381 "+xterm" 385 "+xterm"
382#endif 386#endif
383 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
384 388
385#define INDENT 18 389#define INDENT 28
386 390
387const char rxvt_term::resval_undef [] = "<undef>"; 391const char rxvt_term::resval_undef [] = "<undef>";
388const char rxvt_term::resval_on [] = "on"; 392const char rxvt_term::resval_on [] = "on";
389const char rxvt_term::resval_off [] = "off"; 393const char rxvt_term::resval_off [] = "off";
390 394
391/*{{{ usage: */ 395/*{{{ usage: */
392/*----------------------------------------------------------------------*/ 396/*----------------------------------------------------------------------*/
393static void 397void
394rxvt_usage (int type) 398rxvt_term::rxvt_usage (int type)
395{ 399{
396 unsigned int i, col; 400 unsigned int i, col;
397 401
398 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
399 403
… …
407 { 411 {
408 int len = 0; 412 int len = 0;
409 413
410 if (optList[i].arg) 414 if (optList[i].arg)
411 len = strlen (optList[i].arg) + 1; 415 len = strlen (optList[i].arg) + 1;
416
412 assert (optList[i].opt != NULL); 417 assert (optList[i].opt != NULL);
413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 418 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
414 col += len; 419 col += len;
420
415 if (col > 79) 421 if (col > 79)
416 { 422 {
417 /* assume regular width */ 423 /* assume regular width */
418 rxvt_log ("\n"); 424 rxvt_log ("\n");
419 col = 1 + len; 425 col = 1 + len;
420 } 426 }
421 427
422 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 428 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
429
423 if (optList[i].arg) 430 if (optList[i].arg)
424 rxvt_log (" %s]", optList[i].arg); 431 rxvt_log (" %s]", optList[i].arg);
425 else 432 else
426 rxvt_log ("]"); 433 rxvt_log ("]");
427 } 434 }
… …
440 + (optList_isBool (i) ? 0 : 2)), 447 + (optList_isBool (i) ? 0 : 2)),
441 (optList[i].arg ? optList[i].arg : ""), 448 (optList[i].arg ? optList[i].arg : ""),
442 (optList_isBool (i) ? "turn on/off " : ""), 449 (optList_isBool (i) ? "turn on/off " : ""),
443 optList[i].desc); 450 optList[i].desc);
444 } 451 }
452
453#if ENABLE_PERL
454 rxvt_perl.init (this);
455 rxvt_perl.usage (this, 1);
456#endif
457
445 rxvt_log ("\n --help to list long-options"); 458 rxvt_log ("\n --help to list long-options");
446 break; 459 break;
447 460
448 case 2: /* full resource listing */ 461 case 2: /* full resource listing */
449 rxvt_log (" [options] [-e command args]\n\n" 462 rxvt_log (" [options] [-e command args]\n\n"
… …
451 464
452 for (i = 0; i < ecb_array_length (optList); i++) 465 for (i = 0; i < ecb_array_length (optList); i++)
453 if (optList[i].kw != NULL) 466 if (optList[i].kw != NULL)
454 rxvt_log (" %s: %*s%s\n", 467 rxvt_log (" %s: %*s%s\n",
455 optList[i].kw, 468 optList[i].kw,
456 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 469 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
457 (optList_isBool (i) ? "boolean" : optList[i].arg)); 470 (optList_isBool (i) ? "boolean" : optList[i].arg));
458#ifdef KEYSYM_RESOURCE 471
459 rxvt_log (" " "keysym.sym" ": %*s%s\n", 472#if ENABLE_PERL
460 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 473 rxvt_perl.init (this);
461 "keysym"); 474 rxvt_perl.usage (this, 2);
462#endif 475#endif
476
463 rxvt_log ("\n -help to list options"); 477 rxvt_log ("\n -help to list options");
464 break; 478 break;
465 } 479 }
466 480
467 rxvt_log ("\n\n"); 481 rxvt_log ("\n\n");
… …
532 * default values 546 * default values
533 */ 547 */
534 548
535 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
536 { 550 {
537 if (flag && i+1 == argc) 551 if (flag && i + 1 == argc)
538 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
539 553
540 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
541 } 555 }
542 } 556 }
… …
550 } 564 }
551 } 565 }
552#ifndef NO_RESOURCES 566#ifndef NO_RESOURCES
553 else if (!strcmp (opt, "xrm")) 567 else if (!strcmp (opt, "xrm"))
554 { 568 {
555 if (i+1 < argc) 569 if (i + 1 < argc)
556 XrmPutLineResource (&option_db, argv[++i]); 570 XrmPutLineResource (&option_db, argv[++i]);
557 } 571 }
558#endif 572#endif
559#ifdef KEYSYM_RESOURCE 573#ifdef KEYSYM_RESOURCE
560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
561 { 575 {
562 if (i+1 < argc) 576 if (i + 1 < argc)
563 { 577 {
564 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);
565 sprintf (res, "*.%s: %s\n", opt, argv[i]); 579 sprintf (res, "*.%s: %s\n", opt, argv[i]);
566 XrmPutLineResource (&option_db, res); 580 XrmPutLineResource (&option_db, res);
567 } 581 }
568 } 582 }
569#endif 583#endif
570 else if (!strcmp (opt, "e")) 584 else if (!strcmp (opt, "e"))
571 { 585 {
572 if (i+1 == argc) 586 if (i + 1 < argc)
573 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
574
575 return (const char **)argv + i + 1; 587 return (const char **)argv + i + 1;
588
589 rxvt_warn ("option '-e' requires an argument, aborting.\n");
590 bad_option = 1;
576 } 591 }
577 else 592 else
578 { 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]);
579 bad_option = 1; 604 bad_option = 1;
605 }
606 else
607 ++i;
608 }
609 }
610 else
611#endif
612 {
580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 613 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
614 bad_option = 1;
615 }
581 } 616 }
582 } 617 }
583 618
584 if (bad_option) 619 if (bad_option)
585 rxvt_usage (0); 620 rxvt_usage (0);
… …
761 /* 796 /*
762 * Query resources for options that affect us 797 * Query resources for options that affect us
763 */ 798 */
764 for (int entry = 0; entry < ecb_array_length (optList); entry++) 799 for (int entry = 0; entry < ecb_array_length (optList); entry++)
765 { 800 {
766 int s;
767 const char *kw = optList[entry].kw; 801 const char *kw = optList[entry].kw;
768 802
769 if (kw == NULL || rs[optList[entry].doff] != NULL) 803 if (kw == NULL || rs[optList[entry].doff] != NULL)
770 continue; // previously set 804 continue; // previously set
771 805
… …
777 allocated.push_back ((void *)p); 811 allocated.push_back ((void *)p);
778 rs[optList[entry].doff] = p; 812 rs[optList[entry].doff] = p;
779 813
780 if (optList_isBool (entry)) 814 if (optList_isBool (entry))
781 { 815 {
782 s = strcasecmp (p, "TRUE") == 0 816 bool s = parse_bool_resource (p);
783 || strcasecmp (p, "YES") == 0
784 || strcasecmp (p, "ON") == 0
785 || strcasecmp (p, "1") == 0;
786 817
787 if (optList_isReverse (entry)) 818 if (optList_isReverse (entry))
788 s = !s; 819 s = !s;
789 820
790 set_option (optList[entry].index, s); 821 set_option (optList[entry].index, s);
… …
795} 826}
796 827
797void 828void
798rxvt_term::extract_keysym_resources () 829rxvt_term::extract_keysym_resources ()
799{ 830{
800#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 || defined BG_IMAGE_FROM_FILE)
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{
801 /* 841 /*
802 * [R5 or later]: enumerate the resource database 842 * [R5 or later]: enumerate the resource database
803 */ 843 */
804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy); 844 XrmDatabase database = XrmGetDatabase (dpy);
806 XrmName name_prefix[3]; 845 XrmName name_prefix[3];
807 XrmClass class_prefix[3]; 846 XrmClass class_prefix[3];
808 847
809 name_prefix[0] = XrmStringToName (rs[Rs_name]); 848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
810 name_prefix[1] = XrmStringToName ("keysym"); 849 name_prefix[1] = XrmStringToName (n_prefix);
811 name_prefix[2] = NULLQUARK; 850 name_prefix[2] = NULLQUARK;
812 class_prefix[0] = XrmStringToName (RESCLASS); 851 class_prefix[0] = XrmStringToName (RESCLASS);
813 class_prefix[1] = XrmStringToName ("Keysym"); 852 class_prefix[1] = XrmStringToName (c_prefix);
814 class_prefix[2] = NULLQUARK; 853 class_prefix[2] = NULLQUARK;
815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
816 XrmEnumerateDatabase (database, name_prefix, class_prefix, 855 XrmEnumerateDatabase (database, name_prefix, class_prefix,
817 XrmEnumOneLevel, rxvt_define_key, NULL); 856 mode, proc, NULL);
818# ifdef RESFALLBACK 857# ifdef RESFALLBACK
819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 858 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
821 XrmEnumerateDatabase (database, name_prefix, class_prefix, 860 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL); 861 mode, proc, NULL);
823# endif 862# endif
824# endif
825
826#endif /* NO_RESOURCES */
827} 863}
864#endif
828 865
829/*----------------------- end-of-file (C source) -----------------------*/ 866/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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