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.431 by root, Sun Jan 13 20:19:24 2013 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

… …
150 l.r[col] = rend; 150 l.r[col] = rend;
151 col++; 151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
155/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
158 168
159void 169void
… …
188 drawn_buf = (line_t *)chunk; 198 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 199 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 200 row_buf = swap_buf + nrow;
191} 201}
192 202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
193void ecb_cold 213void ecb_cold
194rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
195{ 215{
196#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
197 scr_overlay_off (); 217 scr_overlay_off ();
… …
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size; 250 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236 254
237 scr_alloc (); 255 scr_alloc ();
238 256
239 if (!prev_row_buf) 257 if (!prev_row_buf)
240 { 258 {
… …
275 * add or delete rows as appropriate 293 * add or delete rows as appropriate
276 */ 294 */
277 295
278 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
279 { 297 {
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
282
283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f; 299 copy_line (swap_buf [row], prev_swap_buf [row]);
290 } 300 }
291 301
292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
293 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
294 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
… …
389 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
390 { 400 {
391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
392 line_t &dst = row_buf [row]; 402 line_t &dst = row_buf [row];
393 403
394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 404 copy_line (dst, src);
395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = min (src.l, ncol);
399 dst.f = src.f;
400 } 405 }
401 406
402 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
404 409
… …
2037rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
2038{ 2043{
2039 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
2040 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
2041 int i; /* tmp */ 2046 int i; /* tmp */
2042#ifndef NO_CURSORCOLOR
2043 rend_t cc1; /* store colours at cursor position (s) */
2044#endif
2045 rend_t *crp; // cursor rendition pointer
2046 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
2047 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2048 2051
2049 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2050 2053
2051 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2052 return; 2055 return;
… …
2091 int col = screen.cur.col; 2094 int col = screen.cur.col;
2092 2095
2093 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2094 col--; 2097 col--;
2095 2098
2096 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2097 2101
2098#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2099 cc1 = *crp & (RS_fgMask | RS_bgMask);
2100 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2101 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2102 else 2105 else
2103#endif 2106#endif
2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2118 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2119#endif 2122#endif
2120 2123
2121 if (focus) 2124 if (focus)
2122 { 2125 {
2126 rend_t rend = cur_rend;
2127
2123 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2124 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2125 else 2130 else
2126 { 2131 {
2127 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2128 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2129 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2130 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2131 } 2138 }
2132 } 2139 }
2133 2140
2134 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2135 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2454 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2455 */ 2462 */
2456 if (showcursor) 2463 if (showcursor)
2457 { 2464 {
2458 if (focus) 2465 if (focus)
2459 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2460 if (option (Opt_cursorUnderline))
2461 *crp ^= RS_Uline;
2462 else
2463 {
2464 *crp ^= RS_RVid;
2465#ifndef NO_CURSORCOLOR
2466 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2467#endif
2468 }
2469 }
2470 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2471 { 2468 {
2472 int cursorwidth = 1; 2469 int cursorwidth = 1;
2473 int col = oldcursor.col; 2470 int col = oldcursor.col;
2474 2471

Diff Legend

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