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.122 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.131 by root, Wed Jan 23 06:00:53 2008 UTC

… …
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
… …
262 } 261 }
263} 262}
264 263
265///////////////////////////////////////////////////////////////////////////// 264/////////////////////////////////////////////////////////////////////////////
266 265
267#include "table/linedraw.h"
268
269struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
270 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
271 268
272 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
273 : rxvt_font () 270 : rxvt_font ()
… …
308 return false; 305 return false;
309 306
310 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
311 return true; 308 return true;
312 309
310#ifdef BUILTIN_GLYPHS
313 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 313 return true;
314#endif
316 315
317 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
318 return true; 317 return true;
319 318
320 switch (unicode) 319 switch (unicode)
… …
356 ; 355 ;
357 356
358 int width = text - tp; 357 int width = text - tp;
359 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
360 359
360#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
362 { 362 {
363# include "table/linedraw.h"
363 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
364 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
365 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
366 367
367 int W = fwidth; 368 int W = fwidth;
… …
434 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
435 break; 436 break;
436 } 437 }
437 } 438 }
438 } 439 }
440#else
441 if (0)
442 ;
443#endif
439#if ENABLE_COMBINING 444#if ENABLE_COMBINING
440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
441 { 446 {
442 min_it (width, 2); // we only support wcwidth up to 2 447 min_it (width, 2); // we only support wcwidth up to 2
443 448
… …
604 return false; 609 return false;
605} 610}
606 611
607// fix the size of scalable fonts 612// fix the size of scalable fonts
608static bool 613static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 615{
611 int slashes = 0; 616 int slashes = 0;
612 const char *field, *end; 617 const char *field, *end;
613 618
614 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
624 break; 629 break;
625 } 630 }
626 631
627 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
628 { 633 {
629 // TODO: check for overflow in font-name 634 size_t len = field - name;
630 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 636 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
633 strcat (buf, end); 638 strcat (*ptr, end);
634 639
635 return true; 640 return true;
636 } 641 }
637 else 642 else
638 { 643 {
639 strcpy (buf, name); 644 *ptr = strdup (name);
640 645
641 return false; 646 return false;
642 } 647 }
643} 648}
644 649
… …
652 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
653 658
654 // first morph the font if required 659 // first morph the font if required
655 if (force_prop) 660 if (force_prop)
656 { 661 {
657 char fname[1024]; 662 char *fname;
658 663
659 if (name[0] != '-') 664 if (name[0] != '-')
660 { 665 {
661 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
662 667
… …
674 f = 0; 679 f = 0;
675 } 680 }
676 681
677 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
678 { 683 {
679 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
680 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
681 ? "medium" : "bold"); 686 ? "medium" : "bold");
682 set_name (strdup (fname)); 687 set_name (fname);
683 } 688 }
684 689
685 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
686 { 691 {
687 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
688 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
689 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
690 set_name (strdup (fname)); 695 set_name (fname);
691 } 696 }
692 } 697 }
693 698
694 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
695 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
720 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
721 726
722 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
723 { 728 {
724 rxvt_fontprop p; 729 rxvt_fontprop p;
725 char fname[1024]; 730 char *fname;
726 731
727 int diff = 0; 732 int diff = 0;
728 733
729 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
730 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
731 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
733 742
734 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
735 continue; 744 continue;
736 745
737 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
741 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
742 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 751 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
743 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 752 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
744 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
745 754
746 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
747 fonts[i].diff = diff; 756 fonts[i].diff = diff;
748 } 757 }
749 758
750 XFreeFontNames (list); 759 XFreeFontNames (list);
751 760
… …
1287 dTermGC; 1296 dTermGC;
1288 1297
1289 int w = term->fwidth * len; 1298 int w = term->fwidth * len;
1290 int h = term->fheight; 1299 int h = term->fheight;
1291 1300
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1301 /*
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1302 * 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. 1303 * good idea from the perspective of packaging for wide variety of user configs.
1295 */ 1304 */
1296 bool buffered = true 1305 bool buffered = bg >= Color_transparent;
1297#ifdef FORCE_UNBUFFERED_XFT 1306#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0 1307 buffered = false;
1299#endif 1308#endif
1300 ; 1309
1301 // cut trailing spaces 1310 // cut trailing spaces
1302 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1303 len--; 1312 len--;
1304 1313
1305 int x_ = buffered ? 0 : x; 1314 int x_ = buffered ? 0 : x;
… …
1331 x_ += cwidth; 1340 x_ += cwidth;
1332 } 1341 }
1333 1342
1334 if (buffered) 1343 if (buffered)
1335 { 1344 {
1336 bool back_rendered = false;
1337 if (ep != enc) 1345 if (ep != enc)
1338 { 1346 {
1347 bool back_rendered = false;
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1340 1349
1341#ifdef HAVE_BG_PIXMAP 1350#ifdef HAVE_BG_PIXMAP
1342 if (term->bgPixmap.pixmap) 1351 if (term->bgPixmap.pixmap)
1343 { 1352 {
1344 Picture dst = 0; 1353 Picture dst = 0;
1345 1354
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ())
1347 dst = XftDrawPicture (d2); 1356 dst = XftDrawPicture (d2);
1348 1357
1349 if (bg < 0 || dst != 0) 1358 if (dst)
1350 { 1359 {
1351 int src_x = x, src_y = y ; 1360 int src_x = x, src_y = y;
1352 1361
1353 if (term->bgPixmap.is_parentOrigin ()) 1362 if (term->bgPixmap.is_parentOrigin ())
1354 { 1363 {
1355 src_x += term->window_vt_x; 1364 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y; 1365 src_y += term->window_vt_y;
… …
1390 back_rendered = true; 1399 back_rendered = true;
1391 } 1400 }
1392 } 1401 }
1393#endif 1402#endif
1394 1403
1395 if (bg >= 0 && !back_rendered) 1404 if (!back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1405 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
1397 1406
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 } 1409 }
1401 else 1410 else
… …
1523 if (!end) 1532 if (!end)
1524 end = desc + strlen (desc); 1533 end = desc + strlen (desc);
1525 1534
1526 if (end - desc < 511) 1535 if (end - desc < 511)
1527 { 1536 {
1528 strncpy (buf, desc, end - desc); 1537 memcpy (buf, desc, end - desc);
1529 buf[end - desc] = 0; 1538 buf[end - desc] = 0;
1530 1539
1531 fonts.push_back (new_font (buf, cs)); 1540 fonts.push_back (new_font (buf, cs));
1532 } 1541 }
1533 else 1542 else

Diff Legend

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