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.166 by root, Tue Jun 5 19:32:29 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,"
… …
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 }
… …
453 if (optList[i].kw != NULL) 460 if (optList[i].kw != NULL)
454 rxvt_log (" %s: %*s%s\n", 461 rxvt_log (" %s: %*s%s\n",
455 optList[i].kw, 462 optList[i].kw,
456 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 463 (INDENT - strlen (optList[i].kw)), "", /* XXX */
457 (optList_isBool (i) ? "boolean" : optList[i].arg)); 464 (optList_isBool (i) ? "boolean" : optList[i].arg));
458#ifdef KEYSYM_RESOURCE
459 rxvt_log (" " "keysym.sym" ": %*s%s\n",
460 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
461 "keysym");
462#endif
463 rxvt_log ("\n -help to list options"); 465 rxvt_log ("\n -help to list options");
464 break; 466 break;
465 } 467 }
468
469#if ENABLE_PERL
470 if (type) // do not initialise perl for type == 0, as perl does not have "short" options
471 {
472 rxvt_perl.init (this);
473 rxvt_perl.usage (type);
474 }
475#endif
466 476
467 rxvt_log ("\n\n"); 477 rxvt_log ("\n\n");
468 rxvt_exit_failure (); 478 rxvt_exit_failure ();
469} 479}
470 480
… …
574 584
575 return (const char **)argv + i + 1; 585 return (const char **)argv + i + 1;
576 } 586 }
577 else 587 else
578 { 588 {
589#if ENABLE_PERL
590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1]))
593 {
594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN))
595 {
596 if (flag && i + 1 == argc)
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
598
599 ++i;
600 }
601 }
602 else
603#endif
604 {
579 bad_option = 1; 605 bad_option = 1;
580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
607 }
581 } 608 }
582 } 609 }
583 610
584 if (bad_option) 611 if (bad_option)
585 rxvt_usage (0); 612 rxvt_usage (0);
… …
761 /* 788 /*
762 * Query resources for options that affect us 789 * Query resources for options that affect us
763 */ 790 */
764 for (int entry = 0; entry < ecb_array_length (optList); entry++) 791 for (int entry = 0; entry < ecb_array_length (optList); entry++)
765 { 792 {
766 int s;
767 const char *kw = optList[entry].kw; 793 const char *kw = optList[entry].kw;
768 794
769 if (kw == NULL || rs[optList[entry].doff] != NULL) 795 if (kw == NULL || rs[optList[entry].doff] != NULL)
770 continue; // previously set 796 continue; // previously set
771 797
… …
777 allocated.push_back ((void *)p); 803 allocated.push_back ((void *)p);
778 rs[optList[entry].doff] = p; 804 rs[optList[entry].doff] = p;
779 805
780 if (optList_isBool (entry)) 806 if (optList_isBool (entry))
781 { 807 {
782 s = strcasecmp (p, "TRUE") == 0 808 bool s = parse_bool_resource (p);
783 || strcasecmp (p, "YES") == 0
784 || strcasecmp (p, "ON") == 0
785 || strcasecmp (p, "1") == 0;
786 809
787 if (optList_isReverse (entry)) 810 if (optList_isReverse (entry))
788 s = !s; 811 s = !s;
789 812
790 set_option (optList[entry].index, s); 813 set_option (optList[entry].index, s);
… …
795} 818}
796 819
797void 820void
798rxvt_term::extract_keysym_resources () 821rxvt_term::extract_keysym_resources ()
799{ 822{
800#ifndef NO_RESOURCES 823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
824 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
825#endif
826}
827
828#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
829void
830rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
831 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
832{
801 /* 833 /*
802 * [R5 or later]: enumerate the resource database 834 * [R5 or later]: enumerate the resource database
803 */ 835 */
804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy); 836 XrmDatabase database = XrmGetDatabase (dpy);
806 XrmName name_prefix[3]; 837 XrmName name_prefix[3];
807 XrmClass class_prefix[3]; 838 XrmClass class_prefix[3];
808 839
809 name_prefix[0] = XrmStringToName (rs[Rs_name]); 840 name_prefix[0] = XrmStringToName (rs[Rs_name]);
810 name_prefix[1] = XrmStringToName ("keysym"); 841 name_prefix[1] = XrmStringToName (n_prefix);
811 name_prefix[2] = NULLQUARK; 842 name_prefix[2] = NULLQUARK;
812 class_prefix[0] = XrmStringToName (RESCLASS); 843 class_prefix[0] = XrmStringToName (RESCLASS);
813 class_prefix[1] = XrmStringToName ("Keysym"); 844 class_prefix[1] = XrmStringToName (c_prefix);
814 class_prefix[2] = NULLQUARK; 845 class_prefix[2] = NULLQUARK;
815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
816 XrmEnumerateDatabase (database, name_prefix, class_prefix, 847 XrmEnumerateDatabase (database, name_prefix, class_prefix,
817 XrmEnumOneLevel, rxvt_define_key, NULL); 848 mode, proc, NULL);
818# ifdef RESFALLBACK 849# ifdef RESFALLBACK
819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
821 XrmEnumerateDatabase (database, name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL); 853 mode, proc, NULL);
823# endif 854# endif
824# endif
825
826#endif /* NO_RESOURCES */
827} 855}
856#endif
828 857
829/*----------------------- end-of-file (C source) -----------------------*/ 858/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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