ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs.
Revision 1.122 by ayin, Wed Oct 31 09:55:24 2007 UTC

… …
43 const char *name; 43 const char *name;
44} fallback_fonts[] = { 44} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
48 48
49#if ENCODING_EU 49#if ENCODING_EU
50 // cyrillic 50 // cyrillic
51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
53 53
54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
67 67
68# if XFT 68# if XFT
69 { CS_KOI8_U, "xft::lang=ru" }, 69 { CS_KOI8_U, "xft::lang=ru" },
70 70
71 { CS_ISO8859_5, "xft::lang=ru" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
72 { CS_ISO8859_6, "xft::lang=ar" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
73 { CS_ISO8859_7, "xft::lang=el" }, 73 { CS_ISO8859_7, "xft::lang=el" },
74 { CS_ISO8859_8, "xft::lang=he" }, 74 { CS_ISO8859_8, "xft::lang=he" },
75 { CS_ISO8859_9, "xft::lang=tr" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
… …
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
234 dTermDisplay; 234 dTermDisplay;
235 dTermGC; 235 dTermGC;
236 236
237 if (color < 0 || color == Color_bg) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 bool done = false;
243#ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
245 {
246 Picture dst = XftDrawPicture (d);
247 if (dst != 0)
248 {
249 XClearArea (disp, d, x, y, w, h, false);
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 }
254 }
255#endif
256 if (!done)
242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
243#else 258#else
244 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
245 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
246#endif 261#endif
247 } 262 }
… …
270 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
271 286
272 return p; 287 return p;
273 } 288 }
274 289
275 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
276 { 291 {
277 width = 1; height = 1; 292 width = 1; height = 1;
278 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
279 294
280 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
… …
390 405
391 case 1: // rectangle, possibly stippled 406 case 1: // rectangle, possibly stippled
392 if (a) 407 if (a)
393 { 408 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 409 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 410
396 gcv.fill_style = FillStippled; 411 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 413 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 414 gcv.ts_y_origin = y;
400 415
… …
441 *chrs = cc->c2; 456 *chrs = cc->c2;
442 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443 ? f1 458 ? f1
444 : (*fs)[fs->find_font (cc->c2)]; 459 : (*fs)[fs->find_font (cc->c2)];
445 460
446 f2->draw (d, x, y, chrs, width, fg, -1); 461 f2->draw (d, x, y, chrs, width, fg, Color_none);
447 } 462 }
448 } 463 }
449#endif 464#endif
450 else 465 else
451 switch (t) 466 switch (t)
… …
471 486
472 void clear (); 487 void clear ();
473 488
474 rxvt_fontprop properties (); 489 rxvt_fontprop properties ();
475 490
476 bool load (const rxvt_fontprop &prop); 491 bool load (const rxvt_fontprop &prop, bool force_prop);
477 492
478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479 494
480 void draw (rxvt_drawable &d, int x, int y, 495 void draw (rxvt_drawable &d, int x, int y,
481 const text_t *text, int len, 496 const text_t *text, int len,
482 int fg, int bg); 497 int fg, int bg);
483 498
484 bool slow; // wether this is a proportional font or has other funny characteristics 499 bool slow; // wether this is a proportional font or has other funny characteristics
485 XFontStruct *f; 500 XFontStruct *f;
486 codeset cs;
487 bool enc2b, encm; 501 bool enc2b, encm;
488 502
489 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 503 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
490 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 504 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
491 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 505 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
… …
498 unsigned long value; 512 unsigned long value;
499 513
500 if (XGetFontProperty (f, property, &value)) 514 if (XGetFontProperty (f, property, &value))
501 return XGetAtomName (term->dpy, value); 515 return XGetAtomName (term->dpy, value);
502 else 516 else
503 return rxvt_strdup (repl); 517 return repl ? strdup (repl) : 0;
504} 518}
505 519
506rxvt_fontprop 520rxvt_fontprop
507rxvt_font_x11::properties () 521rxvt_font_x11::properties ()
508{ 522{
… …
627 return false; 641 return false;
628 } 642 }
629} 643}
630 644
631bool 645bool
632rxvt_font_x11::load (const rxvt_fontprop &prop) 646rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633{ 647{
634 dTermDisplay; 648 dTermDisplay;
635 649
636 clear (); 650 clear ();
637 651
638 char field_str[64]; // enough for 128 bits 652 char field_str[64]; // enough for 128 bits
639 653
640 // first morph the font if required 654 // first morph the font if required
641 if (prop.weight != rxvt_fontprop::unset 655 if (force_prop)
642 || prop.slant != rxvt_fontprop::unset)
643 { 656 {
644 char fname[1024]; 657 char fname[1024];
645 658
646 if (name[0] != '-') 659 if (name[0] != '-')
647 { 660 {
… …
661 f = 0; 674 f = 0;
662 } 675 }
663 676
664 if (prop.weight != rxvt_fontprop::unset) 677 if (prop.weight != rxvt_fontprop::unset)
665 { 678 {
666 replace_field (fname, name, 2, 0, 679 replace_field (fname, name, 2, 0,
667 prop.weight < rxvt_fontprop::bold 680 prop.weight < rxvt_fontprop::bold
668 ? "medium" : "bold"); 681 ? "medium" : "bold");
669 set_name (strdup (fname)); 682 set_name (strdup (fname));
670 } 683 }
671 684
… …
815 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 828 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816 829
817 if (encm) 830 if (encm)
818 N += (f->max_byte1 - f->min_byte1) 831 N += (f->max_byte1 - f->min_byte1)
819 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 832 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820 833
821 while (N) 834 while (N)
822 { 835 {
823 if (f->per_char[N].width > width) 836 if (f->per_char[N].width > width)
824 width = f->per_char[N].width; 837 width = f->per_char[N].width;
825 838
… …
977 else 990 else
978 { 991 {
979 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 992 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 993
981 XChangeGC (disp, gc, GCForeground | GCFont, &v); 994 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 995
983 if (slow) 996 if (slow)
984 { 997 {
985 do 998 do
986 { 999 {
987 if (xc->byte1 || xc->byte2) 1000 if (xc->byte1 || xc->byte2)
… …
1009 else 1022 else
1010 { 1023 {
1011 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1024 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012 1025
1013 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1026 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1014 1027
1015 if (slow) 1028 if (slow)
1016 { 1029 {
1017 do 1030 do
1018 { 1031 {
1019 if (*xc) 1032 if (*xc)
… …
1039 1052
1040 void clear (); 1053 void clear ();
1041 1054
1042 rxvt_fontprop properties (); 1055 rxvt_fontprop properties ();
1043 1056
1044 bool load (const rxvt_fontprop &prop); 1057 bool load (const rxvt_fontprop &prop, bool force_prop);
1045 1058
1046 void draw (rxvt_drawable &d, int x, int y, 1059 void draw (rxvt_drawable &d, int x, int y,
1047 const text_t *text, int len, 1060 const text_t *text, int len,
1048 int fg, int bg); 1061 int fg, int bg);
1049 1062
1050 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1063 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051 1064
1052protected: 1065protected:
1053 XftFont *f; 1066 XftFont *f;
1054}; 1067};
1055 1068
… …
1082 1095
1083 return p; 1096 return p;
1084} 1097}
1085 1098
1086bool 1099bool
1087rxvt_font_xft::load (const rxvt_fontprop &prop) 1100rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088{ 1101{
1089 dTermDisplay; 1102 dTermDisplay;
1090 1103
1091 clear (); 1104 clear ();
1092 1105
… …
1101 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1114 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1115 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1116 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1117
1105 if (prop.weight != rxvt_fontprop::unset 1118 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1119 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1120 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108 1121
1109 if (prop.slant != rxvt_fontprop::unset 1122 if (prop.slant != rxvt_fontprop::unset
1110 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1123 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1124 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112 1125
1113#if 0 // clipping unfortunately destroys our precious double-width-characters 1126#if 0 // clipping unfortunately destroys our precious double-width-characters
1114 // clip width, we can't do better, or can we? 1127 // clip width, we can't do better, or can we?
1115 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1274 dTermGC; 1287 dTermGC;
1275 1288
1276 int w = term->fwidth * len; 1289 int w = term->fwidth * len;
1277 int h = term->fheight; 1290 int h = term->fheight;
1278 1291
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1294 * good idea from the perspective of packaging for wide variety of user configs.
1295 */
1279 bool buffered = 0 1296 bool buffered = true
1280#ifndef FORCE_UNBUFFERED_XFT 1297#ifdef FORCE_UNBUFFERED_XFT
1281# if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1298 && bg >= 0
1282 || !term->am_transparent // we aren't transparent
1283 || term->am_pixmap_trans // we have a pixmap
1284# endif 1299#endif
1285 || bg >= 0; // we don't use a transparent bg 1300 ;
1286#endif
1287
1288 // cut trailing spaces 1301 // cut trailing spaces
1289 while (len && text [len - 1] == ' ') 1302 while (len && text [len - 1] == ' ')
1290 len--; 1303 len--;
1291 1304
1292 int x_ = buffered ? 0 : x; 1305 int x_ = buffered ? 0 : x;
… …
1297 int cwidth = term->fwidth; 1310 int cwidth = term->fwidth;
1298 FcChar32 fc = *text++; len--; 1311 FcChar32 fc = *text++; len--;
1299 1312
1300 while (len && *text == NOCHAR) 1313 while (len && *text == NOCHAR)
1301 text++, len--, cwidth += term->fwidth; 1314 text++, len--, cwidth += term->fwidth;
1302 1315
1303 if (fc != ' ') // skip spaces 1316 if (fc != ' ') // skip spaces
1304 { 1317 {
1305 FT_UInt glyph = XftCharIndex (disp, f, fc); 1318 FT_UInt glyph = XftCharIndex (disp, f, fc);
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1319 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307 1320
… …
1318 x_ += cwidth; 1331 x_ += cwidth;
1319 } 1332 }
1320 1333
1321 if (buffered) 1334 if (buffered)
1322 { 1335 {
1336 bool back_rendered = false;
1323 if (ep != enc) 1337 if (ep != enc)
1324 { 1338 {
1325 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1326 1340
1327#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1341#ifdef HAVE_BG_PIXMAP
1328 if (bg < 0 && term->am_pixmap_trans)
1329 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
1330 else if (bg < 0 && term->bgPixmap.pixmap) 1342 if (term->bgPixmap.pixmap)
1331 { 1343 {
1344 Picture dst = 0;
1345
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y;
1357 }
1358
1359 if (term->bgPixmap.pmap_width >= src_x+w
1360 && term->bgPixmap.pmap_height >= src_y+h)
1361 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0);
1364 }
1365 else
1366 {
1332 XGCValues gcv; 1367 XGCValues gcv;
1333 1368
1334 gcv.fill_style = FillTiled; 1369 gcv.fill_style = FillTiled;
1335 gcv.tile = term->pixmap; 1370 gcv.tile = term->bgPixmap.pixmap;
1336 gcv.ts_x_origin = -x; 1371 gcv.ts_x_origin = -src_x;
1337 gcv.ts_y_origin = -y; 1372 gcv.ts_y_origin = -src_y;
1338 1373
1339 GC gc2 = XCreateGC (disp, d2, 1374 XChangeGC (disp, gc,
1340 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1341 &gcv); 1376 &gcv);
1342 1377
1343 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1378 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1344 1379
1345 XFreeGC (disp, gc2); 1380 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 }
1383
1384 if (bg >= 0)
1385 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1387 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 }
1346 } 1392 }
1347 else
1348#endif 1393#endif
1394
1395 if (bg >= 0 && !back_rendered)
1349 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1350 1397
1351 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1352 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1353 } 1400 }
… …
1379void 1426void
1380rxvt_fontset::clear () 1427rxvt_fontset::clear ()
1381{ 1428{
1382 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1383 = rxvt_fontprop::unset; 1430 = rxvt_fontprop::unset;
1431 force_prop = false;
1384 1432
1385 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1386 FONT_UNREF (*i); 1434 FONT_UNREF (*i);
1387 1435
1388 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1397 1445
1398rxvt_font * 1446rxvt_font *
1399rxvt_fontset::new_font (const char *name, codeset cs) 1447rxvt_fontset::new_font (const char *name, codeset cs)
1400{ 1448{
1401 rxvt_font *f; 1449 rxvt_font *f;
1402 1450
1403 if (!name || !*name) 1451 if (!name || !*name)
1404 { 1452 {
1405 name = ""; 1453 name = "";
1406 f = new rxvt_font_default (this); 1454 f = new rxvt_font_default (this);
1407 } 1455 }
… …
1500 if (fonts[i]->loaded) 1548 if (fonts[i]->loaded)
1501 return true; 1549 return true;
1502 1550
1503 fonts[i]->loaded = true; 1551 fonts[i]->loaded = true;
1504 1552
1505 if (!fonts[i]->load (prop)) 1553 if (!fonts[i]->load (prop, force_prop))
1506 { 1554 {
1507 fonts[i]->cs = CS_UNKNOWN; 1555 fonts[i]->cs = CS_UNKNOWN;
1508 return false; 1556 return false;
1509 } 1557 }
1510 1558
… …
1626 if (find_font (font) < 0) 1674 if (find_font (font) < 0)
1627 { 1675 {
1628 char fontname[4096]; 1676 char fontname[4096];
1629 sprintf (fontname, "xft:%-.4090s", font); 1677 sprintf (fontname, "xft:%-.4090s", font);
1630 1678
1631 fonts.push_back (new_font (fontname, CS_UNICODE)); 1679 fonts.push_back (new_font (fontname, CS_UNICODE));
1632 } 1680 }
1633 1681
1634 free (font); 1682 free (font);
1635 } 1683 }
1636#endif 1684#endif

Diff Legend

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