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.187 by root, Thu Jan 26 13:07:22 2012 UTC vs.
Revision 1.200 by root, Thu Jun 17 00:49:20 2021 UTC

… …
4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
212} 212}
213 213
214///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215 215
216rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 Picture dst; 242 Picture dst;
243 243
244# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
245 if (term->bg_pixmap 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250 250
… …
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
344 345
345 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
346 347
347 while (len) 348 while (len)
348 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
349#if ENABLE_COMBINING 356#if ENABLE_COMBINING
350 compose_char *cc; 357 compose_char *cc;
351#endif 358#endif
352 const text_t *tp = text;
353 text_t t = *tp;
354
355 while (++text, --len && *text == NOCHAR)
356 ;
357
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
361#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
362 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
441#else 442#else
442 if (0) 443 if (0)
443 ; 444 ;
444#endif 445#endif
445#if ENABLE_COMBINING 446#if ENABLE_COMBINING
446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && rxvt_composite[t])
447 { 448 {
448 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
449 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
450 text_t chrs[2]; 473 text_t chrs[2];
451 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
452 475
453 *chrs = cc->c1; 476 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
464 ? f1 487 ? f1
465 : (*fs)[fs->find_font_idx (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
466 489
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 491 }
492 #endif
469 } 493 }
470#endif 494#endif
471 else 495 else
472 switch (t) 496 switch (t)
473 { 497 {
474 case '\t': 498 case '\t':
475 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
476 case NOCHAR: 500 case NOCHAR:
477 break; 501 break;
478 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
479 default: 512 default:
480 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
481 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
482 } 515 }
483 516
484 x += fwidth; 517 x += fwidth;
485 } 518 }
486} 519}
487 520
488struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
489 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
490 524
491 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font () 526 : rxvt_font ()
493 { 527 {
… …
539 } 573 }
540}; 574};
541 575
542///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
543 577
544struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
545 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
546 581
547 void clear (); 582 void clear ();
548 583
549 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
934 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
935 bool careful; 970 bool careful;
936 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
937 continue; 972 continue;
938 973
939 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
940 976
941 XCharStruct g; 977 XCharStruct g;
942 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
943 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
944 980
… …
1044 dTermDisplay; 1080 dTermDisplay;
1045 dTermGC; 1081 dTermGC;
1046 1082
1047 bool slow = this->slow 1083 bool slow = this->slow
1048 || width != term->fwidth 1084 || width != term->fwidth
1049 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
1050 1087
1051 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
1052 1089
1053 XGCValues v; 1090 XGCValues v;
1054 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1122 1159
1123///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1124 1161
1125#if XFT 1162#if XFT
1126 1163
1127struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1128 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1129 1171
1130 void clear (); 1172 void clear ();
1131 1173
1132 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1133 1175
… …
1408 { 1450 {
1409 if (ep != enc) 1451 if (ep != enc)
1410 { 1452 {
1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1453 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1412 1454
1413#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_IMG
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1456 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415 1457
1416 if (term->bg_pixmap 1458 if (term->bg_img
1417 && (bg == Color_transparent || bg == Color_bg 1459 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1460 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1419 { 1461 {
1420 int src_x = x, src_y = y; 1462 int src_x = x, src_y = y;
1421 1463
… …
1423 { 1465 {
1424 src_x += term->window_vt_x; 1466 src_x += term->window_vt_x;
1425 src_y += term->window_vt_y; 1467 src_y += term->window_vt_y;
1426 } 1468 }
1427 1469
1428 if (term->bg_pmap_width >= src_x + w 1470 if (term->bg_img->w >= src_x + w
1429 && term->bg_pmap_height >= src_y + h) 1471 && term->bg_img->h >= src_y + h)
1430 { 1472 {
1431 XCopyArea (disp, term->bg_pixmap, d2, gc, 1473 XCopyArea (disp, term->bg_img->pm, d2, gc,
1432 src_x, src_y, w, h, 0, 0); 1474 src_x, src_y, w, h, 0, 0);
1433 } 1475 }
1434 else 1476 else
1435 { 1477 {
1436 XGCValues gcv; 1478 XGCValues gcv;
1437 1479
1438 gcv.fill_style = FillTiled; 1480 gcv.fill_style = FillTiled;
1439 gcv.tile = term->bg_pixmap; 1481 gcv.tile = term->bg_img->pm;
1440 gcv.ts_x_origin = -src_x; 1482 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y; 1483 gcv.ts_y_origin = -src_y;
1442 1484
1443 XChangeGC (disp, gc, 1485 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1486 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1499 1541
1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1542 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1501 (*i)->unref (); 1543 (*i)->unref ();
1502 1544
1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1545 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1504 delete [] *p; 1546 delete *p;
1505 1547
1506 free (fontdesc); fontdesc = 0; 1548 free (fontdesc); fontdesc = 0;
1507 1549
1508 fonts.clear (); 1550 fonts.clear ();
1509 1551
… …
1604 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1646 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1605 else 1647 else
1606 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1648 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1607 1649
1608 desc++; 1650 desc++;
1609 while (*desc <= ' ') desc++; 1651 while (*desc <= ' ' && *desc) desc++;
1610 } 1652 }
1611 1653
1612 end = strchr (desc, ','); 1654 end = strchr (desc, ',');
1613 if (!end) 1655 if (!end)
1614 end = desc + strlen (desc); 1656 end = desc + strlen (desc);
… …
1732 // way to configure this and xft is easier to hack in, 1774 // way to configure this and xft is easier to hack in,
1733 // while x11 has more framework in place already. 1775 // while x11 has more framework in place already.
1734 // TODO: this is a real resource hog, xft takes ages(?) 1776 // TODO: this is a real resource hog, xft takes ages(?)
1735#if XFT && USE_SLOW_LOOKUP 1777#if XFT && USE_SLOW_LOOKUP
1736 // grab the first xft font that seems suitable 1778 // grab the first xft font that seems suitable
1779 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1737 FcPattern *p = FcPatternCreate (); 1780 FcPattern *p = FcPatternCreate ();
1738 1781
1739 FcCharSet *s = FcCharSetCreate (); 1782 FcCharSet *s = FcCharSetCreate ();
1740 FcCharSetAddChar (s, unicode); 1783 FcCharSetAddChar (s, unicode);
1741 FcPatternAddCharSet (p, FC_CHARSET, s); 1784 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1785 while (hi >= fmap.size ()) 1828 while (hi >= fmap.size ())
1786 fmap.push_back (0); 1829 fmap.push_back (0);
1787 1830
1788 if (!fmap[hi]) 1831 if (!fmap[hi])
1789 { 1832 {
1790 // we use [1] here because C has no separate new and new [] forms,
1791 // and pagemap is char[256], so new incorrectly assumes we want to
1792 // allocate an array of chars instead of a single pagemap.
1793 // we can either cast the resulting pointer to (pagemap *) or
1794 // allocate an array of pagemaps, returning a pointer to the first member
1795 // this is no extra overhead, as new even allocates an array for
1796 // "new pagemap"
1797 fmap[hi] = new pagemap[1]; 1833 fmap[hi] = new pagemap;
1798 memset (fmap[hi], 0xff, sizeof (pagemap)); 1834 memset (fmap[hi], 0xff, sizeof (pagemap));
1799 } 1835 }
1800 1836
1801 (*fmap[hi])[unicode & 0xff] = i; 1837 (*fmap[hi])[unicode & 0xff] = i;
1802 } 1838 }

Diff Legend

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