ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.17 by pcg, Mon Jan 19 17:26:43 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.13 2003/12/24 09:22:29 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
7 * 6 *
8 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
… …
447 /* then so is screen.rend[i] */ 446 /* then so is screen.rend[i] */
448 assert(screen.rend[i]); 447 assert(screen.rend[i]);
449 } 448 }
450#endif 449#endif
451 450
452 delete talloc; 451 delete talloc; talloc = 0;
453 delete ralloc; 452 delete ralloc; ralloc = 0;
454 453
455 free (screen.text); 454 free (screen.text);
456 free (screen.tlen); 455 free (screen.tlen);
457 free (screen.rend); 456 free (screen.rend);
458 free (drawn_text); 457 free (drawn_text);
… …
899 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 898 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
900 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 899 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
901 } 900 }
902 901
903 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); 902 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c));
904
905 stp[R->screen.cur.col] = c;
906 srp[R->screen.cur.col] = rend;
907
908 if (c > 255)
909 {
910 // rely on wcwidth to tell us the character width, at least for non iso-8859-1 903 // rely on wcwidth to tell us the character width, at least for non-ascii
911 int width = wcwidth (c); 904 int width = c <= 128 ? 1 : wcwidth (c);
905
906 // width -1 characters (e.g. combining chars) are ignored currently.
907 if (width > 0)
908 do
912 909 {
913 if (width > 1) 910 stp[R->screen.cur.col] = c;
914 {
915 while (--width > 0 && R->screen.cur.col < last_col - 1)
916 {
917
918 srp[R->screen.cur.col] |= RS_wide; 911 srp[R->screen.cur.col] = rend;
919 912
913 if (R->screen.cur.col < last_col - 1)
920 R->screen.cur.col++; 914 R->screen.cur.col++;
921 stp[R->screen.cur.col] = NOCHAR; 915 else
922 srp[R->screen.cur.col] = rend;
923 } 916 {
924 }
925 }
926
927 if (R->screen.cur.col < last_col - 1)
928 R->screen.cur.col++;
929 else {
930 R->screen.tlen[row] = last_col; 917 R->screen.tlen[row] = last_col;
931 if (R->screen.flags & Screen_Autowrap) 918 if (R->screen.flags & Screen_Autowrap)
932 R->screen.flags |= Screen_WrapNext; 919 R->screen.flags |= Screen_WrapNext;
920 break;
921 }
922
923 c = NOCHAR;
933 } 924 }
925 while (--width > 0);
926 else
927 1; /* handle combining character etc. here. */
934 } 928 }
929
935 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 930 if (R->screen.tlen[row] != -1) /* XXX: think about this */
936 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 931 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
937 932
938/* 933/*
939 * If we wrote anywhere in the selected area, kill the selection 934 * If we wrote anywhere in the selected area, kill the selection
940 * XXX: should we kill the mark too? Possibly, but maybe that 935 * XXX: should we kill the mark too? Possibly, but maybe that
941 * should be a similar check. 936 * should be a similar check.
… …
1650 rxvt_set_font_style(aR); 1645 rxvt_set_font_style(aR);
1651} 1646}
1652 1647
1653 1648
1654/* ------------------------------------------------------------------------- * 1649/* ------------------------------------------------------------------------- *
1655 * GRAPHICS COLOURS *
1656 * ------------------------------------------------------------------------- */
1657
1658#ifdef RXVT_GRAPHICS
1659/* EXTPROTO */
1660int
1661rxvt_scr_get_fgcolor(pR)
1662{
1663 return GET_FGCOLOR(R->rstyle);
1664}
1665
1666/* ------------------------------------------------------------------------- */
1667/* EXTPROTO */
1668int
1669rxvt_scr_get_bgcolor(pR)
1670{
1671 return GET_BGCOLOR(R->rstyle);
1672}
1673#endif
1674
1675/* ------------------------------------------------------------------------- *
1676 * MAJOR SCREEN MANIPULATION * 1650 * MAJOR SCREEN MANIPULATION *
1677 * ------------------------------------------------------------------------- */ 1651 * ------------------------------------------------------------------------- */
1678 1652
1679/* 1653/*
1680 * Refresh an area 1654 * Refresh an area
… …
1859 * Refresh the screen 1833 * Refresh the screen
1860 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1834 * R->drawn_text/R->drawn_rend contain the screen information before the update.
1861 * R->screen.text/R->screen.rend contain what the screen will change to. 1835 * R->screen.text/R->screen.rend contain what the screen will change to.
1862 */ 1836 */
1863 1837
1864#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1865# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1866# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1867#else
1868# define MONO_BOLD(x) \
1869 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1870# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1871#endif
1872
1873#define FONT_WIDTH(X, Y) \ 1838#define FONT_WIDTH(X, Y) \
1874 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1839 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1875#define FONT_RBEAR(X, Y) \ 1840#define FONT_RBEAR(X, Y) \
1876 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1841 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1877#define FONT_LBEAR(X, Y) \ 1842#define FONT_LBEAR(X, Y) \
… …
1883rxvt_term::scr_refresh (unsigned char refresh_type) 1848rxvt_term::scr_refresh (unsigned char refresh_type)
1884{ 1849{
1885 unsigned char clearfirst, /* first character writes before cell */ 1850 unsigned char clearfirst, /* first character writes before cell */
1886 clearlast, /* last character writes beyond cell */ 1851 clearlast, /* last character writes beyond cell */
1887 must_clear, /* use draw_string not draw_image_string */ 1852 must_clear, /* use draw_string not draw_image_string */
1888#ifndef NO_BOLDFONT
1889 bfont, /* we've changed font to bold font */
1890#endif
1891 rvid, /* reverse video this position */ 1853 rvid, /* reverse video this position */
1892 wbyte, /* we're in multibyte */
1893 showcursor; /* show the cursor */ 1854 showcursor; /* show the cursor */
1894 int fore, back; /* desired foreground/background */
1895 int16_t col, row, /* column/row we're processing */ 1855 int16_t col, row, /* column/row we're processing */
1896 ocrow; /* old cursor row */ 1856 ocrow; /* old cursor row */
1897 int cursorwidth; 1857 int cursorwidth;
1898 int i, /* tmp */ 1858 int i, /* tmp */
1899 row_offset; /* basic offset in screen structure */ 1859 row_offset; /* basic offset in screen structure */
… …
1908 return; 1868 return;
1909 1869
1910 /* 1870 /*
1911 * A: set up vars 1871 * A: set up vars
1912 */ 1872 */
1913 clearfirst = clearlast = must_clear = wbyte = 0; 1873 clearfirst = clearlast = must_clear = 0;
1914#ifndef NO_BOLDFONT
1915 bfont = 0;
1916#endif
1917 1874
1918 if (currmaxcol < TermWin.ncol) 1875 if (currmaxcol < TermWin.ncol)
1919 { 1876 {
1920 currmaxcol = TermWin.ncol; 1877 currmaxcol = TermWin.ncol;
1921 buffer = (char *)rxvt_realloc (buffer, 1878 buffer = (char *)rxvt_realloc (buffer,
… …
1992#endif 1949#endif
1993 *srp = SET_FGCOLOR(*srp, ccol1); 1950 *srp = SET_FGCOLOR(*srp, ccol1);
1994 *srp = SET_BGCOLOR(*srp, ccol2); 1951 *srp = SET_BGCOLOR(*srp, ccol2);
1995#endif 1952#endif
1996 } 1953 }
1997
1998 while (IS_WIDE (*srp))
1999 cursorwidth++, srp++;
2000 } 1954 }
2001 1955
2002 /* make sure no outline cursor is left around */ 1956 /* make sure no outline cursor is left around */
2003 setoldcursor = 0; 1957 setoldcursor = 0;
2004 if (ocrow != -1) { 1958 if (ocrow != -1) {
… …
2147 i++; 2101 i++;
2148 2102
2149 continue; 2103 continue;
2150 } 2104 }
2151 2105
2152 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2106 if (rend != srp[col])
2153 break; 2107 break;
2154 2108
2155 count++; 2109 count++;
2156 2110
2157 if (stp[col] != dtp[col] 2111 if (stp[col] != dtp[col]
… …
2172 count -= i; /* dump any matching trailing chars */ 2126 count -= i; /* dump any matching trailing chars */
2173 2127
2174 /* 2128 /*
2175 * Determine the attributes for the string 2129 * Determine the attributes for the string
2176 */ 2130 */
2177 int fid = GET_FONT(rend); 2131 int fid = GET_FONT (rend);
2178 fore = GET_FGCOLOR(rend); 2132 int fore = GET_FGCOLOR (rend); // desired foreground
2179 back = GET_BGCOLOR(rend); 2133 int back = GET_BGCOLOR (rend); // desired background
2134
2180 rend = GET_ATTR(rend); 2135 rend = GET_ATTR (rend);
2181 2136
2182 rvid = (rend & RS_RVid) ? 1 : 0; 2137 rvid = !!(rend & RS_RVid);
2183#ifdef OPTION_HC 2138#ifdef OPTION_HC
2184 if (!rvid && (rend & RS_Blink)) 2139 if (!rvid && (rend & RS_Blink))
2185 { 2140 {
2186 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC)) 2141 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2187 back = Color_HC; 2142 back = Color_HC;
… …
2204 } 2159 }
2205#ifndef NO_BOLD_UNDERLINE_REVERSE 2160#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 else if (rend & RS_Bold) 2161 else if (rend & RS_Bold)
2207 { 2162 {
2208 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD)) 2163 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD))
2209 {
2210 fore = Color_BD; 2164 fore = Color_BD;
2211# ifndef VERYBOLD
2212 rend &= ~RS_Bold; /* we've taken care of it */
2213# endif
2214 }
2215 } 2165 }
2216 else if (rend & RS_Uline) 2166 else if (rend & RS_Uline)
2217 { 2167 {
2218 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL)) 2168 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2219 {
2220 fore = Color_UL; 2169 fore = Color_UL;
2221 rend &= ~RS_Uline; /* we've taken care of it */
2222 }
2223 } 2170 }
2224#endif 2171#endif
2225 2172
2226 /* 2173 /*
2227 * Actually do the drawing of the string here 2174 * Actually do the drawing of the string here
… …
2574} 2521}
2575 2522
2576void 2523void
2577rxvt_term::incr_cb (time_watcher &w) 2524rxvt_term::incr_cb (time_watcher &w)
2578{ 2525{
2579 w.stop ();
2580 selection_wait = Sel_none; 2526 selection_wait = Sel_none;
2581 2527
2582 rxvt_print_error("data loss: timeout on INCR selection paste"); 2528 rxvt_print_error ("data loss: timeout on INCR selection paste");
2583} 2529}
2584 2530
2585/* 2531/*
2586 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2532 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2587 */ 2533 */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines