PuTTy: Diff

Differences From Artifact [81bc9c8cc1]:

File unix/pterm.c — part of check-in [fd15c23f41] at 2004-10-13 06:50:16 on branch trunk — Re-engineering of terminal emulator, phase 1. The active terminal screen is no longer an array of `unsigned long' encoding 16-bit Unicode plus 16 attribute bits. Now it's an array of `termchar' structures, which currently have 32-bit Unicode and 32 attribute bits but which will probably expand further in future. To prevent bloat of the memory footprint, I've introduced a mostly RLE-like compression scheme for storing scrollback: each line is compressed into a compact (but hard to modify) form when it moves into the term->scrollback tree, and is temporarily decompressed when the user wants to scroll back over it. My initial tests suggest that this compression averages about 1/4 of the previous (32 bits per character cell) data size in typical output, which means this is an improvement even without counting the new ability to extend the information stored in each character cell. Another beneficial side effect is that the insane format in which Unicode was passed to front ends through do_text() has now been rendered sane. Testing is incomplete; this _may_ still have instabilities. Windows and Unix front ends both seem to work as far as I've looked, but I haven't yet looked very hard. The Mac front end I've edited (it seemed obvious how to change it) but I can't compile or test it. As an immediate functional effect, the terminal emulator now supports full 32-bit Unicode to whatever extent the host platform allows it to. For example, if you output a 4-or-more-byte UTF-8 character in Unix pterm, it will not display it properly, but it will correctly paste it back out in a UTF8_STRING selection. Windows is more restricted, sadly. (user: simon size: 101193)

To Artifact [9a8959c24a]:

File unix/pterm.c — part of check-in [873b9560c1] at 2004-10-14 11:42:43 on branch trunk — First-stage support for Unicode combining characters. The `chars' array of each `termline' structure now contains optional additional entries after the normal number of columns, which are used to chain a linked list of combining characters off any primary termchar that needs it. This means we support arbitrarily many combining characters per cell (unlike xterm's hard limit of 2). Cut and paste works correctly (selecting a character cell containing multiple code points causes all those code points to be cut and pasted). Display works by simply overlaying all the relevant characters on top of one another; this is good enough for Unix (xterm does the same thing), and mostly seems OK for Windows except that the Windows Unicode fonts have a nasty habit of not containing most of the combining characters and thus overlaying an unknown-code-point box on your perfectly good base glyph. I had no idea how to add support in the Mac do_text(), so I've simply stuck in an assertion that will trigger the first time a combining character is displayed, and hopefully this will bite someone with the clue to fix it. (user: simon size: 101500)

︙
1800 1801 1802 1803 1804 1805 1806 ~~1807~~ 1808 1809 1810 1811 1812 1813 1814 1815	1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821	- + + + + + + +	/ void do_text_internal(Context ctx, int x, int y, wchar_t text, int len, unsigned long attr, int lattr) { struct draw_ctx dctx = (struct draw_ctx )ctx; struct gui_data inst = dctx->inst; GdkGC gc = dctx->gc; int ncombining, combining; int nfg, nbg, t, fontid, shadow, rlen, widefactor; if (attr & TATTR_COMBINING) { ncombining = len; len = 1; } else ncombining = 1; nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT); nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0); nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT); nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0); if (attr & ATTR_REVERSE) { t = nfg;
︙
1870 1871 1872 1873 1874 1875 1876 ~~1877 1878~~ 1879 1880 1881 1882 1883 1884 1885	1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891	- - + +	gdk_gc_set_foreground(gc, &inst->cols[nfg]); { GdkWChar gwcs; gchar gcs; wchar_t wcs; int i; ~~wcs = snewn(len+1, wchar_t); for (i = 0; i < len; i++) {~~ wcs = snewn(lenncombining+1, wchar_t); for (i = 0; i < lenncombining; i++) { wcs[i] = text[i]; } if (inst->fonts[fontid] == NULL) { / * The font for this contingency does not exist. * Typically this means we've been given ATTR_WIDE
︙
1903 1904 1905 1906 1907 1908 1909 ~~1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920~~ 1921 1922 1923 ~~1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934~~ 1935 1936 1937 1938 1939 1940 1941	1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951	+ - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + +	/ gwcs = snewn(len2+1, GdkWChar); memset(gwcs, 0, sizeof(GdkWChar) * (len2+1)); / * FIXME: when we have a wide-char equivalent of * from_unicode, use it instead of this. / for (combining = 0; combining < ncombining; combining++) { for (i = 0; i <= len; i++) gwcs[i] = wcs[i]; gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gwcs, len2); if (shadow) gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gwcs, len2); for (i = 0; i <= len; i++) gwcs[i] = wcs[i + combining]; gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gwcs, len2); if (shadow) gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gwcs, len2); } sfree(gwcs); } else { gcs = snewn(len+1, gchar); for (combining = 0; combining < ncombining; combining++) { wc_to_mb(inst->fontinfo[fontid].charset, 0, wcs, len, gcs, len, ".", NULL, NULL); gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gcs, len); if (shadow) gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gcs, len); wc_to_mb(inst->fontinfo[fontid].charset, 0, wcs + combining, len, gcs, len, ".", NULL, NULL); gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gcs, len); if (shadow) gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc, xinst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset, y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent, gcs, len); } sfree(gcs); } sfree(wcs); } if (attr & ATTR_UNDER) { int uheight = inst->fonts[0]->ascent + 1;
︙