Fiddly things involving pruning .svn directories, not mentioning

[PuTTY.git] / window.c

diff --git a/window.c b/window.c
index 4c4ef50784c18ee592134a2233e1e4ff2d10b468..4fb18d39cef79579adf4089d39b8c8f0fdfd67fc 100644 (file)
--- a/window.c
+++ b/window.c
@@ -1155,36 +1155,6 @@ static void init_palette(void)
                             defpal[i].rgbtGreen, defpal[i].rgbtBlue);
 }
 
-/*
- * This is a wrapper to ExtTextOut() to force Windows to display
- * the precise glyphs we give it. Otherwise it would do its own
- * bidi and Arabic shaping, and we would end up uncertain which
- * characters it had put where.
- */
-static void exact_textout(HDC hdc, int x, int y, CONST RECT *lprc,
-                         unsigned short *lpString, UINT cbCount,
-                         CONST INT *lpDx)
-{
-
-    GCP_RESULTSW gcpr;
-    char *buffer = snewn(cbCount*2+2, char);
-    char *classbuffer = snewn(cbCount, char);
-    memset(&gcpr, 0, sizeof(gcpr));
-    memset(buffer, 0, cbCount*2+2);
-    memset(classbuffer, GCPCLASS_NEUTRAL, cbCount);
-
-    gcpr.lStructSize = sizeof(gcpr);
-    gcpr.lpGlyphs = (void *)buffer;
-    gcpr.lpClass = classbuffer;
-    gcpr.nGlyphs = cbCount;
-
-    GetCharacterPlacementW(hdc, lpString, cbCount, 0, &gcpr,
-                          FLI_MASK | GCP_CLASSIN);
-
-    ExtTextOut(hdc, x, y, ETO_GLYPH_INDEX | ETO_CLIPPED | ETO_OPAQUE, lprc,
-              buffer, cbCount, lpDx);
-}
-
 /*
  * Initialise all the fonts we will need initially. There may be as many as
  * three or as few as one.  The other (poentially) twentyone fonts are done
@@ -3140,13 +3110,9 @@ void do_text(Context ctx, int x, int y, char *text, int len,
        for (i = 0; i < len; i++)
            wbuf[i] = (WCHAR) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
 
-       /* print Glyphs as they are, without Windows' Shaping*/
-       exact_textout(hdc, x, y - font_height * (lattr == LATTR_BOT) + text_adjust,
-                     &line_box, wbuf, len, IpDx);
-/*     ExtTextOutW(hdc, x,
+       ExtTextOutW(hdc, x,
                    y - font_height * (lattr == LATTR_BOT) + text_adjust,
                    ETO_CLIPPED | ETO_OPAQUE, &line_box, wbuf, len, IpDx);
- */
 
        /* And the shadow bold hack. */
        if (bold_mode == BOLD_SHADOW && (attr & ATTR_BOLD)) {