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.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.127 by ayin, Mon Jan 7 12:41:31 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
… …
306 return false; 305 return false;
307 306
308 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
309 return true; 308 return true;
310 309
310#ifdef BUILTIN_GLYPHS
311 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 313 return true;
314#endif
314 315
315 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
316 return true; 317 return true;
317 318
318 switch (unicode) 319 switch (unicode)
… …
608 return false; 609 return false;
609} 610}
610 611
611// fix the size of scalable fonts 612// fix the size of scalable fonts
612static bool 613static bool
613replace_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)
614{ 615{
615 int slashes = 0; 616 int slashes = 0;
616 const char *field, *end; 617 const char *field, *end;
617 618
618 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
628 break; 629 break;
629 } 630 }
630 631
631 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
632 { 633 {
633 // TODO: check for overflow in font-name 634 size_t len = field - name;
634 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 636 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
637 strcat (buf, end); 638 strcat (*ptr, end);
638 639
639 return true; 640 return true;
640 } 641 }
641 else 642 else
642 { 643 {
643 strcpy (buf, name); 644 *ptr = strdup (name);
644 645
645 return false; 646 return false;
646 } 647 }
647} 648}
648 649
… …
656 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
657 658
658 // first morph the font if required 659 // first morph the font if required
659 if (force_prop) 660 if (force_prop)
660 { 661 {
661 char fname[1024]; 662 char *fname;
662 663
663 if (name[0] != '-') 664 if (name[0] != '-')
664 { 665 {
665 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
666 667
… …
678 f = 0; 679 f = 0;
679 } 680 }
680 681
681 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
682 { 683 {
683 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 686 ? "medium" : "bold");
686 set_name (strdup (fname)); 687 set_name (fname);
687 } 688 }
688 689
689 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
690 { 691 {
691 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 695 set_name (fname);
695 } 696 }
696 } 697 }
697 698
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
725 726
726 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
727 { 728 {
728 rxvt_fontprop p; 729 rxvt_fontprop p;
729 char fname[1024]; 730 char *fname;
730 731
731 int diff = 0; 732 int diff = 0;
732 733
733 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
737 742
738 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
739 continue; 744 continue;
740 745
741 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
745 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;
746 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);
747 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);
748 //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);
749 754
750 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
751 fonts[i].diff = diff; 756 fonts[i].diff = diff;
752 } 757 }
753 758
754 XFreeFontNames (list); 759 XFreeFontNames (list);
755 760
… …
1527 if (!end) 1532 if (!end)
1528 end = desc + strlen (desc); 1533 end = desc + strlen (desc);
1529 1534
1530 if (end - desc < 511) 1535 if (end - desc < 511)
1531 { 1536 {
1532 strncpy (buf, desc, end - desc); 1537 memcpy (buf, desc, end - desc);
1533 buf[end - desc] = 0; 1538 buf[end - desc] = 0;
1534 1539
1535 fonts.push_back (new_font (buf, cs)); 1540 fonts.push_back (new_font (buf, cs));
1536 } 1541 }
1537 else 1542 else

Diff Legend

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