… | |
… | |
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" |
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 | |
36 | const struct rxvt_fallback_font { |
37 | const struct rxvt_fallback_font { |
37 | codeset cs; |
38 | codeset cs; |
… | |
… | |
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 | ! OPTION_R (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 && |
|
|
360 | ! OPTION_R (Opt_skipBuiltinGlyphs)) |
357 | { |
361 | { |
358 | uint16_t offs = linedraw_offs[t - 0x2500]; |
362 | uint16_t offs = linedraw_offs[t - 0x2500]; |
359 | uint32_t *a = linedraw_command + (offs >> 4); |
363 | uint32_t *a = linedraw_command + (offs >> 4); |
360 | uint32_t *b = a + (offs & 15); |
364 | uint32_t *b = a + (offs & 15); |
361 | |
365 | |
362 | int W = fwidth; |
366 | int W = fwidth; |
363 | int H = r->TermWin.fheight; |
367 | int H = r->fheight; |
364 | |
368 | |
365 | int x_[16]; |
369 | int x_[16]; |
366 | int y_[16]; |
370 | int y_[16]; |
367 | |
371 | |
368 | for (int i = 0; i <= 8; i++) |
372 | for (int i = 0; i <= 8; i++) |
… | |
… | |
464 | case NOCHAR: |
468 | case NOCHAR: |
465 | break; |
469 | break; |
466 | |
470 | |
467 | default: |
471 | default: |
468 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
472 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
469 | fwidth - 4, r->TermWin.fheight - 4); |
473 | fwidth - 4, r->fheight - 4); |
470 | } |
474 | } |
471 | |
475 | |
472 | x += fwidth; |
476 | x += fwidth; |
473 | } |
477 | } |
474 | } |
478 | } |
… | |
… | |
523 | bool |
527 | bool |
524 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
528 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
525 | { |
529 | { |
526 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
530 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
527 | p.height = height; |
531 | p.height = height; |
|
|
532 | p.ascent = rxvt_fontprop::unset; |
528 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
533 | 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; |
534 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
530 | |
535 | |
531 | return true; |
536 | return true; |
532 | } |
537 | } |
… | |
… | |
552 | |
557 | |
553 | set_properties (p, height, weight, slant, avgwidth); |
558 | set_properties (p, height, weight, slant, avgwidth); |
554 | |
559 | |
555 | free (weight); |
560 | free (weight); |
556 | free (slant); |
561 | free (slant); |
|
|
562 | |
|
|
563 | p.ascent = f->ascent; |
557 | |
564 | |
558 | return true; |
565 | return true; |
559 | } |
566 | } |
560 | |
567 | |
561 | bool |
568 | bool |
… | |
… | |
851 | |
858 | |
852 | XCharStruct g; |
859 | XCharStruct g; |
853 | int dir_ret, asc_ret, des_ret; |
860 | int dir_ret, asc_ret, des_ret; |
854 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
861 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
855 | |
862 | |
856 | int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; |
863 | int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
857 | |
864 | |
858 | if (width < g.width) width = g.width; |
865 | if (width < g.width) width = g.width; |
859 | } |
866 | } |
860 | |
867 | |
861 | if (cs == CS_UNKNOWN) |
868 | if (cs == CS_UNKNOWN) |
… | |
… | |
936 | return true; |
943 | return true; |
937 | |
944 | |
938 | // check character against base font bounding box |
945 | // check character against base font bounding box |
939 | int w = xcs->width; |
946 | int w = xcs->width; |
940 | int wcw = wcwidth (unicode); |
947 | int wcw = wcwidth (unicode); |
941 | if (wcw > 0) w /= wcw; |
948 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
942 | |
949 | |
943 | careful = w > prop->width; |
950 | careful = w > prop->width; |
944 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
951 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
945 | return false; |
952 | return false; |
946 | |
953 | |
… | |
… | |
956 | // and it is a mess /. |
963 | // and it is a mess /. |
957 | // yet we are trying to be perfect /. |
964 | // yet we are trying to be perfect /. |
958 | // but the result still isn't perfect /. |
965 | // but the result still isn't perfect /. |
959 | |
966 | |
960 | bool slow = this->slow |
967 | bool slow = this->slow |
961 | || width != r->TermWin.fwidth |
968 | || width != r->fwidth |
962 | || height != r->TermWin.fheight; |
969 | || height != r->fheight; |
963 | |
970 | |
964 | int base = ascent; // sorry, incorrect: r->TermWin.fbase; |
971 | int base = ascent; // sorry, incorrect: r->fbase; |
965 | |
972 | |
966 | XGCValues v; |
973 | XGCValues v; |
967 | v.foreground = r->pix_colors[fg]; |
974 | v.foreground = r->pix_colors[fg]; |
968 | v.font = f->fid; |
975 | v.font = f->fid; |
969 | |
976 | |
… | |
… | |
977 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
984 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
978 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
985 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
979 | } |
986 | } |
980 | else |
987 | else |
981 | { |
988 | { |
982 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
989 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
983 | |
990 | |
984 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
991 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
985 | |
992 | |
986 | if (slow) |
993 | if (slow) |
987 | { |
994 | { |
988 | do |
995 | do |
989 | { |
996 | { |
990 | if (xc->byte1 || xc->byte2) |
997 | if (xc->byte1 || xc->byte2) |
991 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
998 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
992 | |
999 | |
993 | x += r->TermWin.fwidth; |
1000 | x += r->fwidth; |
994 | xc++; len--; |
1001 | xc++; len--; |
995 | } |
1002 | } |
996 | while (len); |
1003 | while (len); |
997 | } |
1004 | } |
998 | else |
1005 | else |
… | |
… | |
1009 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1016 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1010 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1017 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1011 | } |
1018 | } |
1012 | else |
1019 | else |
1013 | { |
1020 | { |
1014 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1021 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
1015 | |
1022 | |
1016 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1023 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1017 | |
1024 | |
1018 | if (slow) |
1025 | if (slow) |
1019 | { |
1026 | { |
1020 | do |
1027 | do |
1021 | { |
1028 | { |
1022 | if (*xc) |
1029 | if (*xc) |
1023 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1030 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1024 | |
1031 | |
1025 | x += r->TermWin.fwidth; |
1032 | x += r->fwidth; |
1026 | xc++; len--; |
1033 | xc++; len--; |
1027 | } |
1034 | } |
1028 | while (len); |
1035 | while (len); |
1029 | } |
1036 | } |
1030 | else |
1037 | else |
… | |
… | |
1073 | |
1080 | |
1074 | FT_Face face = XftLockFace (f); |
1081 | FT_Face face = XftLockFace (f); |
1075 | |
1082 | |
1076 | p.width = width; |
1083 | p.width = width; |
1077 | p.height = height; |
1084 | p.height = height; |
|
|
1085 | p.ascent = ascent; |
1078 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1086 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1079 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1087 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1080 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1088 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1081 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1089 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1082 | |
1090 | |
… | |
… | |
1154 | |
1162 | |
1155 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1163 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1156 | |
1164 | |
1157 | XftUnlockFace (f); |
1165 | XftUnlockFace (f); |
1158 | |
1166 | |
|
|
1167 | int glheight = height; |
|
|
1168 | |
1159 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1169 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1160 | { |
1170 | { |
1161 | FcChar16 ch = *t; |
1171 | FcChar16 ch = *t; |
1162 | |
1172 | |
1163 | if (cs != CS_UNICODE |
1173 | if (cs != CS_UNICODE |
… | |
… | |
1171 | continue; |
1181 | continue; |
1172 | |
1182 | |
1173 | XGlyphInfo g; |
1183 | XGlyphInfo g; |
1174 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1184 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1175 | |
1185 | |
|
|
1186 | g.width -= g.x; |
|
|
1187 | |
1176 | int wcw = wcwidth (ch); |
1188 | int wcw = wcwidth (ch); |
1177 | if (wcw > 0) g.width = g.width / wcw; |
1189 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1178 | |
1190 | |
1179 | if (width < g.width) width = g.width; |
1191 | if (width < g.width ) width = g.width; |
1180 | if (height < g.height) height = g.height; |
1192 | if (height < g.height ) height = g.height; |
|
|
1193 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
|
|
1194 | } |
|
|
1195 | |
|
|
1196 | if (!width) |
|
|
1197 | { |
|
|
1198 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
|
|
1199 | |
|
|
1200 | XftFontClose (disp, f); |
|
|
1201 | f = 0; |
|
|
1202 | |
|
|
1203 | success = false; |
|
|
1204 | break; |
1181 | } |
1205 | } |
1182 | |
1206 | |
1183 | if (prop.height == rxvt_fontprop::unset |
1207 | if (prop.height == rxvt_fontprop::unset |
1184 | || height <= prop.height |
1208 | || (height <= prop.height && glheight <= prop.height) |
1185 | || height <= 2 |
1209 | || height <= 2 |
1186 | || !scalable) |
1210 | || !scalable) |
1187 | break; |
1211 | break; |
1188 | |
1212 | |
1189 | if (ftheight) |
1213 | if (ftheight) |
… | |
… | |
1196 | ftheight -= height - prop.height; |
1220 | ftheight -= height - prop.height; |
1197 | } |
1221 | } |
1198 | else |
1222 | else |
1199 | ftheight = prop.height - 1; |
1223 | ftheight = prop.height - 1; |
1200 | |
1224 | |
1201 | XftFontClose (disp, f); |
1225 | XftFontClose (disp, f); |
1202 | FcPatternDel (match, FC_PIXEL_SIZE); |
1226 | FcPatternDel (match, FC_PIXEL_SIZE); |
1203 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1227 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1204 | } |
1228 | } |
1205 | |
1229 | |
1206 | FcPatternDestroy (match); |
1230 | FcPatternDestroy (match); |
1207 | |
1231 | |
1208 | #if 0 // do it per-character |
1232 | #if 0 // do it per-character |
… | |
… | |
1230 | // check character against base font bounding box |
1254 | // check character against base font bounding box |
1231 | FcChar32 ch = unicode; |
1255 | FcChar32 ch = unicode; |
1232 | XGlyphInfo g; |
1256 | XGlyphInfo g; |
1233 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1257 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1234 | |
1258 | |
1235 | int w = g.width; |
1259 | int w = g.width - g.x; |
1236 | int wcw = wcwidth (unicode); |
1260 | int wcw = wcwidth (unicode); |
1237 | if (wcw > 0) w /= wcw; |
1261 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
1238 | |
1262 | |
1239 | careful = w > prop->width; |
1263 | careful = w > prop->width; |
1240 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1264 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1241 | return false; |
1265 | return false; |
1242 | |
1266 | |
… | |
… | |
1246 | void |
1270 | void |
1247 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1271 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1248 | const text_t *text, int len, |
1272 | const text_t *text, int len, |
1249 | int fg, int bg) |
1273 | int fg, int bg) |
1250 | { |
1274 | { |
1251 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1275 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
1252 | |
1276 | |
1253 | int base = ascent; // should be fbase, but that is incorrect |
1277 | int base = ascent; // should be fbase, but that is incorrect |
1254 | |
1278 | |
1255 | XGlyphInfo extents; |
1279 | XGlyphInfo extents; |
1256 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1280 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1257 | FcChar32 *ep = enc; |
1281 | FcChar32 *ep = enc; |
1258 | int ewidth = 0; |
1282 | int ewidth = 0; |
1259 | |
1283 | |
1260 | while (len) |
1284 | while (len) |
1261 | { |
1285 | { |
1262 | int cwidth = r->TermWin.fwidth; |
1286 | int cwidth = r->fwidth; |
1263 | FcChar32 fc = *text++; len--; |
1287 | FcChar32 fc = *text++; len--; |
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 | |
1268 | if (fc == ' ' && ep == enc) // skip leading spaces |
1292 | if (fc == ' ' && ep == enc) // skip leading spaces |
1269 | x += cwidth; |
1293 | x += cwidth; |
1270 | else |
1294 | else |
1271 | { |
1295 | { |
… | |
… | |
1307 | #endif |
1331 | #endif |
1308 | |
1332 | |
1309 | ///////////////////////////////////////////////////////////////////////////// |
1333 | ///////////////////////////////////////////////////////////////////////////// |
1310 | |
1334 | |
1311 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1335 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1312 | : r (r), fontdesc (0) |
1336 | : fontdesc (0), r (r) |
1313 | { |
1337 | { |
1314 | clear (); |
1338 | clear (); |
1315 | } |
1339 | } |
1316 | |
1340 | |
1317 | rxvt_fontset::~rxvt_fontset () |
1341 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1320 | } |
1344 | } |
1321 | |
1345 | |
1322 | void |
1346 | void |
1323 | rxvt_fontset::clear () |
1347 | rxvt_fontset::clear () |
1324 | { |
1348 | { |
1325 | prop.width = prop.height = prop.weight = prop.slant |
1349 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1326 | = rxvt_fontprop::unset; |
1350 | = rxvt_fontprop::unset; |
1327 | |
1351 | |
1328 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1352 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1329 | FONT_UNREF (*i); |
1353 | FONT_UNREF (*i); |
1330 | |
1354 | |
… | |
… | |
1503 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1527 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1504 | goto next_font; |
1528 | goto next_font; |
1505 | |
1529 | |
1506 | if (!realize_font (i)) |
1530 | if (!realize_font (i)) |
1507 | goto next_font; |
1531 | goto next_font; |
|
|
1532 | |
|
|
1533 | if (prop.ascent != rxvt_fontprop::unset) |
|
|
1534 | max_it (f->ascent, prop.ascent); |
1508 | } |
1535 | } |
1509 | |
1536 | |
1510 | if (f->cs == CS_UNKNOWN) |
1537 | if (f->cs == CS_UNKNOWN) |
1511 | goto next_font; |
1538 | goto next_font; |
1512 | |
1539 | |