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.174 by sf-exg, Mon Jan 10 10:36:16 2011 UTC vs.
Revision 1.181 by root, Wed Jun 22 16:06:52 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 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 2 of the License, or
… …
132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
134# endif 134# endif
135#endif 135#endif
136 136
137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
138 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
139#if XFT 138#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
241 { 240 {
242#if XFT 241#if XFT
243 Picture dst; 242 Picture dst;
244 243
245# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
246 if (term->bgPixmap.pixmap 245 if (term->bg_pixmap
247 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
249 { 248 {
250 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
251 250
… …
524 523
525 void draw (rxvt_drawable &d, int x, int y, 524 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 525 const text_t *text, int len,
527 int fg, int bg) 526 int fg, int bg)
528 { 527 {
529 while (len--) 528 while (len)
530 { 529 {
531 int fid = fs->find_font_idx (*text); 530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 535 text += w;
536 len -= w;
534 x += term->fwidth; 537 x += term->fwidth * w;
535 } 538 }
536 } 539 }
537}; 540};
538 541
539///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
… …
921 } 924 }
922#endif 925#endif
923 926
924 width = 1; 927 width = 1;
925 928
926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
927 { 930 {
928 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
929 continue; 932 continue;
930 933
931 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
967} 970}
968 971
969bool 972bool
970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 973rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
971{ 974{
975 careful = false;
976
972 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
973 978
974 if (ch == NOCHAR) 979 if (ch == NOCHAR)
975 return false; 980 return false;
976 981
… …
1241 1246
1242 XftUnlockFace (f); 1247 XftUnlockFace (f);
1243 1248
1244 int glheight = height; 1249 int glheight = height;
1245 1250
1246 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1251 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
1247 { 1252 {
1248 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1249 1254
1250 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1251 && ch > 0x100 1256 && ch > 0x100
… …
1406 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1407 1412
1408#ifdef HAVE_BG_PIXMAP 1413#ifdef HAVE_BG_PIXMAP
1409 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1410 1415
1411 if (term->bgPixmap.pixmap 1416 if (term->bg_pixmap
1412 && (bg == Color_transparent || bg == Color_bg 1417 && (bg == Color_transparent || bg == Color_bg
1413 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1414 { 1419 {
1415 int src_x = x, src_y = y; 1420 int src_x = x, src_y = y;
1416 1421
1417 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1418 { 1423 {
1419 src_x += term->window_vt_x; 1424 src_x += term->window_vt_x;
1420 src_y += term->window_vt_y; 1425 src_y += term->window_vt_y;
1421 } 1426 }
1422 1427
1423 if (term->bgPixmap.pmap_width >= src_x + w 1428 if (term->bg_pmap_width >= src_x + w
1424 && term->bgPixmap.pmap_height >= src_y + h) 1429 && term->bg_pmap_height >= src_y + h)
1425 { 1430 {
1426 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1431 XCopyArea (disp, term->bg_pixmap, d2, gc,
1427 src_x, src_y, w, h, 0, 0); 1432 src_x, src_y, w, h, 0, 0);
1428 } 1433 }
1429 else 1434 else
1430 { 1435 {
1431 XGCValues gcv; 1436 XGCValues gcv;
1432 1437
1433 gcv.fill_style = FillTiled; 1438 gcv.fill_style = FillTiled;
1434 gcv.tile = term->bgPixmap.pixmap; 1439 gcv.tile = term->bg_pixmap;
1435 gcv.ts_x_origin = -src_x; 1440 gcv.ts_x_origin = -src_x;
1436 gcv.ts_y_origin = -src_y; 1441 gcv.ts_y_origin = -src_y;
1437 1442
1438 XChangeGC (disp, gc, 1443 XChangeGC (disp, gc,
1439 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,

Diff Legend

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