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.149 by ayin, Thu Feb 21 13:45:28 2008 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
… …
237 if (color == Color_bg || color == Color_transparent) 236 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 237 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 238 else if (color >= 0)
240 { 239 {
241#if XFT 240#if XFT
242 bool done = false; 241 Picture dst;
242
243#ifdef HAVE_BG_PIXMAP 243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244 if (term->bgPixmap.pixmap
245 { 245 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 246 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 247 {
249 XClearArea (disp, d, x, y, w, h, false); 248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 250 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); 251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 252 }
254 } 253 else
255#endif 254# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
258#else 257#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 260#endif
262 } 261 }
… …
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
… …
1130 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1131 1134
1132#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1133 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1134 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1135 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1136#endif 1139#endif
1137 1140
1138 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1139 FcPatternAddBool (p, FC_MINSPACE, 1); 1142 FcPatternAddBool (p, FC_MINSPACE, 1);
1140 1143
… …
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 bool buffered = bg >= Color_transparent
1299 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1302 && term->option (Opt_buffered);
1300 * good idea from the perspective of packaging for wide variety of user configs. 1303
1301 */
1302 bool buffered = true
1303#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0
1305#endif
1306 ;
1307 // cut trailing spaces 1304 // cut trailing spaces
1308 while (len && text [len - 1] == ' ') 1305 while (len && text [len - 1] == ' ')
1309 len--; 1306 len--;
1310 1307
1311 int x_ = buffered ? 0 : x; 1308 int x_ = buffered ? 0 : x;
… …
1337 x_ += cwidth; 1334 x_ += cwidth;
1338 } 1335 }
1339 1336
1340 if (buffered) 1337 if (buffered)
1341 { 1338 {
1342 bool back_rendered = false;
1343 if (ep != enc) 1339 if (ep != enc)
1344 { 1340 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1341 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346 1342
1347#ifdef HAVE_BG_PIXMAP 1343#ifdef HAVE_BG_PIXMAP
1344 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1345
1348 if (term->bgPixmap.pixmap) 1346 if (term->bgPixmap.pixmap
1347 && (bg == Color_transparent || bg == Color_bg
1348 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1349 { 1349 {
1350 Picture dst = 0; 1350 int src_x = x, src_y = y;
1351 1351
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1352 if (term->bgPixmap.is_parentOrigin ())
1353 dst = XftDrawPicture (d2);
1354
1355 if (bg < 0 || dst != 0)
1356 { 1353 {
1357 int src_x = x, src_y = y ;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x; 1354 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1355 src_y += term->window_vt_y;
1363 } 1356 }
1364 1357
1365 if (term->bgPixmap.pmap_width >= src_x+w 1358 if (term->bgPixmap.pmap_width >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y+h) 1359 && term->bgPixmap.pmap_height >= src_y + h)
1367 { 1360 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1361 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1362 src_x, src_y, w, h, 0, 0);
1370 } 1363 }
1371 else 1364 else
1372 { 1365 {
1373 XGCValues gcv; 1366 XGCValues gcv;
1374 1367
1375 gcv.fill_style = FillTiled; 1368 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap; 1369 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x; 1370 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y; 1371 gcv.ts_y_origin = -src_y;
1379 1372
1380 XChangeGC (disp, gc, 1373 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1374 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv); 1375 &gcv);
1383 1376
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1377 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385 1378
1386 gcv.fill_style = FillSolid; 1379 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1380 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1381 }
1389 1382
1390 if (bg >= 0) 1383 if (dst)
1391 { 1384 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1385 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1386
1387 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1388 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395
1396 back_rendered = true;
1397 } 1389 }
1398 } 1390 }
1391 else
1399#endif 1392#endif
1400
1401 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1393 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1403 1394
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1395 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1396 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1397 }
1407 else 1398 else
… …
1529 if (!end) 1520 if (!end)
1530 end = desc + strlen (desc); 1521 end = desc + strlen (desc);
1531 1522
1532 if (end - desc < 511) 1523 if (end - desc < 511)
1533 { 1524 {
1534 strncpy (buf, desc, end - desc); 1525 memcpy (buf, desc, end - desc);
1535 buf[end - desc] = 0; 1526 buf[end - desc] = 0;
1536 1527
1537 fonts.push_back (new_font (buf, cs)); 1528 fonts.push_back (new_font (buf, cs));
1538 } 1529 }
1539 else 1530 else

Diff Legend

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