pass null lpDx, because general_textout depends on it being filled in.
Instead we null it out in the calls to subroutines _from_
general_textout.
git-svn-id: svn://svn.tartarus.org/sgt/putty@9064
cda61777-01e9-0310-a592-
d414129be87e
debug(("\n rect: [%d,%d %d,%d]\n", newrc.left, newrc.top, newrc.right, newrc.bottom));
}
#endif
debug(("\n rect: [%d,%d %d,%d]\n", newrc.left, newrc.top, newrc.right, newrc.bottom));
}
#endif
- exact_textout(hdc, xp, y, &newrc, lpString+i, j-i, lpDx+i, opaque);
+ exact_textout(hdc, xp, y, &newrc, lpString+i, j-i,
+ font_varpitch ? NULL : lpDx+i, opaque);
} else {
#ifdef FIXME_REMOVE_BEFORE_CHECKIN
{
} else {
#ifdef FIXME_REMOVE_BEFORE_CHECKIN
{
newrc.top = lprc->top;
newrc.bottom = lprc->bottom;
ExtTextOutW(hdc, xp, y, ETO_CLIPPED | (opaque ? ETO_OPAQUE : 0),
newrc.top = lprc->top;
newrc.bottom = lprc->bottom;
ExtTextOutW(hdc, xp, y, ETO_CLIPPED | (opaque ? ETO_OPAQUE : 0),
- &newrc, lpString+i, j-i, lpDx+i);
+ &newrc, lpString+i, j-i,
+ font_varpitch ? NULL : lpDx+i);
/* print Glyphs as they are, without Windows' Shaping*/
general_textout(hdc, x + xoffset,
y - font_height * (lattr==LATTR_BOT) + text_adjust,
/* print Glyphs as they are, without Windows' Shaping*/
general_textout(hdc, x + xoffset,
y - font_height * (lattr==LATTR_BOT) + text_adjust,
- &line_box, wbuf, len, IpDxReal,
+ &line_box, wbuf, len, IpDx,
opaque && !(attr & TATTR_COMBINING));
/* And the shadow bold hack. */
opaque && !(attr & TATTR_COMBINING));
/* And the shadow bold hack. */