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.113 by root, Tue Aug 28 17:26:52 2007 UTC vs.
Revision 1.125 by ayin, Sun Nov 25 11:23:18 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 == Color_bg || color == Color_transparent) 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 if (color >= 0) 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 }
248} 263}
249 264
250///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
251
252#include "table/linedraw.h"
253 266
254struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font {
255 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
256 269
257 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
293 return false; 306 return false;
294 307
295 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
296 return true; 309 return true;
297 310
311#ifdef BUILTIN_GLYPHS
298 if (unicode >= 0x2500 && unicode <= 0x259f && 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs)) 313 !term->option (Opt_skipBuiltinGlyphs))
300 return true; 314 return true;
315#endif
301 316
302 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
303 return true; 318 return true;
304 319
305 switch (unicode) 320 switch (unicode)
… …
341 ; 356 ;
342 357
343 int width = text - tp; 358 int width = text - tp;
344 int fwidth = term->fwidth * width; 359 int fwidth = term->fwidth * width;
345 360
361#ifdef BUILTIN_GLYPHS
346 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
347 { 363 {
364# include "table/linedraw.h"
348 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
349 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
350 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
351 368
352 int W = fwidth; 369 int W = fwidth;
… …
390 407
391 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
392 if (a) 409 if (a)
393 { 410 {
394 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395 412
396 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
399 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
400 417
… …
419 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
420 break; 437 break;
421 } 438 }
422 } 439 }
423 } 440 }
441#else
442 if (0)
443 ;
444#endif
424#if ENABLE_COMBINING 445#if ENABLE_COMBINING
425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426 { 447 {
427 min_it (width, 2); // we only support wcwidth up to 2 448 min_it (width, 2); // we only support wcwidth up to 2
428 449
… …
497 unsigned long value; 518 unsigned long value;
498 519
499 if (XGetFontProperty (f, property, &value)) 520 if (XGetFontProperty (f, property, &value))
500 return XGetAtomName (term->dpy, value); 521 return XGetAtomName (term->dpy, value);
501 else 522 else
502 return rxvt_strdup (repl); 523 return repl ? strdup (repl) : 0;
503} 524}
504 525
505rxvt_fontprop 526rxvt_fontprop
506rxvt_font_x11::properties () 527rxvt_font_x11::properties ()
507{ 528{
… …
589 return false; 610 return false;
590} 611}
591 612
592// fix the size of scalable fonts 613// fix the size of scalable fonts
593static bool 614static bool
594replace_field (char *buf, const char *name, int index, const char old, const char *replace) 615replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
595{ 616{
596 int slashes = 0; 617 int slashes = 0;
597 const char *field, *end; 618 const char *field, *end;
598 619
599 for (const char *c = name; *c; c++) 620 for (const char *c = name; *c; c++)
… …
609 break; 630 break;
610 } 631 }
611 632
612 if (slashes >= 13 && (!old || *field == old)) 633 if (slashes >= 13 && (!old || *field == old))
613 { 634 {
614 // TODO: check for overflow in font-name 635 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
615 strncpy (buf, name, field - name); 637 strncpy (*ptr, name, len);
616 buf += field - name;
617 strcpy (buf, replace); 638 strcpy (*ptr + len, replace);
618 strcat (buf, end); 639 strcat (*ptr, end);
619 640
620 return true; 641 return true;
621 } 642 }
622 else 643 else
623 { 644 {
624 strcpy (buf, name); 645 *ptr = strdup (name);
625 646
626 return false; 647 return false;
627 } 648 }
628} 649}
629 650
… …
637 char field_str[64]; // enough for 128 bits 658 char field_str[64]; // enough for 128 bits
638 659
639 // first morph the font if required 660 // first morph the font if required
640 if (force_prop) 661 if (force_prop)
641 { 662 {
642 char fname[1024]; 663 char *fname;
643 664
644 if (name[0] != '-') 665 if (name[0] != '-')
645 { 666 {
646 f = XLoadQueryFont (disp, name); 667 f = XLoadQueryFont (disp, name);
647 668
… …
659 f = 0; 680 f = 0;
660 } 681 }
661 682
662 if (prop.weight != rxvt_fontprop::unset) 683 if (prop.weight != rxvt_fontprop::unset)
663 { 684 {
664 replace_field (fname, name, 2, 0, 685 replace_field (&fname, name, 2, 0,
665 prop.weight < rxvt_fontprop::bold 686 prop.weight < rxvt_fontprop::bold
666 ? "medium" : "bold"); 687 ? "medium" : "bold");
667 set_name (strdup (fname)); 688 set_name (fname);
668 } 689 }
669 690
670 if (prop.slant != rxvt_fontprop::unset) 691 if (prop.slant != rxvt_fontprop::unset)
671 { 692 {
672 replace_field (fname, name, 3, 0, 693 replace_field (&fname, name, 3, 0,
673 prop.slant < rxvt_fontprop::italic 694 prop.slant < rxvt_fontprop::italic
674 ? "r" : "i"); // TODO: handle "o"blique, too 695 ? "r" : "i"); // TODO: handle "o"blique, too
675 set_name (strdup (fname)); 696 set_name (fname);
676 } 697 }
677 } 698 }
678 699
679 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680 ? 0 : prop.height); 701 ? 0 : prop.height);
… …
705 font_weight *fonts = new font_weight[count]; 726 font_weight *fonts = new font_weight[count];
706 727
707 for (int i = 0; i < count; i++) 728 for (int i = 0; i < count; i++)
708 { 729 {
709 rxvt_fontprop p; 730 rxvt_fontprop p;
710 char fname[1024]; 731 char *fname;
711 732
712 int diff = 0; 733 int diff = 0;
713 734
714 if (replace_field (fname, list[i], 6, '0', field_str)) 735 if (replace_field (&fname, list[i], 6, '0', field_str))
715 diff += 10; // slightly penalize scalable fonts 736 diff += 10; // slightly penalize scalable fonts
737 else
738 {
739 free (fname);
716 else if (replace_field (fname, list[i], 11, '0', "0")) 740 if (replace_field (&fname, list[i], 11, '0', "0"))
717 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 741 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
742 }
718 743
719 if (!set_properties (p, fname)) 744 if (!set_properties (p, fname))
720 continue; 745 continue;
721 746
722 if (prop.height != rxvt_fontprop::unset 747 if (prop.height != rxvt_fontprop::unset
… …
726 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 751 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
727 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 752 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
728 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 753 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
729 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 754 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
730 755
731 fonts[i].name = strdup (fname); 756 fonts[i].name = fname;
732 fonts[i].diff = diff; 757 fonts[i].diff = diff;
733 } 758 }
734 759
735 XFreeFontNames (list); 760 XFreeFontNames (list);
736 761
… …
813 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 838 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
814 839
815 if (encm) 840 if (encm)
816 N += (f->max_byte1 - f->min_byte1) 841 N += (f->max_byte1 - f->min_byte1)
817 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 842 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818 843
819 while (N) 844 while (N)
820 { 845 {
821 if (f->per_char[N].width > width) 846 if (f->per_char[N].width > width)
822 width = f->per_char[N].width; 847 width = f->per_char[N].width;
823 848
… …
975 else 1000 else
976 { 1001 {
977 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1002 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978 1003
979 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1004 XChangeGC (disp, gc, GCForeground | GCFont, &v);
980 1005
981 if (slow) 1006 if (slow)
982 { 1007 {
983 do 1008 do
984 { 1009 {
985 if (xc->byte1 || xc->byte2) 1010 if (xc->byte1 || xc->byte2)
… …
1007 else 1032 else
1008 { 1033 {
1009 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1034 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010 1035
1011 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1036 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1012 1037
1013 if (slow) 1038 if (slow)
1014 { 1039 {
1015 do 1040 do
1016 { 1041 {
1017 if (*xc) 1042 if (*xc)
… …
1043 1068
1044 void draw (rxvt_drawable &d, int x, int y, 1069 void draw (rxvt_drawable &d, int x, int y,
1045 const text_t *text, int len, 1070 const text_t *text, int len,
1046 int fg, int bg); 1071 int fg, int bg);
1047 1072
1048 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1073 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049 1074
1050protected: 1075protected:
1051 XftFont *f; 1076 XftFont *f;
1052}; 1077};
1053 1078
… …
1273 1298
1274 int w = term->fwidth * len; 1299 int w = term->fwidth * len;
1275 int h = term->fheight; 1300 int h = term->fheight;
1276 1301
1277 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1278 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1279 * good idea from the perspective of packaging for wide variety of user configs. 1304 * good idea from the perspective of packaging for wide variety of user configs.
1280 */ 1305 */
1281 bool buffered = true 1306 bool buffered = true
1282#ifdef FORCE_UNBUFFERED_XFT 1307#ifdef FORCE_UNBUFFERED_XFT
1283 && bg >= 0 1308 && bg >= 0
… …
1295 int cwidth = term->fwidth; 1320 int cwidth = term->fwidth;
1296 FcChar32 fc = *text++; len--; 1321 FcChar32 fc = *text++; len--;
1297 1322
1298 while (len && *text == NOCHAR) 1323 while (len && *text == NOCHAR)
1299 text++, len--, cwidth += term->fwidth; 1324 text++, len--, cwidth += term->fwidth;
1300 1325
1301 if (fc != ' ') // skip spaces 1326 if (fc != ' ') // skip spaces
1302 { 1327 {
1303 FT_UInt glyph = XftCharIndex (disp, f, fc); 1328 FT_UInt glyph = XftCharIndex (disp, f, fc);
1304 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1329 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1305 1330
… …
1316 x_ += cwidth; 1341 x_ += cwidth;
1317 } 1342 }
1318 1343
1319 if (buffered) 1344 if (buffered)
1320 { 1345 {
1346 bool back_rendered = false;
1321 if (ep != enc) 1347 if (ep != enc)
1322 { 1348 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 bool back_rendered = false;
1325 1350
1326#ifdef HAVE_BG_PIXMAP 1351#ifdef HAVE_BG_PIXMAP
1327 if (term->bgPixmap.pixmap) 1352 if (term->bgPixmap.pixmap)
1328 { 1353 {
1329 Picture dst = 0; 1354 Picture dst = 0;
1355
1330 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1331 dst = XftDrawPicture(d2); 1357 dst = XftDrawPicture (d2);
1332 1358
1333 if (bg < 0 || dst != 0) 1359 if (bg < 0 || dst != 0)
1334 { 1360 {
1361 int src_x = x, src_y = y ;
1362
1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y;
1367 }
1368
1335 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w 1369 if (term->bgPixmap.pmap_width >= src_x+w
1336 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) 1370 && term->bgPixmap.pmap_height >= src_y+h)
1337 { 1371 {
1338 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1339 x + term->window_vt_x, y + term->window_vt_y,
1340 w, h, 0, 0); 1373 src_x, src_y, w, h, 0, 0);
1341 } 1374 }
1342 else 1375 else
1343 { 1376 {
1344 XGCValues gcv; 1377 XGCValues gcv;
1345 1378
1346 gcv.fill_style = FillTiled; 1379 gcv.fill_style = FillTiled;
1347 gcv.tile = term->bgPixmap.pixmap; 1380 gcv.tile = term->bgPixmap.pixmap;
1348 gcv.ts_x_origin = -x; 1381 gcv.ts_x_origin = -src_x;
1349 gcv.ts_y_origin = -y; 1382 gcv.ts_y_origin = -src_y;
1350 1383
1351 XChangeGC (disp, gc, 1384 XChangeGC (disp, gc,
1352 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1353 &gcv); 1386 &gcv);
1354 1387
1355 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h); 1388 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1356 1389
1357 gcv.fill_style = FillSolid; 1390 gcv.fill_style = FillSolid;
1358 XChangeGC (disp, gc, GCFillStyle, &gcv); 1391 XChangeGC (disp, gc, GCFillStyle, &gcv);
1359 } 1392 }
1360 1393
… …
1367 back_rendered = true; 1400 back_rendered = true;
1368 } 1401 }
1369 } 1402 }
1370#endif 1403#endif
1371 1404
1372 if(bg >= 0 && !back_rendered) 1405 if (bg >= 0 && !back_rendered)
1373 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1374 1407
1375 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1376 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1377 } 1410 }
… …
1422 1455
1423rxvt_font * 1456rxvt_font *
1424rxvt_fontset::new_font (const char *name, codeset cs) 1457rxvt_fontset::new_font (const char *name, codeset cs)
1425{ 1458{
1426 rxvt_font *f; 1459 rxvt_font *f;
1427 1460
1428 if (!name || !*name) 1461 if (!name || !*name)
1429 { 1462 {
1430 name = ""; 1463 name = "";
1431 f = new rxvt_font_default (this); 1464 f = new rxvt_font_default (this);
1432 } 1465 }
… …
1651 if (find_font (font) < 0) 1684 if (find_font (font) < 0)
1652 { 1685 {
1653 char fontname[4096]; 1686 char fontname[4096];
1654 sprintf (fontname, "xft:%-.4090s", font); 1687 sprintf (fontname, "xft:%-.4090s", font);
1655 1688
1656 fonts.push_back (new_font (fontname, CS_UNICODE)); 1689 fonts.push_back (new_font (fontname, CS_UNICODE));
1657 } 1690 }
1658 1691
1659 free (font); 1692 free (font);
1660 } 1693 }
1661#endif 1694#endif

Diff Legend

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