st-ligatures-alpha-20230105-0.9.diff (17805B)
1 diff --git a/Makefile b/Makefile 2 index 470ac86..38240da 100644 3 --- a/Makefile 4 +++ b/Makefile 5 @@ -4,7 +4,7 @@ 6 7 include config.mk 8 9 -SRC = st.c x.c 10 +SRC = st.c x.c hb.c 11 OBJ = $(SRC:.c=.o) 12 13 all: options st 14 @@ -22,7 +22,8 @@ config.h: 15 $(CC) $(STCFLAGS) -c $< 16 17 st.o: config.h st.h win.h 18 -x.o: arg.h config.h st.h win.h 19 +x.o: arg.h config.h st.h win.h hb.h 20 +hb.o: st.h 21 22 $(OBJ): config.h config.mk 23 24 diff --git a/config.mk b/config.mk 25 index 47c615e..d7439a3 100644 26 --- a/config.mk 27 +++ b/config.mk 28 @@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config 29 # includes and libs 30 INCS = -I$(X11INC) \ 31 `$(PKG_CONFIG) --cflags fontconfig` \ 32 - `$(PKG_CONFIG) --cflags freetype2` 33 -LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\ 34 + `$(PKG_CONFIG) --cflags freetype2` \ 35 + `$(PKG_CONFIG) --cflags harfbuzz` 36 +LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender \ 37 `$(PKG_CONFIG) --libs fontconfig` \ 38 - `$(PKG_CONFIG) --libs freetype2` 39 + `$(PKG_CONFIG) --libs freetype2` \ 40 + `$(PKG_CONFIG) --libs harfbuzz` 41 42 # flags 43 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 44 diff --git a/hb.c b/hb.c 45 new file mode 100644 46 index 0000000..528c040 47 --- /dev/null 48 +++ b/hb.c 49 @@ -0,0 +1,124 @@ 50 +#include <stdlib.h> 51 +#include <stdio.h> 52 +#include <math.h> 53 +#include <X11/Xft/Xft.h> 54 +#include <X11/cursorfont.h> 55 +#include <hb.h> 56 +#include <hb-ft.h> 57 + 58 +#include "st.h" 59 +#include "hb.h" 60 + 61 +#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END } 62 +#define BUFFER_STEP 256 63 + 64 +hb_font_t *hbfindfont(XftFont *match); 65 + 66 +typedef struct { 67 + XftFont *match; 68 + hb_font_t *font; 69 +} HbFontMatch; 70 + 71 +typedef struct { 72 + size_t capacity; 73 + HbFontMatch *fonts; 74 +} HbFontCache; 75 + 76 +static HbFontCache hbfontcache = { 0, NULL }; 77 + 78 +typedef struct { 79 + size_t capacity; 80 + Rune *runes; 81 +} RuneBuffer; 82 + 83 +static RuneBuffer hbrunebuffer = { 0, NULL }; 84 + 85 +/* 86 + * Poplulate the array with a list of font features, wrapped in FEATURE macro, 87 + * e. g. 88 + * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g') 89 + */ 90 +hb_feature_t features[] = { }; 91 + 92 +void 93 +hbunloadfonts() 94 +{ 95 + for (int i = 0; i < hbfontcache.capacity; i++) { 96 + hb_font_destroy(hbfontcache.fonts[i].font); 97 + XftUnlockFace(hbfontcache.fonts[i].match); 98 + } 99 + 100 + if (hbfontcache.fonts != NULL) { 101 + free(hbfontcache.fonts); 102 + hbfontcache.fonts = NULL; 103 + } 104 + hbfontcache.capacity = 0; 105 +} 106 + 107 +hb_font_t * 108 +hbfindfont(XftFont *match) 109 +{ 110 + for (int i = 0; i < hbfontcache.capacity; i++) { 111 + if (hbfontcache.fonts[i].match == match) 112 + return hbfontcache.fonts[i].font; 113 + } 114 + 115 + /* Font not found in cache, caching it now. */ 116 + hbfontcache.fonts = realloc(hbfontcache.fonts, sizeof(HbFontMatch) * (hbfontcache.capacity + 1)); 117 + FT_Face face = XftLockFace(match); 118 + hb_font_t *font = hb_ft_font_create(face, NULL); 119 + if (font == NULL) 120 + die("Failed to load Harfbuzz font."); 121 + 122 + hbfontcache.fonts[hbfontcache.capacity].match = match; 123 + hbfontcache.fonts[hbfontcache.capacity].font = font; 124 + hbfontcache.capacity += 1; 125 + 126 + return font; 127 +} 128 + 129 +void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) { 130 + ushort mode = USHRT_MAX; 131 + unsigned int glyph_count; 132 + int rune_idx, glyph_idx, end = start + length; 133 + 134 + hb_font_t *font = hbfindfont(xfont); 135 + if (font == NULL) 136 + return; 137 + 138 + hb_buffer_t *buffer = hb_buffer_create(); 139 + hb_buffer_set_direction(buffer, HB_DIRECTION_LTR); 140 + 141 + /* Resize the buffer if required length is larger. */ 142 + if (hbrunebuffer.capacity < length) { 143 + hbrunebuffer.capacity = (length / BUFFER_STEP + 1) * BUFFER_STEP; 144 + hbrunebuffer.runes = realloc(hbrunebuffer.runes, hbrunebuffer.capacity * sizeof(Rune)); 145 + } 146 + 147 + /* Fill buffer with codepoints. */ 148 + for (rune_idx = 0, glyph_idx = start; glyph_idx < end; glyph_idx++, rune_idx++) { 149 + hbrunebuffer.runes[rune_idx] = glyphs[glyph_idx].u; 150 + mode = glyphs[glyph_idx].mode; 151 + if (mode & ATTR_WDUMMY) 152 + hbrunebuffer.runes[rune_idx] = 0x0020; 153 + } 154 + hb_buffer_add_codepoints(buffer, hbrunebuffer.runes, length, 0, length); 155 + 156 + /* Shape the segment. */ 157 + hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t)); 158 + 159 + /* Get new glyph info. */ 160 + hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count); 161 + hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count); 162 + 163 + /* Fill the output. */ 164 + data->buffer = buffer; 165 + data->glyphs = info; 166 + data->positions = pos; 167 + data->count = glyph_count; 168 +} 169 + 170 +void hbcleanup(HbTransformData *data) { 171 + hb_buffer_destroy(data->buffer); 172 + memset(data, 0, sizeof(HbTransformData)); 173 +} 174 diff --git a/hb.h b/hb.h 175 new file mode 100644 176 index 0000000..88de9bd 177 --- /dev/null 178 +++ b/hb.h 179 @@ -0,0 +1,14 @@ 180 +#include <X11/Xft/Xft.h> 181 +#include <hb.h> 182 +#include <hb-ft.h> 183 + 184 +typedef struct { 185 + hb_buffer_t *buffer; 186 + hb_glyph_info_t *glyphs; 187 + hb_glyph_position_t *positions; 188 + unsigned int count; 189 +} HbTransformData; 190 + 191 +void hbunloadfonts(); 192 +void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int); 193 +void hbcleanup(HbTransformData *); 194 diff --git a/st.c b/st.c 195 index 62def59..041c6d8 100644 196 --- a/st.c 197 +++ b/st.c 198 @@ -2640,7 +2640,8 @@ draw(void) 199 200 drawregion(0, 0, term.col, term.row); 201 xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], 202 - term.ocx, term.ocy, term.line[term.ocy][term.ocx]); 203 + term.ocx, term.ocy, term.line[term.ocy][term.ocx], 204 + term.line[term.ocy], term.col); 205 term.ocx = cx; 206 term.ocy = term.c.y; 207 xfinishdraw(); 208 diff --git a/st.h b/st.h 209 index 9f91e2a..b1a6256 100644 210 --- a/st.h 211 +++ b/st.h 212 @@ -11,7 +11,8 @@ 213 #define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) 214 #define DEFAULT(a, b) (a) = (a) ? (a) : (b) 215 #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) 216 -#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ 217 +#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP)) != ((b).mode & (~ATTR_WRAP)) || \ 218 + (a).fg != (b).fg || \ 219 (a).bg != (b).bg) 220 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ 221 (t1.tv_nsec-t2.tv_nsec)/1E6) 222 diff --git a/win.h b/win.h 223 index 6de960d..94679e4 100644 224 --- a/win.h 225 +++ b/win.h 226 @@ -25,7 +25,7 @@ enum win_mode { 227 228 void xbell(void); 229 void xclipcopy(void); 230 -void xdrawcursor(int, int, Glyph, int, int, Glyph); 231 +void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int); 232 void xdrawline(Line, int, int, int); 233 void xfinishdraw(void); 234 void xloadcols(void); 235 diff --git a/x.c b/x.c 236 index 27e81d1..9d84793 100644 237 --- a/x.c 238 +++ b/x.c 239 @@ -19,6 +19,7 @@ char *argv0; 240 #include "arg.h" 241 #include "st.h" 242 #include "win.h" 243 +#include "hb.h" 244 245 /* types used in config.h */ 246 typedef struct { 247 @@ -142,6 +143,7 @@ typedef struct { 248 } DC; 249 250 static inline ushort sixd_to_16bit(int); 251 +static void xresetfontsettings(ushort mode, Font **font, int *frcflags); 252 static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int); 253 static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int); 254 static void xdrawglyph(Glyph, int, int); 255 @@ -759,7 +761,7 @@ xresize(int col, int row) 256 xclear(0, 0, win.w, win.h); 257 258 /* resize to new width */ 259 - xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec)); 260 + xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec) * 4); 261 } 262 263 ushort 264 @@ -1071,6 +1073,9 @@ xunloadfont(Font *f) 265 void 266 xunloadfonts(void) 267 { 268 + /* Clear Harfbuzz font cache. */ 269 + hbunloadfonts(); 270 + 271 /* Free the loaded fonts in the font cache. */ 272 while (frclen > 0) 273 XftFontClose(xw.dpy, frc[--frclen].font); 274 @@ -1202,7 +1207,7 @@ xinit(int cols, int rows) 275 XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); 276 277 /* font spec buffer */ 278 - xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec)); 279 + xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec) * 4); 280 281 /* Xft rendering context */ 282 xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); 283 @@ -1256,6 +1261,22 @@ xinit(int cols, int rows) 284 xsel.xtarget = XA_STRING; 285 } 286 287 +void 288 +xresetfontsettings(ushort mode, Font **font, int *frcflags) 289 +{ 290 + *font = &dc.font; 291 + if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { 292 + *font = &dc.ibfont; 293 + *frcflags = FRC_ITALICBOLD; 294 + } else if (mode & ATTR_ITALIC) { 295 + *font = &dc.ifont; 296 + *frcflags = FRC_ITALIC; 297 + } else if (mode & ATTR_BOLD) { 298 + *font = &dc.bfont; 299 + *frcflags = FRC_BOLD; 300 + } 301 +} 302 + 303 int 304 xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) 305 { 306 @@ -1270,121 +1291,151 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x 307 FcPattern *fcpattern, *fontpattern; 308 FcFontSet *fcsets[] = { NULL }; 309 FcCharSet *fccharset; 310 - int i, f, numspecs = 0; 311 + int i, f, length = 0, start = 0, numspecs = 0; 312 + float cluster_xp = xp, cluster_yp = yp; 313 + HbTransformData shaped = { 0 }; 314 + 315 + /* Initial values. */ 316 + mode = prevmode = glyphs[0].mode & ~ATTR_WRAP; 317 + xresetfontsettings(mode, &font, &frcflags); 318 319 for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { 320 - /* Fetch rune and mode for current glyph. */ 321 - rune = glyphs[i].u; 322 - mode = glyphs[i].mode; 323 + mode = glyphs[i].mode & ~ATTR_WRAP; 324 325 /* Skip dummy wide-character spacing. */ 326 - if (mode == ATTR_WDUMMY) 327 + if (mode & ATTR_WDUMMY && i < (len - 1)) 328 continue; 329 330 - /* Determine font for glyph if different from previous glyph. */ 331 - if (prevmode != mode) { 332 - prevmode = mode; 333 - font = &dc.font; 334 - frcflags = FRC_NORMAL; 335 - runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f); 336 - if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { 337 - font = &dc.ibfont; 338 - frcflags = FRC_ITALICBOLD; 339 - } else if (mode & ATTR_ITALIC) { 340 - font = &dc.ifont; 341 - frcflags = FRC_ITALIC; 342 - } else if (mode & ATTR_BOLD) { 343 - font = &dc.bfont; 344 - frcflags = FRC_BOLD; 345 + if ( 346 + prevmode != mode 347 + || ATTRCMP(glyphs[start], glyphs[i]) 348 + || selected(x + i, y) != selected(x + start, y) 349 + || i == (len - 1) 350 + ) { 351 + /* Handle 1-character wide segments and end of line */ 352 + length = i - start; 353 + if (i == start) { 354 + length = 1; 355 + } else if (i == (len - 1)) { 356 + length = (i - start + 1); 357 } 358 - yp = winy + font->ascent; 359 - } 360 - 361 - /* Lookup character index with default font. */ 362 - glyphidx = XftCharIndex(xw.dpy, font->match, rune); 363 - if (glyphidx) { 364 - specs[numspecs].font = font->match; 365 - specs[numspecs].glyph = glyphidx; 366 - specs[numspecs].x = (short)xp; 367 - specs[numspecs].y = (short)yp; 368 - xp += runewidth; 369 - numspecs++; 370 - continue; 371 - } 372 373 - /* Fallback on font cache, search the font cache for match. */ 374 - for (f = 0; f < frclen; f++) { 375 - glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune); 376 - /* Everything correct. */ 377 - if (glyphidx && frc[f].flags == frcflags) 378 - break; 379 - /* We got a default font for a not found glyph. */ 380 - if (!glyphidx && frc[f].flags == frcflags 381 - && frc[f].unicodep == rune) { 382 - break; 383 + /* Shape the segment. */ 384 + hbtransform(&shaped, font->match, glyphs, start, length); 385 + runewidth = win.cw * ((glyphs[start].mode & ATTR_WIDE) ? 2.0f : 1.0f); 386 + cluster_xp = xp; cluster_yp = yp; 387 + for (int code_idx = 0; code_idx < shaped.count; code_idx++) { 388 + int idx = shaped.glyphs[code_idx].cluster; 389 + 390 + if (glyphs[start + idx].mode & ATTR_WDUMMY) 391 + continue; 392 + 393 + /* Advance the drawing cursor if we've moved to a new cluster */ 394 + if (code_idx > 0 && idx != shaped.glyphs[code_idx - 1].cluster) { 395 + xp += runewidth; 396 + cluster_xp = xp; 397 + cluster_yp = yp; 398 + runewidth = win.cw * ((glyphs[start + idx].mode & ATTR_WIDE) ? 2.0f : 1.0f); 399 + } 400 + 401 + if (shaped.glyphs[code_idx].codepoint != 0) { 402 + /* If symbol is found, put it into the specs. */ 403 + specs[numspecs].font = font->match; 404 + specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint; 405 + specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.); 406 + specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.); 407 + cluster_xp += shaped.positions[code_idx].x_advance / 64.; 408 + cluster_yp += shaped.positions[code_idx].y_advance / 64.; 409 + numspecs++; 410 + } else { 411 + /* If it's not found, try to fetch it through the font cache. */ 412 + rune = glyphs[start + idx].u; 413 + for (f = 0; f < frclen; f++) { 414 + glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune); 415 + /* Everything correct. */ 416 + if (glyphidx && frc[f].flags == frcflags) 417 + break; 418 + /* We got a default font for a not found glyph. */ 419 + if (!glyphidx && frc[f].flags == frcflags 420 + && frc[f].unicodep == rune) { 421 + break; 422 + } 423 + } 424 + 425 + /* Nothing was found. Use fontconfig to find matching font. */ 426 + if (f >= frclen) { 427 + if (!font->set) 428 + font->set = FcFontSort(0, font->pattern, 429 + 1, 0, &fcres); 430 + fcsets[0] = font->set; 431 + 432 + /* 433 + * Nothing was found in the cache. Now use 434 + * some dozen of Fontconfig calls to get the 435 + * font for one single character. 436 + * 437 + * Xft and fontconfig are design failures. 438 + */ 439 + fcpattern = FcPatternDuplicate(font->pattern); 440 + fccharset = FcCharSetCreate(); 441 + 442 + FcCharSetAddChar(fccharset, rune); 443 + FcPatternAddCharSet(fcpattern, FC_CHARSET, 444 + fccharset); 445 + FcPatternAddBool(fcpattern, FC_SCALABLE, 1); 446 + 447 + FcConfigSubstitute(0, fcpattern, 448 + FcMatchPattern); 449 + FcDefaultSubstitute(fcpattern); 450 + 451 + fontpattern = FcFontSetMatch(0, fcsets, 1, 452 + fcpattern, &fcres); 453 + 454 + /* Allocate memory for the new cache entry. */ 455 + if (frclen >= frccap) { 456 + frccap += 16; 457 + frc = xrealloc(frc, frccap * sizeof(Fontcache)); 458 + } 459 + 460 + frc[frclen].font = XftFontOpenPattern(xw.dpy, 461 + fontpattern); 462 + if (!frc[frclen].font) 463 + die("XftFontOpenPattern failed seeking fallback font: %s\n", 464 + strerror(errno)); 465 + frc[frclen].flags = frcflags; 466 + frc[frclen].unicodep = rune; 467 + 468 + glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune); 469 + 470 + f = frclen; 471 + frclen++; 472 + 473 + FcPatternDestroy(fcpattern); 474 + FcCharSetDestroy(fccharset); 475 + } 476 + 477 + specs[numspecs].font = frc[f].font; 478 + specs[numspecs].glyph = glyphidx; 479 + specs[numspecs].x = (short)xp; 480 + specs[numspecs].y = (short)yp; 481 + numspecs++; 482 + } 483 } 484 - } 485 - 486 - /* Nothing was found. Use fontconfig to find matching font. */ 487 - if (f >= frclen) { 488 - if (!font->set) 489 - font->set = FcFontSort(0, font->pattern, 490 - 1, 0, &fcres); 491 - fcsets[0] = font->set; 492 493 - /* 494 - * Nothing was found in the cache. Now use 495 - * some dozen of Fontconfig calls to get the 496 - * font for one single character. 497 - * 498 - * Xft and fontconfig are design failures. 499 - */ 500 - fcpattern = FcPatternDuplicate(font->pattern); 501 - fccharset = FcCharSetCreate(); 502 - 503 - FcCharSetAddChar(fccharset, rune); 504 - FcPatternAddCharSet(fcpattern, FC_CHARSET, 505 - fccharset); 506 - FcPatternAddBool(fcpattern, FC_SCALABLE, 1); 507 + /* Cleanup and get ready for next segment. */ 508 + hbcleanup(&shaped); 509 + start = i; 510 511 - FcConfigSubstitute(0, fcpattern, 512 - FcMatchPattern); 513 - FcDefaultSubstitute(fcpattern); 514 - 515 - fontpattern = FcFontSetMatch(0, fcsets, 1, 516 - fcpattern, &fcres); 517 - 518 - /* Allocate memory for the new cache entry. */ 519 - if (frclen >= frccap) { 520 - frccap += 16; 521 - frc = xrealloc(frc, frccap * sizeof(Fontcache)); 522 + /* Determine font for glyph if different from previous glyph. */ 523 + if (prevmode != mode) { 524 + prevmode = mode; 525 + xresetfontsettings(mode, &font, &frcflags); 526 + yp = winy + font->ascent; 527 } 528 - 529 - frc[frclen].font = XftFontOpenPattern(xw.dpy, 530 - fontpattern); 531 - if (!frc[frclen].font) 532 - die("XftFontOpenPattern failed seeking fallback font: %s\n", 533 - strerror(errno)); 534 - frc[frclen].flags = frcflags; 535 - frc[frclen].unicodep = rune; 536 - 537 - glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune); 538 - 539 - f = frclen; 540 - frclen++; 541 - 542 - FcPatternDestroy(fcpattern); 543 - FcCharSetDestroy(fccharset); 544 } 545 - 546 - specs[numspecs].font = frc[f].font; 547 - specs[numspecs].glyph = glyphidx; 548 - specs[numspecs].x = (short)xp; 549 - specs[numspecs].y = (short)yp; 550 - xp += runewidth; 551 - numspecs++; 552 } 553 554 + hbcleanup(&shaped); 555 return numspecs; 556 } 557 558 @@ -1534,14 +1585,17 @@ xdrawglyph(Glyph g, int x, int y) 559 } 560 561 void 562 -xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) 563 +xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len) 564 { 565 Color drawcol; 566 567 /* remove the old cursor */ 568 if (selected(ox, oy)) 569 og.mode ^= ATTR_REVERSE; 570 - xdrawglyph(og, ox, oy); 571 + 572 + /* Redraw the line where cursor was previously. 573 + * It will restore the ligatures broken by the cursor. */ 574 + xdrawline(line, 0, oy, len); 575 576 if (IS_SET(MODE_HIDE)) 577 return; 578 @@ -1669,18 +1723,16 @@ xdrawline(Line line, int x1, int y1, int x2) 579 Glyph base, new; 580 XftGlyphFontSpec *specs = xw.specbuf; 581 582 - numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1); 583 i = ox = 0; 584 - for (x = x1; x < x2 && i < numspecs; x++) { 585 + for (x = x1; x < x2; x++) { 586 new = line[x]; 587 if (new.mode == ATTR_WDUMMY) 588 continue; 589 if (selected(x, y1)) 590 new.mode ^= ATTR_REVERSE; 591 - if (i > 0 && ATTRCMP(base, new)) { 592 - xdrawglyphfontspecs(specs, base, i, ox, y1); 593 - specs += i; 594 - numspecs -= i; 595 + if ((i > 0) && ATTRCMP(base, new)) { 596 + numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1); 597 + xdrawglyphfontspecs(specs, base, numspecs, ox, y1); 598 i = 0; 599 } 600 if (i == 0) { 601 @@ -1689,8 +1741,10 @@ xdrawline(Line line, int x1, int y1, int x2) 602 } 603 i++; 604 } 605 - if (i > 0) 606 - xdrawglyphfontspecs(specs, base, i, ox, y1); 607 + if (i > 0) { 608 + numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1); 609 + xdrawglyphfontspecs(specs, base, numspecs, ox, y1); 610 + } 611 } 612 613 void