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.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.82 by root, Mon Jan 9 07:35:07 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 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
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29#include <wchar.h>
29#include <inttypes.h> 30#include <inttypes.h>
30 31
31#define DISPLAY r->display->display 32#define DISPLAY r->display->display
32#define TGC r->TermWin.gc 33#define TGC r->gc
33 34
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 35#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
35 36
36const struct rxvt_fallback_font { 37const struct rxvt_fallback_font {
37 codeset cs; 38 codeset cs;
… …
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 131 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 132 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 135#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 140
140 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try last only.
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 143#endif
143 144
… …
276 rxvt_fontprop properties () 277 rxvt_fontprop properties ()
277 { 278 {
278 rxvt_fontprop p; 279 rxvt_fontprop p;
279 280
280 p.width = p.height = 1; 281 p.width = p.height = 1;
282 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 283 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 284 p.slant = rxvt_fontprop::roman;
283 285
284 return p; 286 return p;
285 } 287 }
… …
305 return false; 307 return false;
306 308
307 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
308 return true; 310 return true;
309 311
310 if (unicode >= 0x2500 && unicode <= 0x259f) 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !r->option (Opt_skipBuiltinGlyphs))
311 return true; 314 return true;
312 315
313 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
314 return true; 317 return true;
315 318
… …
333 const text_t *text, int len, 336 const text_t *text, int len,
334 int fg, int bg) 337 int fg, int bg)
335{ 338{
336 Display *disp = d.display->display; 339 Display *disp = d.display->display;
337 340
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
339 342
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 343 XSetForeground (disp, TGC, r->pix_colors[fg]);
341 344
342 while (len) 345 while (len)
343 { 346 {
… …
349 352
350 while (++text, --len && *text == NOCHAR) 353 while (++text, --len && *text == NOCHAR)
351 ; 354 ;
352 355
353 int width = text - tp; 356 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 357 int fwidth = r->fwidth * width;
355 358
356 if (0x2500 <= t && t <= 0x259f) 359 if (0x2500 <= t && t <= 0x259f)
357 { 360 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 361 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 362 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 363 uint32_t *b = a + (offs & 15);
361 364
362 int W = fwidth; 365 int W = fwidth;
363 int H = r->TermWin.fheight; 366 int H = r->fheight;
364 367
365 int x_[16]; 368 int x_[16];
366 int y_[16]; 369 int y_[16];
367 370
368 for (int i = 0; i <= 8; i++) 371 for (int i = 0; i <= 8; i++)
… …
464 case NOCHAR: 467 case NOCHAR:
465 break; 468 break;
466 469
467 default: 470 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 471 XDrawRectangle (disp, d, TGC, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 472 fwidth - 4, r->fheight - 4);
470 } 473 }
471 474
472 x += fwidth; 475 x += fwidth;
473 } 476 }
474} 477}
… …
523bool 526bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 527rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 528{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 529 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
527 p.height = height; 530 p.height = height;
531 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 532 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
529 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 533 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 534
531 return true; 535 return true;
532} 536}
… …
552 556
553 set_properties (p, height, weight, slant, avgwidth); 557 set_properties (p, height, weight, slant, avgwidth);
554 558
555 free (weight); 559 free (weight);
556 free (slant); 560 free (slant);
561
562 p.ascent = f->ascent;
557 563
558 return true; 564 return true;
559} 565}
560 566
561bool 567bool
… …
716 722
717 int diff = 0; 723 int diff = 0;
718 724
719 if (replace_field (fname, list[i], 6, '0', field_str)) 725 if (replace_field (fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 726 diff += 10; // slightly penalize scalable fonts
727 else if (replace_field (fname, list[i], 11, '0', "0"))
728 diff += 300; // more heavily penalize what looks like scaled bitmap fotns
721 729
722 if (!set_properties (p, fname)) 730 if (!set_properties (p, fname))
723 continue; 731 continue;
724 732
725 if (prop.height != rxvt_fontprop::unset 733 if (prop.height != rxvt_fontprop::unset
… …
741 for (;;) 749 for (;;)
742 { 750 {
743 font_weight *best = fonts + count - 1; 751 font_weight *best = fonts + count - 1;
744 752
745 for (font_weight *w = best; w-- > fonts; ) 753 for (font_weight *w = best; w-- > fonts; )
746 if (w->diff < best->diff) 754 if (w->diff <= best->diff)
747 best = w; 755 best = w;
748 756
749 if (!best->name 757 if (!best->name
750 || !(f = XLoadQueryFont (disp, best->name))) 758 || !(f = XLoadQueryFont (disp, best->name)))
751 break; 759 break;
… …
849 857
850 XCharStruct g; 858 XCharStruct g;
851 int dir_ret, asc_ret, des_ret; 859 int dir_ret, asc_ret, des_ret;
852 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853 861
854 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 862 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
855 863
856 if (width < g.width) width = g.width; 864 if (width < g.width) width = g.width;
857 } 865 }
858 866
859 if (cs == CS_UNKNOWN) 867 if (cs == CS_UNKNOWN)
… …
934 return true; 942 return true;
935 943
936 // check character against base font bounding box 944 // check character against base font bounding box
937 int w = xcs->width; 945 int w = xcs->width;
938 int wcw = wcwidth (unicode); 946 int wcw = wcwidth (unicode);
939 if (wcw > 0) w /= wcw; 947 if (wcw > 0) w = (w + wcw - 1) / wcw;
940 948
941 careful = w > prop->width; 949 careful = w > prop->width;
942 if (careful && w > prop->width * MAX_OVERLAP >> 2) 950 if (careful && w > prop->width * MAX_OVERLAP >> 2)
943 return false; 951 return false;
944 952
… …
954 // and it is a mess /. 962 // and it is a mess /.
955 // yet we are trying to be perfect /. 963 // yet we are trying to be perfect /.
956 // but the result still isn't perfect /. 964 // but the result still isn't perfect /.
957 965
958 bool slow = this->slow 966 bool slow = this->slow
959 || width != r->TermWin.fwidth 967 || width != r->fwidth
960 || height != r->TermWin.fheight; 968 || height != r->fheight;
961 969
962 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 970 int base = ascent; // sorry, incorrect: r->fbase;
963 971
964 XGCValues v; 972 XGCValues v;
965 v.foreground = r->pix_colors[fg]; 973 v.foreground = r->pix_colors[fg];
966 v.font = f->fid; 974 v.font = f->fid;
967 975
… …
975 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 983 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
976 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 984 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
977 } 985 }
978 else 986 else
979 { 987 {
980 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 988 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
981 989
982 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 990 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
983 991
984 if (slow) 992 if (slow)
985 { 993 {
986 do 994 do
987 { 995 {
988 if (xc->byte1 || xc->byte2) 996 if (xc->byte1 || xc->byte2)
989 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 997 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
990 998
991 x += r->TermWin.fwidth; 999 x += r->fwidth;
992 xc++; len--; 1000 xc++; len--;
993 } 1001 }
994 while (len); 1002 while (len);
995 } 1003 }
996 else 1004 else
… …
1007 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1015 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
1008 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1016 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
1009 } 1017 }
1010 else 1018 else
1011 { 1019 {
1012 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1020 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1013 1021
1014 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1022 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
1015 1023
1016 if (slow) 1024 if (slow)
1017 { 1025 {
1018 do 1026 do
1019 { 1027 {
1020 if (*xc) 1028 if (*xc)
1021 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1029 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
1022 1030
1023 x += r->TermWin.fwidth; 1031 x += r->fwidth;
1024 xc++; len--; 1032 xc++; len--;
1025 } 1033 }
1026 while (len); 1034 while (len);
1027 } 1035 }
1028 else 1036 else
… …
1071 1079
1072 FT_Face face = XftLockFace (f); 1080 FT_Face face = XftLockFace (f);
1073 1081
1074 p.width = width; 1082 p.width = width;
1075 p.height = height; 1083 p.height = height;
1084 p.ascent = ascent;
1076 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1085 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1086 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1087 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1088 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080 1089
… …
1096 return false; 1105 return false;
1097 1106
1098 FcValue v; 1107 FcValue v;
1099 1108
1100 if (prop.height != rxvt_fontprop::unset 1109 if (prop.height != rxvt_fontprop::unset
1101 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1110 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1111 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1112 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104 1113
1105 if (prop.weight != rxvt_fontprop::unset 1114 if (prop.weight != rxvt_fontprop::unset
1106 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1115 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1152 1161
1153 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1162 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154 1163
1155 XftUnlockFace (f); 1164 XftUnlockFace (f);
1156 1165
1166 int glheight = height;
1167
1157 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1168 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1158 { 1169 {
1159 FcChar16 ch = *t; 1170 FcChar16 ch = *t;
1160 1171
1161 if (cs != CS_UNICODE 1172 if (cs != CS_UNICODE
… …
1169 continue; 1180 continue;
1170 1181
1171 XGlyphInfo g; 1182 XGlyphInfo g;
1172 XftTextExtents16 (disp, f, &ch, 1, &g); 1183 XftTextExtents16 (disp, f, &ch, 1, &g);
1173 1184
1185 g.width -= g.x;
1186
1174 int wcw = wcwidth (ch); 1187 int wcw = wcwidth (ch);
1175 if (wcw > 0) g.width = g.width / wcw; 1188 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176 1189
1177 if (width < g.width) width = g.width; 1190 if (width < g.width ) width = g.width;
1178 if (height < g.height) height = g.height; 1191 if (height < g.height ) height = g.height;
1192 if (glheight < g.height - g.y) glheight = g.height - g.y;
1193 }
1194
1195 if (!width)
1196 {
1197 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1198
1199 XftFontClose (disp, f);
1200 f = 0;
1201
1202 success = false;
1203 break;
1179 } 1204 }
1180 1205
1181 if (prop.height == rxvt_fontprop::unset 1206 if (prop.height == rxvt_fontprop::unset
1182 || height <= prop.height 1207 || (height <= prop.height && glheight <= prop.height)
1183 || height <= 2 1208 || height <= 2
1184 || !scalable) 1209 || !scalable)
1185 break; 1210 break;
1186 1211
1187 if (ftheight) 1212 if (ftheight)
… …
1194 ftheight -= height - prop.height; 1219 ftheight -= height - prop.height;
1195 } 1220 }
1196 else 1221 else
1197 ftheight = prop.height - 1; 1222 ftheight = prop.height - 1;
1198 1223
1199 XftFontClose (disp, f); 1224 XftFontClose (disp, f);
1200 FcPatternDel (match, FC_PIXEL_SIZE); 1225 FcPatternDel (match, FC_PIXEL_SIZE);
1201 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1226 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202 } 1227 }
1203 1228
1204 FcPatternDestroy (match); 1229 FcPatternDestroy (match);
1205 1230
1206#if 0 // do it per-character 1231#if 0 // do it per-character
… …
1228 // check character against base font bounding box 1253 // check character against base font bounding box
1229 FcChar32 ch = unicode; 1254 FcChar32 ch = unicode;
1230 XGlyphInfo g; 1255 XGlyphInfo g;
1231 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1256 XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
1232 1257
1233 int w = g.width; 1258 int w = g.width - g.x;
1234 int wcw = wcwidth (unicode); 1259 int wcw = wcwidth (unicode);
1235 if (wcw > 0) w /= wcw; 1260 if (wcw > 0) w = (w + wcw - 1) / wcw;
1236 1261
1237 careful = w > prop->width; 1262 careful = w > prop->width;
1238 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1263 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1239 return false; 1264 return false;
1240 1265
… …
1244void 1269void
1245rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1270rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246 const text_t *text, int len, 1271 const text_t *text, int len,
1247 int fg, int bg) 1272 int fg, int bg)
1248{ 1273{
1249 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1274 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1250
1251 int base = ascent; // should be fbase, but that is incorrect
1252 1275
1253 XGlyphInfo extents; 1276 XGlyphInfo extents;
1254 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1277 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec));
1255 FcChar32 *ep = enc; 1278 XftGlyphSpec *ep = enc;
1256 int ewidth = 0; 1279
1257 int xoff = 0; 1280 // cut trailing spaces
1281 while (len && text [len - 1] == ' ')
1282 len--;
1258 1283
1259 while (len) 1284 while (len)
1260 { 1285 {
1261 int cwidth = r->TermWin.fwidth; 1286 int cwidth = r->fwidth;
1262 FcChar32 fc = *text++; len--; 1287 FcChar32 fc = *text++; len--;
1263 FT_UInt gl;
1264 1288
1265 while (len && *text == NOCHAR) 1289 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1290 text++, len--, cwidth += r->fwidth;
1267 1291
1292 if (fc != ' ') // skip spaces
1293 {
1268 gl = XftCharIndex (d.display->display, f, fc); 1294 FT_UInt glyph = XftCharIndex (d.display->display, f, fc);
1269 XftGlyphExtents (d.display->display, f, &gl, 1, &extents); 1295 XftGlyphExtents (d.display->display, f, &glyph, 1, &extents);
1270 1296
1271 if (extents.xOff != cwidth && ep != enc) 1297 ep->glyph = glyph;
1298 ep->x = x + (cwidth - extents.xOff >> 1);
1299 ep->y = y + ascent;
1300 ep++;
1272 { 1301 }
1273 if (xoff > ewidth) xoff = ewidth;
1274 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275 x + (ewidth - xoff >> 1),
1276 y + base, enc, ep - enc);
1277 x += ewidth;
1278 1302
1279 ep = enc;
1280 ewidth = 0;
1281 xoff = 0;
1282 }
1283
1284 if (fc == ' ' && ep == enc) // skip leading spaces
1285 {
1286 x += cwidth; 1303 x += cwidth;
1287 continue;
1288 }
1289
1290 else
1291 {
1292 *ep++ = gl;
1293 ewidth += cwidth;
1294 xoff += extents.xOff;
1295 }
1296 } 1304 }
1297 1305
1298 if (ep != enc) 1306 if (ep != enc)
1299 {
1300 if (xoff > ewidth) xoff = ewidth;
1301 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1307 XftDrawGlyphSpec (d, &r->pix_colors[fg].c, f, enc, ep - enc);
1302 x + (ewidth - xoff >> 1),
1303 y + base, enc, ep - enc);
1304 }
1305} 1308}
1306#endif 1309#endif
1307 1310
1308///////////////////////////////////////////////////////////////////////////// 1311/////////////////////////////////////////////////////////////////////////////
1309 1312
1310rxvt_fontset::rxvt_fontset (rxvt_t r) 1313rxvt_fontset::rxvt_fontset (rxvt_t r)
1311: r (r), fontdesc (0) 1314: fontdesc (0), r (r)
1312{ 1315{
1313 clear (); 1316 clear ();
1314} 1317}
1315 1318
1316rxvt_fontset::~rxvt_fontset () 1319rxvt_fontset::~rxvt_fontset ()
… …
1319} 1322}
1320 1323
1321void 1324void
1322rxvt_fontset::clear () 1325rxvt_fontset::clear ()
1323{ 1326{
1324 prop.width = prop.height = prop.weight = prop.slant 1327 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325 = rxvt_fontprop::unset; 1328 = rxvt_fontprop::unset;
1326 1329
1327 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1330 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328 FONT_UNREF (*i); 1331 FONT_UNREF (*i);
1329 1332
… …
1502 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1505 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1503 goto next_font; 1506 goto next_font;
1504 1507
1505 if (!realize_font (i)) 1508 if (!realize_font (i))
1506 goto next_font; 1509 goto next_font;
1510
1511 if (prop.ascent != rxvt_fontprop::unset)
1512 max_it (f->ascent, prop.ascent);
1507 } 1513 }
1508 1514
1509 if (f->cs == CS_UNKNOWN) 1515 if (f->cs == CS_UNKNOWN)
1510 goto next_font; 1516 goto next_font;
1511 1517

Diff Legend

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