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.71 by root, Sat Jun 18 10:02:35 2005 UTC vs.
Revision 1.75 by root, Sun Dec 18 00:59:42 2005 UTC

… …
27#include <cstdlib> 27#include <cstdlib>
28#include <wchar.h> 28#include <wchar.h>
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#define DISPLAY r->display->display 31#define DISPLAY r->display->display
32#define TGC r->TermWin.gc 32#define TGC r->gc
33 33
34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 34#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
35 35
36const struct rxvt_fallback_font { 36const struct rxvt_fallback_font {
37 codeset cs; 37 codeset cs;
… …
333 const text_t *text, int len, 333 const text_t *text, int len,
334 int fg, int bg) 334 int fg, int bg)
335{ 335{
336 Display *disp = d.display->display; 336 Display *disp = d.display->display;
337 337
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 338 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
339 339
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 340 XSetForeground (disp, TGC, r->pix_colors[fg]);
341 341
342 while (len) 342 while (len)
343 { 343 {
… …
349 349
350 while (++text, --len && *text == NOCHAR) 350 while (++text, --len && *text == NOCHAR)
351 ; 351 ;
352 352
353 int width = text - tp; 353 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 354 int fwidth = r->fwidth * width;
355 355
356 if (0x2500 <= t && t <= 0x259f) 356 if (0x2500 <= t && t <= 0x259f)
357 { 357 {
358 uint16_t offs = linedraw_offs[t - 0x2500]; 358 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 359 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 360 uint32_t *b = a + (offs & 15);
361 361
362 int W = fwidth; 362 int W = fwidth;
363 int H = r->TermWin.fheight; 363 int H = r->fheight;
364 364
365 int x_[16]; 365 int x_[16];
366 int y_[16]; 366 int y_[16];
367 367
368 for (int i = 0; i <= 8; i++) 368 for (int i = 0; i <= 8; i++)
… …
464 case NOCHAR: 464 case NOCHAR:
465 break; 465 break;
466 466
467 default: 467 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 468 XDrawRectangle (disp, d, TGC, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 469 fwidth - 4, r->fheight - 4);
470 } 470 }
471 471
472 x += fwidth; 472 x += fwidth;
473 } 473 }
474} 474}
… …
851 851
852 XCharStruct g; 852 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 853 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 855
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 856 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 857
858 if (width < g.width) width = g.width; 858 if (width < g.width) width = g.width;
859 } 859 }
860 860
861 if (cs == CS_UNKNOWN) 861 if (cs == CS_UNKNOWN)
… …
936 return true; 936 return true;
937 937
938 // check character against base font bounding box 938 // check character against base font bounding box
939 int w = xcs->width; 939 int w = xcs->width;
940 int wcw = wcwidth (unicode); 940 int wcw = wcwidth (unicode);
941 if (wcw > 0) w /= wcw; 941 if (wcw > 0) w = (w + wcw - 1) / wcw;
942 942
943 careful = w > prop->width; 943 careful = w > prop->width;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 944 if (careful && w > prop->width * MAX_OVERLAP >> 2)
945 return false; 945 return false;
946 946
… …
956 // and it is a mess /. 956 // and it is a mess /.
957 // yet we are trying to be perfect /. 957 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 958 // but the result still isn't perfect /.
959 959
960 bool slow = this->slow 960 bool slow = this->slow
961 || width != r->TermWin.fwidth 961 || width != r->fwidth
962 || height != r->TermWin.fheight; 962 || height != r->fheight;
963 963
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 964 int base = ascent; // sorry, incorrect: r->fbase;
965 965
966 XGCValues v; 966 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 967 v.foreground = r->pix_colors[fg];
968 v.font = f->fid; 968 v.font = f->fid;
969 969
… …
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
979 } 979 }
980 else 980 else
981 { 981 {
982 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 982 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
983 983
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
985 985
986 if (slow) 986 if (slow)
987 { 987 {
988 do 988 do
989 { 989 {
990 if (xc->byte1 || xc->byte2) 990 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
992 992
993 x += r->TermWin.fwidth; 993 x += r->fwidth;
994 xc++; len--; 994 xc++; len--;
995 } 995 }
996 while (len); 996 while (len);
997 } 997 }
998 else 998 else
… …
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
1011 } 1011 }
1012 else 1012 else
1013 { 1013 {
1014 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1014 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1015 1015
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
1017 1017
1018 if (slow) 1018 if (slow)
1019 { 1019 {
1020 do 1020 do
1021 { 1021 {
1022 if (*xc) 1022 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
1024 1024
1025 x += r->TermWin.fwidth; 1025 x += r->fwidth;
1026 xc++; len--; 1026 xc++; len--;
1027 } 1027 }
1028 while (len); 1028 while (len);
1029 } 1029 }
1030 else 1030 else
… …
1154 1154
1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1156 1156
1157 XftUnlockFace (f); 1157 XftUnlockFace (f);
1158 1158
1159 int glheight = height;
1160
1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1161 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1160 { 1162 {
1161 FcChar16 ch = *t; 1163 FcChar16 ch = *t;
1162 1164
1163 if (cs != CS_UNICODE 1165 if (cs != CS_UNICODE
… …
1171 continue; 1173 continue;
1172 1174
1173 XGlyphInfo g; 1175 XGlyphInfo g;
1174 XftTextExtents16 (disp, f, &ch, 1, &g); 1176 XftTextExtents16 (disp, f, &ch, 1, &g);
1175 1177
1178 g.width -= g.x;
1179
1176 int wcw = wcwidth (ch); 1180 int wcw = wcwidth (ch);
1177 if (wcw > 0) g.width = g.width / wcw; 1181 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1178 1182
1179 if (width < g.width) width = g.width; 1183 if (width < g.width ) width = g.width;
1180 if (height < g.height) height = g.height; 1184 if (height < g.height ) height = g.height;
1185 if (glheight < g.height - g.y) glheight = g.height - g.y;
1186 }
1187
1188 if (!width)
1189 {
1190 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1191
1192 XftFontClose (disp, f);
1193 f = 0;
1194
1195 success = false;
1196 break;
1181 } 1197 }
1182 1198
1183 if (prop.height == rxvt_fontprop::unset 1199 if (prop.height == rxvt_fontprop::unset
1184 || height <= prop.height 1200 || (height <= prop.height && glheight <= prop.height)
1185 || height <= 2 1201 || height <= 2
1186 || !scalable) 1202 || !scalable)
1187 break; 1203 break;
1188 1204
1189 if (ftheight) 1205 if (ftheight)
… …
1196 ftheight -= height - prop.height; 1212 ftheight -= height - prop.height;
1197 } 1213 }
1198 else 1214 else
1199 ftheight = prop.height - 1; 1215 ftheight = prop.height - 1;
1200 1216
1201 XftFontClose (disp, f); 1217 XftFontClose (disp, f);
1202 FcPatternDel (match, FC_PIXEL_SIZE); 1218 FcPatternDel (match, FC_PIXEL_SIZE);
1203 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1219 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1204 } 1220 }
1205 1221
1206 FcPatternDestroy (match); 1222 FcPatternDestroy (match);
1207 1223
1208#if 0 // do it per-character 1224#if 0 // do it per-character
… …
1230 // check character against base font bounding box 1246 // check character against base font bounding box
1231 FcChar32 ch = unicode; 1247 FcChar32 ch = unicode;
1232 XGlyphInfo g; 1248 XGlyphInfo g;
1233 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1249 XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
1234 1250
1235 int w = g.width; 1251 int w = g.width - g.x;
1236 int wcw = wcwidth (unicode); 1252 int wcw = wcwidth (unicode);
1237 if (wcw > 0) w /= wcw; 1253 if (wcw > 0) w = (w + wcw - 1) / wcw;
1238 1254
1239 careful = w > prop->width; 1255 careful = w > prop->width;
1240 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1256 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1241 return false; 1257 return false;
1242 1258
… …
1246void 1262void
1247rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1263rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1248 const text_t *text, int len, 1264 const text_t *text, int len,
1249 int fg, int bg) 1265 int fg, int bg)
1250{ 1266{
1251 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1267 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1252 1268
1253 int base = ascent; // should be fbase, but that is incorrect 1269 int base = ascent; // should be fbase, but that is incorrect
1254 1270
1255 XGlyphInfo extents; 1271 XGlyphInfo extents;
1256 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1272 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32));
1257 FcChar32 *ep = enc; 1273 FcChar32 *ep = enc;
1258 int ewidth = 0; 1274 int ewidth = 0;
1259 1275
1260 while (len) 1276 while (len)
1261 { 1277 {
1262 int cwidth = r->TermWin.fwidth; 1278 int cwidth = r->fwidth;
1263 FcChar32 fc = *text++; len--; 1279 FcChar32 fc = *text++; len--;
1264 1280
1265 while (len && *text == NOCHAR) 1281 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1282 text++, len--, cwidth += r->fwidth;
1267 1283
1268 if (fc == ' ' && ep == enc) // skip leading spaces 1284 if (fc == ' ' && ep == enc) // skip leading spaces
1269 x += cwidth; 1285 x += cwidth;
1270 else 1286 else
1271 { 1287 {
… …
1307#endif 1323#endif
1308 1324
1309///////////////////////////////////////////////////////////////////////////// 1325/////////////////////////////////////////////////////////////////////////////
1310 1326
1311rxvt_fontset::rxvt_fontset (rxvt_t r) 1327rxvt_fontset::rxvt_fontset (rxvt_t r)
1312: r (r), fontdesc (0) 1328: fontdesc (0), r (r)
1313{ 1329{
1314 clear (); 1330 clear ();
1315} 1331}
1316 1332
1317rxvt_fontset::~rxvt_fontset () 1333rxvt_fontset::~rxvt_fontset ()

Diff Legend

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