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.258 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.265 by root, Tue Oct 3 11:56:48 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
645 { 645 {
646 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
647 647
648 // optimize if already cleared, can be significant on slow machines 648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 651 {
652 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 653 l.l = 0;
654 l.f = 0; 654 l.f = 0;
655 } 655 }
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1970 */
1971void 1971void
1972rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1973{ 1973{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1978 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1980 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1981#endif
1982 rend_t *crp; // cursor rendition pointer 1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1983 1985
1984 want_refresh = 0; /* screen is current */ 1986 want_refresh = 0; /* screen is current */
1985 1987
1986 if (refresh_type == NO_REFRESH || !mapped) 1988 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1989 return;
1988 1990
1989 /* 1991 /*
1990 * A: set up vars 1992 * A: set up vars
1991 */ 1993 */
1992 must_clear = 0; 1994 have_bg = 0;
1993 refresh_count = 0; 1995 refresh_count = 0;
1994 1996
1995#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1996 must_clear |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1997#endif 1999#endif
1998#if TRANSPARENT 2000#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent; 2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2002#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2004
2003 /* 2005 /*
2004 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
2008 /* 2010 /*
2009 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
2010 */ 2012 */
2011 { 2013 {
2012 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2015
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2018 if (hidden_cursor)
2019 showcursor = 0; 2019 showcursor = 0;
… …
2025 2025
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2027 col--;
2028 2028
2029 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2030 2053
2031 if (showcursor && focus) 2054 if (showcursor && focus)
2032 { 2055 {
2033 if (OPTION (Opt_cursorUnderline)) 2056 if (OPTION (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2035 else 2058 else
2036 { 2059 {
2037 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2063 }
2061 } 2064 }
2062 } 2065 }
2063 2066
2064 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2105 */ 2108 */
2106 if (!display->is_local 2109 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2109 { 2112 {
2110 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2111 int j; 2115 int j;
2112 int len, wlen; 2116 int len, wlen;
2113 dLocal (int, num_scr); 2117 dLocal (int, num_scr);
2114 2118
2115 j = nrow; 2119 j = nrow;
2116 wlen = len = -1; 2120 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2124 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2126 {
2122 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2148 wlen = row;
2144 continue; 2149 continue;
2145 } 2150 }
2146 } 2151 }
2147 2152
2148 if (len != -1) 2153 if (len >= 0)
2149 { 2154 {
2150 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2156 if (wlen < len)
2152 ::swap (wlen, len); 2157 ::swap (wlen, len);
2153 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (dpy, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2164 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2159 len = -1; 2169 len = -1;
2160 } 2170 }
2161 } 2171 }
2162 } 2172 }
2163#endif 2173#endif
… …
2219 count++; 2229 count++;
2220 2230
2221 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2223 { 2233 {
2224 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2225 break; 2235 break;
2226 2236
2227 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2228 drp[col] = rend; 2238 drp[col] = rend;
2229 i = 0; 2239 i = 0;
2230 } 2240 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2242 break;
2233 } 2243 }
2234 2244
2235 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2246 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2247 2257
2248 // only do special processing if any attributes are set, which is unlikely 2258 // only do special processing if any attributes are set, which is unlikely
2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2250 { 2260 {
2251#if ENABLE_STYLES
2252 // "careful" (too wide) character handling
2253
2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2255 while (text > stp
2256 && srp[text - stp - 1] & RS_Careful
2257 && RS_SAME (rend, srp[text - stp - 1]))
2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2267#endif
2268
2269 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2270 2262
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold 2264 if (rend & RS_Bold
2273 && fore == Color_fg) 2265 && fore == Color_fg)
… …
2289 else 2281 else
2290 invert = !invert; 2282 invert = !invert;
2291# endif 2283# endif
2292 } 2284 }
2293 2285
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2287 fore = Color_UL;
2296#endif 2288#endif
2297 2289
2298 if (invert) 2290 if (invert)
2299 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2300 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2301 2303
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2307 back = Color_RV;
2305 2308# endif
2306 if (fore == back) 2309 if (fore == back)
2307 { 2310 {
2308 fore = Color_bg; 2311 fore = Color_bg;
2309 back = Color_fg; 2312 back = Color_fg;
2310 } 2313 }
… …
2321 } 2324 }
2322 else if (hidden_text) 2325 else if (hidden_text)
2323 fore = back; 2326 fore = back;
2324 } 2327 }
2325#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2326 } 2347 }
2327 2348
2328 /* 2349 /*
2329 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2330 */ 2351 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2353
2333 if (back == fore) 2354 if (back == fore)
2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); 2355 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2335 else if (back == Color_bg) 2356 else if (back == Color_bg && have_bg)
2336 { 2357 {
2337 if (must_clear) 2358 // this is very ugly, maybe push it into ->draw?
2338 {
2339 CLEAR_CHARS (xpixel, ypixel, count);
2340 2359
2341 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2342 if (text[i] != ' ') 2361 if (text[i] != ' ')
2343 { 2362 {
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2345 break; 2364 goto did_clear;
2346 }
2347 } 2365 }
2348 else 2366
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ;
2350 } 2369 }
2351 else 2370 else
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2353 2372
2354 if (rend & RS_Uline && font->descent > 1 && fore != back) 2373 if (rend & RS_Uline && font->descent > 1 && fore != back)
… …
2402 cursorwidth++; 2421 cursorwidth++;
2403 2422
2404#ifndef NO_CURSORCOLOR 2423#ifndef NO_CURSORCOLOR
2405 if (ISSET_PIXCOLOR (Color_cursor)) 2424 if (ISSET_PIXCOLOR (Color_cursor))
2406 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else
2407#endif 2427#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]);
2408 2429
2409 XDrawRectangle (dpy, drawBuffer, gc, 2430 XDrawRectangle (dpy, drawBuffer, gc,
2410 Col2Pixel (col), 2431 Col2Pixel (col),
2411 Row2Pixel (oldcursor.row), 2432 Row2Pixel (oldcursor.row),
2412 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2433 (unsigned int) (Width2Pixel (cursorwidth) - 1),

Diff Legend

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