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.124 by ayin, Sat Nov 24 11:41:11 2007 UTC vs.
Revision 1.129 by root, Wed Jan 23 05:18:43 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
… …
610 return false; 609 return false;
611} 610}
612 611
613// fix the size of scalable fonts 612// fix the size of scalable fonts
614static bool 613static bool
615replace_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)
616{ 615{
617 int slashes = 0; 616 int slashes = 0;
618 const char *field, *end; 617 const char *field, *end;
619 618
620 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
630 break; 629 break;
631 } 630 }
632 631
633 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
634 { 633 {
635 // TODO: check for overflow in font-name 634 size_t len = field - name;
636 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 buf += field - name; 636 memcpy (*ptr, name, len);
638 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
639 strcat (buf, end); 638 strcat (*ptr, end);
640 639
641 return true; 640 return true;
642 } 641 }
643 else 642 else
644 { 643 {
645 strcpy (buf, name); 644 *ptr = strdup (name);
646 645
647 return false; 646 return false;
648 } 647 }
649} 648}
650 649
… …
658 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
659 658
660 // first morph the font if required 659 // first morph the font if required
661 if (force_prop) 660 if (force_prop)
662 { 661 {
663 char fname[1024]; 662 char *fname;
664 663
665 if (name[0] != '-') 664 if (name[0] != '-')
666 { 665 {
667 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
668 667
… …
680 f = 0; 679 f = 0;
681 } 680 }
682 681
683 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
684 { 683 {
685 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
686 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
687 ? "medium" : "bold"); 686 ? "medium" : "bold");
688 set_name (strdup (fname)); 687 set_name (fname);
689 } 688 }
690 689
691 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
692 { 691 {
693 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
694 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
695 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
696 set_name (strdup (fname)); 695 set_name (fname);
697 } 696 }
698 } 697 }
699 698
700 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
701 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
726 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
727 726
728 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
729 { 728 {
730 rxvt_fontprop p; 729 rxvt_fontprop p;
731 char fname[1024]; 730 char *fname;
732 731
733 int diff = 0; 732 int diff = 0;
734 733
735 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
736 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
737 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
738 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
739 742
740 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
741 continue; 744 continue;
742 745
743 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
747 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;
748 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);
749 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);
750 //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);
751 754
752 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
753 fonts[i].diff = diff; 756 fonts[i].diff = diff;
754 } 757 }
755 758
756 XFreeFontNames (list); 759 XFreeFontNames (list);
757 760
… …
1293 dTermGC; 1296 dTermGC;
1294 1297
1295 int w = term->fwidth * len; 1298 int w = term->fwidth * len;
1296 int h = term->fheight; 1299 int h = term->fheight;
1297 1300
1298 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1301 /*
1299 * 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
1300 * 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.
1301 */ 1304 */
1302 bool buffered = true 1305 bool buffered = bg >= 0;
1303#ifdef FORCE_UNBUFFERED_XFT 1306#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0 1307 buffered = false;
1305#endif 1308#endif
1306 ; 1309
1307 // cut trailing spaces 1310 // cut trailing spaces
1308 while (len && text [len - 1] == ' ') 1311 while (len && text [len - 1] == ' ')
1309 len--; 1312 len--;
1310 1313
1311 int x_ = buffered ? 0 : x; 1314 int x_ = buffered ? 0 : x;
… …
1337 x_ += cwidth; 1340 x_ += cwidth;
1338 } 1341 }
1339 1342
1340 if (buffered) 1343 if (buffered)
1341 { 1344 {
1342 bool back_rendered = false;
1343 if (ep != enc) 1345 if (ep != enc)
1344 { 1346 {
1347 bool back_rendered = false;
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346 1349
1347#ifdef HAVE_BG_PIXMAP 1350#ifdef HAVE_BG_PIXMAP
1348 if (term->bgPixmap.pixmap) 1351 if (term->bgPixmap.pixmap)
1349 { 1352 {
1350 Picture dst = 0; 1353 Picture dst = 0;
1351 1354
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1355 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0xff00)
1353 dst = XftDrawPicture (d2); 1356 dst = XftDrawPicture (d2);
1354 1357
1355 if (bg < 0 || dst != 0) 1358 if (bg < 0 || dst != 0)
1356 { 1359 {
1357 int src_x = x, src_y = y ; 1360 int src_x = x, src_y = y ;
… …
1385 1388
1386 gcv.fill_style = FillSolid; 1389 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1391 }
1389 1392
1390 if (bg >= 0)
1391 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1393 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395 1395
1396 back_rendered = true; 1396 back_rendered = true;
1397 } 1397 }
1398 } 1398 }
1399#endif 1399#endif
1400 1400
1401 if (bg >= 0 && !back_rendered) 1401 if (!back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1403 1403
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1406 }
… …
1529 if (!end) 1529 if (!end)
1530 end = desc + strlen (desc); 1530 end = desc + strlen (desc);
1531 1531
1532 if (end - desc < 511) 1532 if (end - desc < 511)
1533 { 1533 {
1534 strncpy (buf, desc, end - desc); 1534 memcpy (buf, desc, end - desc);
1535 buf[end - desc] = 0; 1535 buf[end - desc] = 0;
1536 1536
1537 fonts.push_back (new_font (buf, cs)); 1537 fonts.push_back (new_font (buf, cs));
1538 } 1538 }
1539 else 1539 else

Diff Legend

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