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.125 by ayin, Sun Nov 25 11:23:18 2007 UTC vs.
Revision 1.168 by sf-exg, Tue Dec 14 08:01:51 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 220: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 221{
219} 222}
220 223
221void 224void
222rxvt_font::set_name (char *name) 225rxvt_font::set_name (char *name_)
223{ 226{
224 if (this->name == name) 227 if (name == name_)
225 return; 228 return;
226 229
227 if (this->name) free (this->name); // let the compiler optimize 230 if (name) free (name); // let the compiler optimize
228 this->name = name; 231 name = name_;
229} 232}
230 233
231void 234void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 235rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 236{
… …
237 if (color == Color_bg || color == Color_transparent) 240 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 241 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 242 else if (color >= 0)
240 { 243 {
241#if XFT 244#if XFT
242 bool done = false; 245 Picture dst;
246
243#ifdef HAVE_BG_PIXMAP 247# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 248 if (term->bgPixmap.pixmap
245 { 249 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 250 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 251 {
249 XClearArea (disp, d, x, y, w, h, false); 252 XClearArea (disp, d, x, y, w, h, false);
253
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 254 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); 255 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 256 }
254 } 257 else
255#endif 258# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 259 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
260
258#else 261#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 264#endif
262 } 265 }
… …
449 452
450 text_t chrs[2]; 453 text_t chrs[2];
451 chrs [1] = NOCHAR; 454 chrs [1] = NOCHAR;
452 455
453 *chrs = cc->c1; 456 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 457 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
455 f1->draw (d, x, y, chrs, width, fg, bg); 458 f1->draw (d, x, y, chrs, width, fg, bg);
456 459
457 if (cc->c2 != NOCHAR) 460 if (cc->c2 != NOCHAR)
458 { 461 {
459 bool careful; 462 bool careful;
460 463
461 // prefer font of first character, for no good reasons 464 // prefer font of first character, for no good reasons
462 *chrs = cc->c2; 465 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 466 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
464 ? f1 467 ? f1
465 : (*fs)[fs->find_font (cc->c2)]; 468 : (*fs)[fs->find_font_idx (cc->c2)];
466 469
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 470 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 471 }
469 } 472 }
470#endif 473#endif
… …
483 486
484 x += fwidth; 487 x += fwidth;
485 } 488 }
486} 489}
487 490
491struct rxvt_font_overflow : rxvt_font {
492 struct rxvt_fontset *fs;
493
494 rxvt_font_overflow (rxvt_fontset *fs)
495 : rxvt_font ()
496 {
497 this->fs = fs;
498 }
499
500 rxvt_fontprop properties ()
501 {
502 rxvt_fontprop p;
503
504 p.width = p.height = 1;
505 p.ascent = rxvt_fontprop::unset;
506 p.weight = rxvt_fontprop::medium;
507 p.slant = rxvt_fontprop::roman;
508
509 return p;
510 }
511
512 bool load (const rxvt_fontprop &prop, bool force_prop)
513 {
514 width = 1; height = 1;
515 ascent = 1; descent = 0;
516
517 set_name (strdup ("built-in rendition overflow font"));
518
519 return true;
520 }
521
522 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
523 {
524 return false;
525 }
526
527 void draw (rxvt_drawable &d, int x, int y,
528 const text_t *text, int len,
529 int fg, int bg)
530 {
531 while (len--)
532 {
533 int fid = fs->find_font_idx (*text);
534 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
535 ++text;
536 x += term->fwidth;
537 }
538 }
539};
540
488///////////////////////////////////////////////////////////////////////////// 541/////////////////////////////////////////////////////////////////////////////
489 542
490struct rxvt_font_x11 : rxvt_font { 543struct rxvt_font_x11 : rxvt_font {
491 rxvt_font_x11 () { f = 0; } 544 rxvt_font_x11 () { f = 0; }
492 545
… …
500 553
501 void draw (rxvt_drawable &d, int x, int y, 554 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 555 const text_t *text, int len,
503 int fg, int bg); 556 int fg, int bg);
504 557
505 bool slow; // wether this is a proportional font or has other funny characteristics 558 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 559 XFontStruct *f;
507 bool enc2b, encm; 560 bool enc2b, encm;
508 561
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 562 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
510 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 563 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
632 685
633 if (slashes >= 13 && (!old || *field == old)) 686 if (slashes >= 13 && (!old || *field == old))
634 { 687 {
635 size_t len = field - name; 688 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); 689 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 strncpy (*ptr, name, len); 690 memcpy (*ptr, name, len);
638 strcpy (*ptr + len, replace); 691 strcpy (*ptr + len, replace);
639 strcat (*ptr, end); 692 strcat (*ptr, end);
640 693
641 return true; 694 return true;
642 } 695 }
… …
793 return false; 846 return false;
794 847
795 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
796 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
797 850
851 cs = CS_UNKNOWN;
852
798 if (registry && encoding) 853 if (registry && encoding)
799 { 854 {
800 char charset[64]; 855 char charset[64];
801 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
802 857
803 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
859
860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
804 } 862 }
805 else 863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
806 { 868 {
807 const char *charset = get_property (f, XA_FONT, 0); 869 const char *charset = get_property (f, XA_FONT, 0);
808 870
809 if (!charset) 871 if (!charset)
810 charset = name; 872 charset = name;
… …
813 while (*charset) 875 while (*charset)
814 if (*charset++ == '-' && !--count) 876 if (*charset++ == '-' && !--count)
815 break; 877 break;
816 878
817 cs = codeset_from_name (charset); 879 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
882 }
883
884 if (cs == CS_UNKNOWN)
818 } 885 {
819 886 clear ();
820 free (registry); 887 return false;
821 free (encoding); 888 }
822 889
823 if (cs == CS_UNICODE) 890 if (cs == CS_UNICODE)
824 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 891 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
825 892
826 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 893 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
873 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 940 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
874 941
875 if (width < g.width) width = g.width; 942 if (width < g.width) width = g.width;
876 } 943 }
877 944
878 if (cs == CS_UNKNOWN) 945#if 0 // do it per-character
946 if (prop && width > prop->width)
879 { 947 {
880 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
881
882 clear (); 948 clear ();
883 return false; 949 return false;
884 } 950 }
885
886#if 0 // do it per-character
887 if (prop && width > prop->width)
888 {
889 clear ();
890 return false;
891 }
892#endif 951#endif
893 952
894 return true; 953 return true;
895} 954}
896 955
… …
910 uint32_t ch = FROM_UNICODE (cs, unicode); 969 uint32_t ch = FROM_UNICODE (cs, unicode);
911 970
912 if (ch == NOCHAR) 971 if (ch == NOCHAR)
913 return false; 972 return false;
914 973
915 /* check wether the character exists in _this_ font. horrible. */ 974 /* check whether the character exists in _this_ font. horrible. */
916 XCharStruct *xcs; 975 XCharStruct *xcs;
917 976
918 if (encm) 977 if (encm)
919 { 978 {
920 unsigned char byte1 = ch >> 8; 979 unsigned char byte1 = ch >> 8;
… …
950 return false; 1009 return false;
951 1010
952 if (!prop || prop->width == rxvt_fontprop::unset) 1011 if (!prop || prop->width == rxvt_fontprop::unset)
953 return true; 1012 return true;
954 1013
955 // check wether character overlaps previous/next character 1014 // check whether character overlaps previous/next character
956 int w = xcs->rbearing - xcs->lbearing; 1015 int w = xcs->rbearing - xcs->lbearing;
957 int wcw = max (WCWIDTH (unicode), 1); 1016 int wcw = max (WCWIDTH (unicode), 1);
958 1017
959 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1018 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
960 1019
… …
1134 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1193 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1135 1194
1136#if 0 // clipping unfortunately destroys our precious double-width-characters 1195#if 0 // clipping unfortunately destroys our precious double-width-characters
1137 // clip width, we can't do better, or can we? 1196 // clip width, we can't do better, or can we?
1138 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1139 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1198 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1140#endif 1199#endif
1141 1200
1142 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1201 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1143 FcPatternAddBool (p, FC_MINSPACE, 1); 1202 FcPatternAddBool (p, FC_MINSPACE, 1);
1144 1203
… …
1288rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1289 const text_t *text, int len, 1348 const text_t *text, int len,
1290 int fg, int bg) 1349 int fg, int bg)
1291{ 1350{
1292 XGlyphInfo extents; 1351 XGlyphInfo extents;
1293 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1294 XftGlyphSpec *ep = enc; 1353 XftGlyphSpec *ep = enc;
1295 1354
1296 dTermDisplay; 1355 dTermDisplay;
1297 dTermGC; 1356 dTermGC;
1298 1357
1299 int w = term->fwidth * len; 1358 int w = term->fwidth * len;
1300 int h = term->fheight; 1359 int h = term->fheight;
1301 1360
1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1361 bool buffered = bg >= Color_transparent
1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1362 && term->option (Opt_buffered);
1304 * good idea from the perspective of packaging for wide variety of user configs. 1363
1305 */
1306 bool buffered = true
1307#ifdef FORCE_UNBUFFERED_XFT
1308 && bg >= 0
1309#endif
1310 ;
1311 // cut trailing spaces 1364 // cut trailing spaces
1312 while (len && text [len - 1] == ' ') 1365 while (len && text [len - 1] == ' ')
1313 len--; 1366 len--;
1314 1367
1315 int x_ = buffered ? 0 : x; 1368 int x_ = buffered ? 0 : x;
… …
1341 x_ += cwidth; 1394 x_ += cwidth;
1342 } 1395 }
1343 1396
1344 if (buffered) 1397 if (buffered)
1345 { 1398 {
1346 bool back_rendered = false;
1347 if (ep != enc) 1399 if (ep != enc)
1348 { 1400 {
1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1350 1402
1351#ifdef HAVE_BG_PIXMAP 1403#ifdef HAVE_BG_PIXMAP
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405
1352 if (term->bgPixmap.pixmap) 1406 if (term->bgPixmap.pixmap
1407 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1353 { 1409 {
1354 Picture dst = 0; 1410 int src_x = x, src_y = y;
1355 1411
1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1357 dst = XftDrawPicture (d2);
1358
1359 if (bg < 0 || dst != 0)
1360 { 1413 {
1361 int src_x = x, src_y = y ;
1362
1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x; 1414 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y; 1415 src_y += term->window_vt_y;
1367 } 1416 }
1368 1417
1369 if (term->bgPixmap.pmap_width >= src_x+w 1418 if (term->bgPixmap.pmap_width >= src_x + w
1370 && term->bgPixmap.pmap_height >= src_y+h) 1419 && term->bgPixmap.pmap_height >= src_y + h)
1371 { 1420 {
1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1373 src_x, src_y, w, h, 0, 0); 1422 src_x, src_y, w, h, 0, 0);
1374 } 1423 }
1375 else 1424 else
1376 { 1425 {
1377 XGCValues gcv; 1426 XGCValues gcv;
1378 1427
1379 gcv.fill_style = FillTiled; 1428 gcv.fill_style = FillTiled;
1380 gcv.tile = term->bgPixmap.pixmap; 1429 gcv.tile = term->bgPixmap.pixmap;
1381 gcv.ts_x_origin = -src_x; 1430 gcv.ts_x_origin = -src_x;
1382 gcv.ts_y_origin = -src_y; 1431 gcv.ts_y_origin = -src_y;
1383 1432
1384 XChangeGC (disp, gc, 1433 XChangeGC (disp, gc,
1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1386 &gcv); 1435 &gcv);
1387 1436
1388 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1437 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1389 1438
1390 gcv.fill_style = FillSolid; 1439 gcv.fill_style = FillSolid;
1391 XChangeGC (disp, gc, GCFillStyle, &gcv); 1440 XChangeGC (disp, gc, GCFillStyle, &gcv);
1392 } 1441 }
1393 1442
1394 if (bg >= 0) 1443 if (dst)
1395 { 1444 {
1396 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1445 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1446
1447 // dst can only be set when bg >= 0
1397 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1448 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1398 }
1399
1400 back_rendered = true;
1401 } 1449 }
1402 } 1450 }
1451 else
1403#endif 1452#endif
1404
1405 if (bg >= 0 && !back_rendered)
1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1453 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1407 1454
1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1455 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1456 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1410 } 1457 }
1411 else 1458 else
… …
1439 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1486 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1440 = rxvt_fontprop::unset; 1487 = rxvt_fontprop::unset;
1441 force_prop = false; 1488 force_prop = false;
1442 1489
1443 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1490 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1444 FONT_UNREF (*i); 1491 (*i)->unref ();
1445 1492
1446 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1493 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1447 delete *p; 1494 delete *p;
1448 1495
1449 free (fontdesc); fontdesc = 0; 1496 free (fontdesc); fontdesc = 0;
… …
1451 fonts.clear (); 1498 fonts.clear ();
1452 1499
1453 fallback = fallback_fonts; 1500 fallback = fallback_fonts;
1454} 1501}
1455 1502
1503void
1504rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1505{
1506 font->set_term (term);
1507
1508 font->cs = cs;
1509 font->loaded = false;
1510}
1511
1456rxvt_font * 1512rxvt_font *
1457rxvt_fontset::new_font (const char *name, codeset cs) 1513rxvt_fontset::new_font (const char *name, codeset cs)
1458{ 1514{
1459 rxvt_font *f; 1515 rxvt_font *f;
1460 1516
… …
1476 f = new rxvt_font_x11; 1532 f = new rxvt_font_x11;
1477 } 1533 }
1478 else 1534 else
1479 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1480 1536
1481 f->set_term (term);
1482 f->set_name (strdup (name)); 1537 f->set_name (strdup (name));
1483 1538 prepare_font (f, cs);
1484 f->cs = cs;
1485 f->loaded = false;
1486 1539
1487 return f; 1540 return f;
1488} 1541}
1489 1542
1490///////////////////////////////////////////////////////////////////////////// 1543/////////////////////////////////////////////////////////////////////////////
1544
1545void
1546rxvt_fontset::push_font (rxvt_font *font)
1547{
1548 // the fontCount index is reserved for the overflow font, it is only
1549 // necessary when we get fontCount or more fonts, as they cannot be
1550 // represented in the rendition.
1551 if (fonts.size () == fontCount)
1552 {
1553 rxvt_font *f = new rxvt_font_overflow (this);
1554
1555 prepare_font (f, CS_UNICODE);
1556 fonts.push_back (f);
1557 }
1558
1559 fonts.push_back (font);
1560}
1491 1561
1492void 1562void
1493rxvt_fontset::add_fonts (const char *desc) 1563rxvt_fontset::add_fonts (const char *desc)
1494{ 1564{
1495 if (desc) 1565 if (desc)
… …
1533 if (!end) 1603 if (!end)
1534 end = desc + strlen (desc); 1604 end = desc + strlen (desc);
1535 1605
1536 if (end - desc < 511) 1606 if (end - desc < 511)
1537 { 1607 {
1538 strncpy (buf, desc, end - desc); 1608 memcpy (buf, desc, end - desc);
1539 buf[end - desc] = 0; 1609 buf[end - desc] = 0;
1540 1610
1541 fonts.push_back (new_font (buf, cs)); 1611 push_font (new_font (buf, cs));
1542 } 1612 }
1543 else 1613 else
1544 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1614 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1545 1615
1546 desc = end + 1; 1616 desc = end + 1;
… …
1574{ 1644{
1575 clear (); 1645 clear ();
1576 1646
1577 fontdesc = strdup (desc); 1647 fontdesc = strdup (desc);
1578 1648
1579 fonts.push_back (new_font (0, CS_UNICODE)); 1649 push_font (new_font (0, CS_UNICODE));
1580 realize_font (0); 1650 realize_font (0);
1581 1651
1582 add_fonts (desc); 1652 add_fonts (desc);
1583 1653
1584 return true; 1654 return true;
… …
1593 1663
1594 return -1; 1664 return -1;
1595} 1665}
1596 1666
1597int 1667int
1598rxvt_fontset::find_font (unicode_t unicode) 1668rxvt_fontset::find_font_idx (unicode_t unicode)
1599{ 1669{
1600 if (unicode >= 1<<20) 1670 if (unicode >= 1<<20)
1601 return 0; 1671 return 0;
1602 1672
1603 unicode_t hi = unicode >> 8; 1673 unicode_t hi = unicode >> 8;
… …
1629 goto next_font; 1699 goto next_font;
1630 1700
1631 bool careful; 1701 bool careful;
1632 if (f->has_char (unicode, &prop, careful)) 1702 if (f->has_char (unicode, &prop, careful))
1633 { 1703 {
1634 if (careful) 1704 i = (i << 1) | careful;
1635 i |= 128;
1636 1705
1637 goto found; 1706 goto found;
1638 } 1707 }
1639 1708
1640 next_font: 1709 next_font:
1641 if (i == fonts.size () - 1) 1710 if (i == fonts.size () - 1)
1642 { 1711 {
1643 if (fallback->name) 1712 if (fallback->name)
1644 { 1713 {
1645 // search through the fallback list 1714 // search through the fallback list
1646 fonts.push_back (new_font (fallback->name, fallback->cs)); 1715 push_font (new_font (fallback->name, fallback->cs));
1647 fallback++; 1716 fallback++;
1648 } 1717 }
1649 else 1718 else
1650 { 1719 {
1651 // try to find a new font. 1720 // try to find a new font.
… …
1682 FcPatternDestroy (match); 1751 FcPatternDestroy (match);
1683 1752
1684 if (find_font (font) < 0) 1753 if (find_font (font) < 0)
1685 { 1754 {
1686 char fontname[4096]; 1755 char fontname[4096];
1687 sprintf (fontname, "xft:%-.4090s", font); 1756 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1688 1757
1689 fonts.push_back (new_font (fontname, CS_UNICODE)); 1758 push_font (new_font (fontname, CS_UNICODE));
1690 } 1759 }
1691 1760
1692 free (font); 1761 free (font);
1693 } 1762 }
1694#endif 1763#endif
… …
1716 } 1785 }
1717 1786
1718 return i; 1787 return i;
1719} 1788}
1720 1789
1721
1722

Diff Legend

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