ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/xcb/xcb.c
(Generate patch)

Comparing xcb/xcb.c (file contents):
Revision 1.3 by root, Wed Jan 28 21:17:32 2004 UTC vs.
Revision 1.4 by root, Mon Sep 27 14:27:49 2010 UTC

225 Font_GetSize (pattern, &pixel_size); 225 Font_GetSize (pattern, &pixel_size);
226 226
227 /* modify elements of font name to fit usual font names */ 227 /* modify elements of font name to fit usual font names */
228 if (!strcmp (weight, "*")) 228 if (!strcmp (weight, "*"))
229 strncpy (weight, "medium", FONT_ELEMENT_SIZE); 229 strncpy (weight, "medium", FONT_ELEMENT_SIZE);
230
230 if (!strcmp (slant, "*")) 231 if (!strcmp (slant, "*"))
231 strncpy (slant, "r", FONT_ELEMENT_SIZE); 232 strncpy (slant, "r", FONT_ELEMENT_SIZE);
233
232 if (pixel_size < 3) 234 if (pixel_size < 3)
233 pixel_size = 3; 235 pixel_size = 3;
234 else if (pixel_size > 97) 236 else if (pixel_size > 97)
235 pixel_size = 97; 237 pixel_size = 97;
236 238
245 pattern, 247 pattern,
246 weight, slant, pixel_size, 248 weight, slant, pixel_size,
247 pixel_size); 249 pixel_size);
248 pattern = pattern2; 250 pattern = pattern2;
249 } 251 }
252
250 if (*n_miss) 253 if (*n_miss)
251 XFreeStringList (*miss); 254 XFreeStringList (*miss);
255
252 if (fs) 256 if (fs)
253 XFreeFontSet (d, fs); 257 XFreeFontSet (d, fs);
254 258
255 /* create fontset */ 259 /* create fontset */
256 fs = XCreateFontSet (d, pattern, miss, n_miss, def); 260 fs = XCreateFontSet (d, pattern, miss, n_miss, def);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines