PuTTy: Diff

Differences From Artifact [b223765324]:

File unix/pterm.c — part of check-in [f3871b7c8f] at 2004-09-28 15:42:39 on branch trunk — Line (as opposed to block) cursors were being displayed when they shouldn't have been, including when they were blinked off. Fixes Debian bug #272877. (user: jacob size: 100890)

To 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)

︙
1794 1795 1796 1797 1798 1799 1800 ~~1801~~ 1802 1803 1804 1805 1806 1807 1808	1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808	- +	/* * Draw a line of text in the window, at given character * coordinates, in given attributes. * * We are allowed to fiddle with the contents of `text'. / ~~void do_text_internal(Context ctx, int x, int y, ~~char~~ text, int len,~~ 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 nfg, nbg, t, fontid, shadow, rlen, widefactor;
︙
1837 1838 1839 1840 1841 1842 1843 ~~1844~~ 1845 1846 1847 1848 1849 1850 1851	1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851	- +	if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) { if (inst->fonts[fontid \| 1]) fontid \|= 1; else shadow = 1; } ~~if (~~lattr~~ != LATTR_NORM) {~~ if ((lattr & LATTR_MODE) != LATTR_NORM) { x = 2; if (x >= inst->term->cols) return; if (x + len2widefactor > inst->term->cols) len = (inst->term->cols-x)/2/widefactor;/ trim to LH half / rlen = len 2; } else
︙
1872 1873 1874 1875 1876 1877 1878 ~~1879~~ 1880 1881 1882 1883 1884 1885 1886	1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886	- +	GdkWChar gwcs; gchar gcs; wchar_t wcs; int i; wcs = snewn(len+1, wchar_t); for (i = 0; i < len; i++) { ~~wcs[i] = ~~(wchar_t) ((attr & CSET_MASK) + (~~text[i] ~~& CHAR_MASK))~~;~~ 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 * character and have no wide font. So we display
︙
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 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 ~~1966~~ 1967 1968 ~~1969~~ 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 ~~1985~~ 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 ~~2001~~ 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 ~~2018~~ 2019 2020 2021 2022 2023 2024 2025	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 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028	+ + + + + + + + + + - - - - - - - - + - + - + - + - + - +	/ 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); sfree(gwcs); } else { gcs = snewn(len+1, gchar); 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); sfree(gcs); } sfree(wcs); } ~~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,~~ ~~text, len);~~ } if (attr & ATTR_UNDER) { int uheight = inst->fonts[0]->ascent + 1; if (uheight >= inst->font_height) uheight = inst->font_height - 1; gdk_draw_line(inst->pixmap, gc, xinst->font_width+inst->cfg.window_border, yinst->font_height + uheight + inst->cfg.window_border, (x+len)widefactorinst->font_width-1+inst->cfg.window_border, yinst->font_height + uheight + inst->cfg.window_border); } ~~if (~~lattr~~ != LATTR_NORM) {~~ if ((lattr & LATTR_MODE) != LATTR_NORM) { /* * I can't find any plausible StretchBlt equivalent in the * X server, so I'm going to do this the slow and painful * way. This will involve repeated calls to * gdk_draw_pixmap() to stretch the text horizontally. It's * O(N^2) in time and O(N) in network bandwidth, but you * try thinking of a better way. :-( / int i; for (i = 0; i < len widefactor * inst->font_width; i++) { gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, xinst->font_width+inst->cfg.window_border + 2i, yinst->font_height+inst->cfg.window_border, xinst->font_width+inst->cfg.window_border + 2i+1, yinst->font_height+inst->cfg.window_border, len * inst->font_width - i, inst->font_height); } len = 2; ~~if (~~lattr~~ != LATTR_WIDE) {~~ if ((lattr & LATTR_MODE) != LATTR_WIDE) { int dt, db; / Now stretch vertically, in the same way. / ~~if (~~lattr~~ == LATTR_BOT)~~ if ((lattr & LATTR_MODE) == LATTR_BOT) dt = 0, db = 1; else dt = 1, db = 0; for (i = 0; i < inst->font_height; i+=2) { gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border+dti+db, xwidefactorinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border+dt(i+1), len * inst->font_width, inst->font_height-i-1); } } } } ~~void do_text(Context ctx, int x, int y, ~~char~~ text, int len,~~ void do_text(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 widefactor; do_text_internal(ctx, x, y, text, len, attr, lattr); if (attr & ATTR_WIDE) { widefactor = 2; } else { widefactor = 1; } ~~if (~~lattr~~ != LATTR_NORM) {~~ if ((lattr & LATTR_MODE) != LATTR_NORM) { x = 2; if (x >= inst->term->cols) return; if (x + len2widefactor > inst->term->cols) len = (inst->term->cols-x)/2/widefactor;/ trim to LH half / len = 2; } gdk_draw_pixmap(inst->area->window, gc, inst->pixmap, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border, xinst->font_width+inst->cfg.window_border, yinst->font_height+inst->cfg.window_border, lenwidefactorinst->font_width, inst->font_height); } ~~void do_cursor(Context ctx, int x, int y, ~~char~~ text, int len,~~ void do_cursor(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 active, passive, widefactor;
︙
2038 2039 2040 2041 2042 2043 2044 ~~2045~~ 2046 2047 2048 2049 2050 2051 2052	2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055	- +	if (attr & ATTR_WIDE) { widefactor = 2; } else { widefactor = 1; } ~~if (~~lattr~~ != LATTR_NORM) {~~ if ((lattr & LATTR_MODE) != LATTR_NORM) { x = 2; if (x >= inst->term->cols) return; if (x + len2widefactor > inst->term->cols) len = (inst->term->cols-x)/2/widefactor;/ trim to LH half / len = 2; }
︙
2066 2067 2068 2069 2070 2071 2072 ~~2073~~ 2074 2075 2076 2077 2078 2079 2080	2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083	- +	} } else { int uheight; int startx, starty, dx, dy, length, i; int char_width; ~~if ((attr & ATTR_WIDE) \|\| ~~lattr~~ != LATTR_NORM)~~ if ((attr & ATTR_WIDE) \|\| (lattr & LATTR_MODE) != LATTR_NORM) char_width = 2*inst->font_width; else char_width = inst->font_width; if (inst->cfg.cursor_type == 1) { uheight = inst->fonts[0]->ascent + 1; if (uheight >= inst->font_height)
︙