Mercurial > emacs

comparison src/xfns.c @ 83545:034f67f59091

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-479 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-480 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-481 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-482 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-483 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-484 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-485 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-153 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-154 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-155 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 12:25:18 +0000
parents 2d56e13fd23d 1fd4b3c12646
children c71725faff1a
comparison
equal deleted inserted replaced
83544:58cf725f5330 83545:034f67f59091
2027 strcat (fontsetname, xic_defaut_fontset); 2027 strcat (fontsetname, xic_defaut_fontset);
2028 } 2028 }
2029 else 2029 else
2030 { 2030 {
2031 int len; 2031 int len;
2032 char *p1 = NULL, *p2 = NULL; 2032 char *p1 = NULL, *p2 = NULL, *p3 = NULL;
2033 char *font_allcs = NULL; 2033 char *font_allcs = NULL;
2034 char *font_allfamilies = NULL; 2034 char *font_allfamilies = NULL;
2035 char *font_all = NULL; 2035 char *font_all = NULL;
2036 char *allcs = "*-*-*-*-*-*-*"; 2036 char *allcs = "*-*-*-*-*-*-*";
2037 char *allfamilies = "-*-*-"; 2037 char *allfamilies = "-*-*-";
2038 char *all = "*-*-*-*-"; 2038 char *all = "*-*-*-*-";
2039 char *base;
2039 2040
2040 for (i = 0, p = base_fontname; i < 8; p++) 2041 for (i = 0, p = base_fontname; i < 8; p++)
2041 { 2042 {
2042 if (*p == '-') 2043 if (*p == '-')
2043 { 2044 {
2044 i++; 2045 i++;
2045 if (i == 3) 2046 if (i == 3)
2046 p1 = p + 1; 2047 p1 = p + 1;
2047 else if (i == 7) 2048 else if (i == 7)
2048 p2 = p + 1; 2049 p2 = p + 1;
2050 else if (i == 6)
2051 p3 = p + 1;
2049 } 2052 }
2050 } 2053 }
2054 /* If base_fontname specifies ADSTYLE, make it a
2055 wildcard. */
2056 if (*p3 != '*')
2057 {
2058 int diff = (p2 - p3) - 2;
2059
2060 base = alloca (strlen (base_fontname) + 1);
2061 bcopy (base_fontname, base, p3 - base_fontname);
2062 base[p3 - base_fontname] = '*';
2063 base[(p3 - base_fontname) + 1] = '-';
2064 strcpy (base + (p3 - base_fontname) + 2, p2);
2065 p = base + (p - base_fontname) - diff;
2066 p1 = base + (p1 - base_fontname);
2067 p2 = base + (p2 - base_fontname) - diff;
2068 base_fontname = base;
2069 }
2070
2051 /* Build the font spec that matches all charsets. */ 2071 /* Build the font spec that matches all charsets. */
2052 len = p - base_fontname + strlen (allcs) + 1; 2072 len = p - base_fontname + strlen (allcs) + 1;
2053 font_allcs = (char *) alloca (len); 2073 font_allcs = (char *) alloca (len);
2054 bzero (font_allcs, len); 2074 bzero (font_allcs, len);
2055 bcopy (base_fontname, font_allcs, p - base_fontname); 2075 bcopy (base_fontname, font_allcs, p - base_fontname);
2056 strcat (font_allcs, allcs); 2076 strcat (font_allcs, allcs);
2057 2077
2058 /* Build the font spec that matches all families. */ 2078 /* Build the font spec that matches all families and
2079 add-styles. */
2059 len = p - p1 + strlen (allcs) + strlen (allfamilies) + 1; 2080 len = p - p1 + strlen (allcs) + strlen (allfamilies) + 1;
2060 font_allfamilies = (char *) alloca (len); 2081 font_allfamilies = (char *) alloca (len);
2061 bzero (font_allfamilies, len); 2082 bzero (font_allfamilies, len);
2062 strcpy (font_allfamilies, allfamilies); 2083 strcpy (font_allfamilies, allfamilies);
2063 bcopy (p1, font_allfamilies + strlen (allfamilies), p - p1); 2084 bcopy (p1, font_allfamilies + strlen (allfamilies), p - p1);
2120 } 2141 }
2121 2142
2122 if (!xfs) 2143 if (!xfs)
2123 { 2144 {
2124 char *fontsetname = xic_create_fontsetname (base_fontname, False); 2145 char *fontsetname = xic_create_fontsetname (base_fontname, False);
2146 char *p0 = fontsetname, *p1;
2125 2147
2126 /* New fontset. */ 2148 /* New fontset. */
2127 xfs = XCreateFontSet (FRAME_X_DISPLAY (f), 2149 /* FONTSETNAME contains a list of font names (specific fonts
2128 fontsetname, &missing_list, 2150 first, general fonts last), but giving that to XCreateFontSet
2129 &missing_count, &def_string); 2151 at once occasionally fails (bug of X?). So, we try to call
2130 if (missing_list) 2152 XCreateFontSet for each fontname. */
2131 XFreeStringList (missing_list); 2153
2154 while (p0)
2155 {
2156 p1 = strchr (p0, ',');
2157 if (p1)
2158 *p1 = '\0';
2159 xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
2160 p0, &missing_list,
2161 &missing_count, &def_string);
2162 if (missing_list)
2163 XFreeStringList (missing_list);
2164 if (xfs)
2165 break;
2166 p0 = p1 ? p1 + 1 : NULL;
2167 }
2132 xfree (fontsetname); 2168 xfree (fontsetname);
2133 } 2169 }
2134 2170
2135 if (FRAME_XIC_BASE_FONTNAME (f)) 2171 if (FRAME_XIC_BASE_FONTNAME (f))
2136 xfree (FRAME_XIC_BASE_FONTNAME (f)); 2172 xfree (FRAME_XIC_BASE_FONTNAME (f));