--- rxvt-unicode/src/xdefaults.C 2006/01/04 05:35:34 1.70 +++ rxvt-unicode/src/xdefaults.C 2006/01/09 22:41:41 1.76 @@ -6,7 +6,7 @@ * Copyright (c) 1994 Robert Nation * - original version * Copyright (c) 1997,1998 mj olesen - * Copyright (c) 2003-2004 Marc Lehmann + * Copyright (c) 2003-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -163,7 +163,6 @@ RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), -#ifndef NO_BRIGHTCOLOR RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), @@ -172,7 +171,6 @@ RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), -#endif /* NO_BRIGHTCOLOR */ #ifndef NO_BOLD_UNDERLINE_REVERSE RSTRG (Rs_color + Color_BD, "colorBD", "color"), RSTRG (Rs_color + Color_IT, "colorIT", "color"), @@ -229,6 +227,7 @@ STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), #endif #if ENABLE_FRILLS + RSTRG (Rs_transient_for, "transient-for", "windowid"), STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), @@ -236,6 +235,7 @@ STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), + BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), #endif #ifdef POINTER_BLANK @@ -406,7 +406,7 @@ "NoResources" #else # if defined(USE_XGETDEFAULT) - "XGetDefaults" + "XGetDefault" # else ".Xdefaults" # endif @@ -575,10 +575,7 @@ fprintf (stderr, "boolean (%s,%s) = %s\n", optList[entry].opt, optList[entry].kw, flag); #endif - if (flag == On) - SET_OPTION (optList[entry].flag & Optflag_mask); - else - CLR_OPTION (optList[entry].flag & Optflag_mask); + set_option (optList[entry].flag & Optflag_mask, flag == On); if (optList[entry].doff != -1) rs[optList[entry].doff] = flag; @@ -697,7 +694,7 @@ return 0; str += n; /* skip `keysym.' */ - if ((pmodend = strchr (str, ':')) < str) + if (!(pmodend = strchr (str, ':'))) return -1; } else @@ -869,10 +866,7 @@ if (optList_isReverse (entry)) s = !s; - if (s) - SET_OPTION (optList[entry].flag & Optflag_mask); - else - CLR_OPTION (optList[entry].flag & Optflag_mask); + set_option (optList[entry].flag & Optflag_mask, s); } } @@ -888,6 +882,20 @@ # endif /* ! USE_XGETDEFAULT */ #endif /* NO_RESOURCES */ +#ifdef USE_XGETDEFAULT +char *get_res (XrmDatabase database, const char *program, const char *option) +{ + char resource[512]; + char *type; + XrmValue result; + + snprintf (resource, sizeof (resource), "%s.%s", program, option); + XrmGetResource (database, resource, resource, &type, &result); + + return result.addr; +} +#endif + /*{{{ read the resources files */ /* * using XGetDefault () or the hand-rolled replacement @@ -921,13 +929,11 @@ */ int entry; -# ifdef XrmEnumOneLevel char *displayResource, *xe; XrmName name_prefix[3]; XrmClass class_prefix[3]; XrmDatabase database, rdb1; - XrmInitialize (); database = NULL; // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 @@ -998,8 +1004,7 @@ } } - XrmSetDatabase (disp, database); -# endif + xrmdatabase = database; /* * Query resources for options that affect us @@ -1013,14 +1018,14 @@ if (kw == NULL || rs[optList[entry].doff] != NULL) continue; /* previously set */ - p = XGetDefault (disp, rs[Rs_name], kw); - p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); + p = get_res (database, rs[Rs_name], kw); + p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); if (p == NULL || (p0 && strcmp (p, p0) == 0)) { - p = XGetDefault (disp, RESCLASS, kw); + p = get_res (database, RESCLASS, kw); #ifdef RESFALLBACK if (p == NULL || (p0 && strcmp (p, p0) == 0)) - p = XGetDefault (disp, RESFALLBACK, kw); + p = get_res (database, RESFALLBACK, kw); #endif } @@ -1041,10 +1046,7 @@ if (optList_isReverse (entry)) s = !s; - if (s) - SET_OPTION (optList[entry].flag & Optflag_mask); - else - CLR_OPTION (optList[entry].flag & Optflag_mask); + set_option (optList[entry].flag & Optflag_mask, s); } } } @@ -1060,7 +1062,7 @@ class_prefix[1] = XrmStringToName ("Keysym"); class_prefix[2] = NULLQUARK; /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ - XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, + XrmEnumerateDatabase (database, name_prefix, class_prefix, XrmEnumOneLevel, rxvt_define_key, NULL); # ifdef RESFALLBACK name_prefix[0] = XrmStringToName (RESFALLBACK); @@ -1068,7 +1070,7 @@ class_prefix[0] = XrmStringToName (RESFALLBACK); class_prefix[1] = XrmStringToName ("Keysym"); /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ - XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, + XrmEnumerateDatabase (database, name_prefix, class_prefix, XrmEnumOneLevel, rxvt_define_key, NULL); # endif # endif