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.16 by pcg, Fri Jan 16 22:11:09 2004 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.16 2004/01/16 22:11:09 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
… …
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 // rely on wcwidth to tell us the character width, at least for non-ascii 903 // rely on wcwidth to tell us the character width, at least for non-ascii
905 int width = c <= 128 ? 1 : wcwidth (c); 904 int width = c <= 128 ? 1 : wcwidth (c);
906 905
907 // width 0 characters (e.g. combining chars) are ignored. your problem, really 906 // width -1 characters (e.g. combining chars) are ignored currently.
908 while (width-- > 0) 907 if (width > 0)
908 do
909 { 909 {
910 stp[R->screen.cur.col] = c; 910 stp[R->screen.cur.col] = c;
911 srp[R->screen.cur.col] = rend; 911 srp[R->screen.cur.col] = rend;
912 912
913 if (R->screen.cur.col < last_col - 1) 913 if (R->screen.cur.col < last_col - 1)
914 R->screen.cur.col++; 914 R->screen.cur.col++;
915 else 915 else
916 { 916 {
917 R->screen.tlen[row] = last_col; 917 R->screen.tlen[row] = last_col;
918 if (R->screen.flags & Screen_Autowrap) 918 if (R->screen.flags & Screen_Autowrap)
919 R->screen.flags |= Screen_WrapNext; 919 R->screen.flags |= Screen_WrapNext;
920 break; 920 break;
921 } 921 }
922 922
923 c = NOCHAR; 923 c = NOCHAR;
924 } 924 }
925 while (--width > 0);
926 else
927 1; /* handle combining character etc. here. */
925 } 928 }
929
926 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 930 if (R->screen.tlen[row] != -1) /* XXX: think about this */
927 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 931 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
928 932
929/* 933/*
930 * If we wrote anywhere in the selected area, kill the selection 934 * If we wrote anywhere in the selected area, kill the selection
931 * XXX: should we kill the mark too? Possibly, but maybe that 935 * XXX: should we kill the mark too? Possibly, but maybe that
932 * should be a similar check. 936 * should be a similar check.
… …
1641 rxvt_set_font_style(aR); 1645 rxvt_set_font_style(aR);
1642} 1646}
1643 1647
1644 1648
1645/* ------------------------------------------------------------------------- * 1649/* ------------------------------------------------------------------------- *
1646 * GRAPHICS COLOURS *
1647 * ------------------------------------------------------------------------- */
1648
1649#ifdef RXVT_GRAPHICS
1650/* EXTPROTO */
1651int
1652rxvt_scr_get_fgcolor(pR)
1653{
1654 return GET_FGCOLOR(R->rstyle);
1655}
1656
1657/* ------------------------------------------------------------------------- */
1658/* EXTPROTO */
1659int
1660rxvt_scr_get_bgcolor(pR)
1661{
1662 return GET_BGCOLOR(R->rstyle);
1663}
1664#endif
1665
1666/* ------------------------------------------------------------------------- *
1667 * MAJOR SCREEN MANIPULATION * 1650 * MAJOR SCREEN MANIPULATION *
1668 * ------------------------------------------------------------------------- */ 1651 * ------------------------------------------------------------------------- */
1669 1652
1670/* 1653/*
1671 * Refresh an area 1654 * Refresh an area
… …
1850 * Refresh the screen 1833 * Refresh the screen
1851 * 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.
1852 * 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.
1853 */ 1836 */
1854 1837
1855#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1856# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1857# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1858#else
1859# define MONO_BOLD(x) \
1860 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1861# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1862#endif
1863
1864#define FONT_WIDTH(X, Y) \ 1838#define FONT_WIDTH(X, Y) \
1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1839 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1866#define FONT_RBEAR(X, Y) \ 1840#define FONT_RBEAR(X, Y) \
1867 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1841 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1868#define FONT_LBEAR(X, Y) \ 1842#define FONT_LBEAR(X, Y) \
… …
1874rxvt_term::scr_refresh (unsigned char refresh_type) 1848rxvt_term::scr_refresh (unsigned char refresh_type)
1875{ 1849{
1876 unsigned char clearfirst, /* first character writes before cell */ 1850 unsigned char clearfirst, /* first character writes before cell */
1877 clearlast, /* last character writes beyond cell */ 1851 clearlast, /* last character writes beyond cell */
1878 must_clear, /* use draw_string not draw_image_string */ 1852 must_clear, /* use draw_string not draw_image_string */
1879#ifndef NO_BOLDFONT
1880 bfont, /* we've changed font to bold font */
1881#endif
1882 rvid, /* reverse video this position */ 1853 rvid, /* reverse video this position */
1883 wbyte, /* we're in multibyte */
1884 showcursor; /* show the cursor */ 1854 showcursor; /* show the cursor */
1885 int fore, back; /* desired foreground/background */
1886 int16_t col, row, /* column/row we're processing */ 1855 int16_t col, row, /* column/row we're processing */
1887 ocrow; /* old cursor row */ 1856 ocrow; /* old cursor row */
1888 int cursorwidth; 1857 int cursorwidth;
1889 int i, /* tmp */ 1858 int i, /* tmp */
1890 row_offset; /* basic offset in screen structure */ 1859 row_offset; /* basic offset in screen structure */
… …
1899 return; 1868 return;
1900 1869
1901 /* 1870 /*
1902 * A: set up vars 1871 * A: set up vars
1903 */ 1872 */
1904 clearfirst = clearlast = must_clear = wbyte = 0; 1873 clearfirst = clearlast = must_clear = 0;
1905#ifndef NO_BOLDFONT
1906 bfont = 0;
1907#endif
1908 1874
1909 if (currmaxcol < TermWin.ncol) 1875 if (currmaxcol < TermWin.ncol)
1910 { 1876 {
1911 currmaxcol = TermWin.ncol; 1877 currmaxcol = TermWin.ncol;
1912 buffer = (char *)rxvt_realloc (buffer, 1878 buffer = (char *)rxvt_realloc (buffer,
… …
1983#endif 1949#endif
1984 *srp = SET_FGCOLOR(*srp, ccol1); 1950 *srp = SET_FGCOLOR(*srp, ccol1);
1985 *srp = SET_BGCOLOR(*srp, ccol2); 1951 *srp = SET_BGCOLOR(*srp, ccol2);
1986#endif 1952#endif
1987 } 1953 }
1988
1989 while (IS_WIDE (*srp))
1990 cursorwidth++, srp++;
1991 } 1954 }
1992 1955
1993 /* make sure no outline cursor is left around */ 1956 /* make sure no outline cursor is left around */
1994 setoldcursor = 0; 1957 setoldcursor = 0;
1995 if (ocrow != -1) { 1958 if (ocrow != -1) {
… …
2138 i++; 2101 i++;
2139 2102
2140 continue; 2103 continue;
2141 } 2104 }
2142 2105
2143 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2106 if (rend != srp[col])
2144 break; 2107 break;
2145 2108
2146 count++; 2109 count++;
2147 2110
2148 if (stp[col] != dtp[col] 2111 if (stp[col] != dtp[col]
… …
2163 count -= i; /* dump any matching trailing chars */ 2126 count -= i; /* dump any matching trailing chars */
2164 2127
2165 /* 2128 /*
2166 * Determine the attributes for the string 2129 * Determine the attributes for the string
2167 */ 2130 */
2168 int fid = GET_FONT(rend); 2131 int fid = GET_FONT (rend);
2169 fore = GET_FGCOLOR(rend); 2132 int fore = GET_FGCOLOR (rend); // desired foreground
2170 back = GET_BGCOLOR(rend); 2133 int back = GET_BGCOLOR (rend); // desired background
2134
2171 rend = GET_ATTR(rend); 2135 rend = GET_ATTR (rend);
2172 2136
2173 rvid = (rend & RS_RVid) ? 1 : 0; 2137 rvid = !!(rend & RS_RVid);
2174#ifdef OPTION_HC 2138#ifdef OPTION_HC
2175 if (!rvid && (rend & RS_Blink)) 2139 if (!rvid && (rend & RS_Blink))
2176 { 2140 {
2177 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC)) 2141 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2178 back = Color_HC; 2142 back = Color_HC;
… …
2195 } 2159 }
2196#ifndef NO_BOLD_UNDERLINE_REVERSE 2160#ifndef NO_BOLD_UNDERLINE_REVERSE
2197 else if (rend & RS_Bold) 2161 else if (rend & RS_Bold)
2198 { 2162 {
2199 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD)) 2163 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD))
2200 {
2201 fore = Color_BD; 2164 fore = Color_BD;
2202# ifndef VERYBOLD
2203 rend &= ~RS_Bold; /* we've taken care of it */
2204# endif
2205 }
2206 } 2165 }
2207 else if (rend & RS_Uline) 2166 else if (rend & RS_Uline)
2208 { 2167 {
2209 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL)) 2168 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2210 {
2211 fore = Color_UL; 2169 fore = Color_UL;
2212 rend &= ~RS_Uline; /* we've taken care of it */
2213 }
2214 } 2170 }
2215#endif 2171#endif
2216 2172
2217 /* 2173 /*
2218 * Actually do the drawing of the string here 2174 * Actually do the drawing of the string here

Diff Legend

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