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.165 by root, Mon Jun 4 15:18:53 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
… …
325 "fade," 332 "fade,"
326#endif 333#endif
327#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
328 "transparent," 335 "transparent,"
329 "tint," 336 "tint,"
330#endif
331#if HAVE_AFTERIMAGE
332 "afterimage,"
333#endif 337#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)
… …
453 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
454 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
455 optList[i].kw, 459 optList[i].kw,
456 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
457 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (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"); 462 rxvt_log ("\n -help to list options");
464 break; 463 break;
465 } 464 }
466 465
467 rxvt_log ("\n\n"); 466 rxvt_log ("\n\n");
… …
761 /* 760 /*
762 * Query resources for options that affect us 761 * Query resources for options that affect us
763 */ 762 */
764 for (int entry = 0; entry < ecb_array_length (optList); entry++) 763 for (int entry = 0; entry < ecb_array_length (optList); entry++)
765 { 764 {
766 int s;
767 const char *kw = optList[entry].kw; 765 const char *kw = optList[entry].kw;
768 766
769 if (kw == NULL || rs[optList[entry].doff] != NULL) 767 if (kw == NULL || rs[optList[entry].doff] != NULL)
770 continue; // previously set 768 continue; // previously set
771 769
… …
777 allocated.push_back ((void *)p); 775 allocated.push_back ((void *)p);
778 rs[optList[entry].doff] = p; 776 rs[optList[entry].doff] = p;
779 777
780 if (optList_isBool (entry)) 778 if (optList_isBool (entry))
781 { 779 {
782 s = strcasecmp (p, "TRUE") == 0 780 bool s = parse_bool_resource (p);
783 || strcasecmp (p, "YES") == 0
784 || strcasecmp (p, "ON") == 0
785 || strcasecmp (p, "1") == 0;
786 781
787 if (optList_isReverse (entry)) 782 if (optList_isReverse (entry))
788 s = !s; 783 s = !s;
789 784
790 set_option (optList[entry].index, s); 785 set_option (optList[entry].index, s);
… …
795} 790}
796 791
797void 792void
798rxvt_term::extract_keysym_resources () 793rxvt_term::extract_keysym_resources ()
799{ 794{
800#ifndef NO_RESOURCES 795#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
796 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
797#endif
798}
799
800#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
801void
802rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
803 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
804{
801 /* 805 /*
802 * [R5 or later]: enumerate the resource database 806 * [R5 or later]: enumerate the resource database
803 */ 807 */
804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy); 808 XrmDatabase database = XrmGetDatabase (dpy);
806 XrmName name_prefix[3]; 809 XrmName name_prefix[3];
807 XrmClass class_prefix[3]; 810 XrmClass class_prefix[3];
808 811
809 name_prefix[0] = XrmStringToName (rs[Rs_name]); 812 name_prefix[0] = XrmStringToName (rs[Rs_name]);
810 name_prefix[1] = XrmStringToName ("keysym"); 813 name_prefix[1] = XrmStringToName (n_prefix);
811 name_prefix[2] = NULLQUARK; 814 name_prefix[2] = NULLQUARK;
812 class_prefix[0] = XrmStringToName (RESCLASS); 815 class_prefix[0] = XrmStringToName (RESCLASS);
813 class_prefix[1] = XrmStringToName ("Keysym"); 816 class_prefix[1] = XrmStringToName (c_prefix);
814 class_prefix[2] = NULLQUARK; 817 class_prefix[2] = NULLQUARK;
815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
816 XrmEnumerateDatabase (database, name_prefix, class_prefix, 819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
817 XrmEnumOneLevel, rxvt_define_key, NULL); 820 mode, proc, NULL);
818# ifdef RESFALLBACK 821# ifdef RESFALLBACK
819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 822 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 823 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
821 XrmEnumerateDatabase (database, name_prefix, class_prefix, 824 XrmEnumerateDatabase (database, name_prefix, class_prefix,
822 XrmEnumOneLevel, rxvt_define_key, NULL); 825 mode, proc, NULL);
823# endif 826# endif
824# endif
825
826#endif /* NO_RESOURCES */
827} 827}
828#endif
828 829
829/*----------------------- end-of-file (C source) -----------------------*/ 830/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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