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.422 by root, Thu Jun 28 15:19:15 2012 UTC vs.
Revision 1.432 by sf-exg, Sun Jan 13 22:30:47 2013 UTC

… …
188 drawn_buf = (line_t *)chunk; 188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 190 row_buf = swap_buf + nrow;
191} 191}
192 192
193void
194rxvt_term::copy_line (line_t &dst, line_t &src)
195{
196 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
197 dst.l = min (src.l, ncol);
198 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
199 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
200 dst.f = src.f;
201}
202
193void ecb_cold 203void ecb_cold
194rxvt_term::scr_reset () 204rxvt_term::scr_reset ()
195{ 205{
196#if ENABLE_OVERLAY 206#if ENABLE_OVERLAY
197 scr_overlay_off (); 207 scr_overlay_off ();
… …
225 235
226 screen.tscroll = 0; 236 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 237 screen.bscroll = nrow - 1;
228 238
229 void *prev_chunk = chunk; 239 void *prev_chunk = chunk;
240 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 241 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 242 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 243 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235 244
236 scr_alloc (); 245 scr_alloc ();
237 246
238 if (!prev_row_buf) 247 if (!prev_row_buf)
239 { 248 {
… …
274 * add or delete rows as appropriate 283 * add or delete rows as appropriate
275 */ 284 */
276 285
277 for (int row = min (nrow, prev_nrow); row--; ) 286 for (int row = min (nrow, prev_nrow); row--; )
278 { 287 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 288 copy_line (drawn_buf [row], prev_drawn_buf [row]);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 289 copy_line (swap_buf [row], prev_swap_buf [row]);
281
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
286 } 290 }
287 291
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
386 { 390 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 392 line_t &dst = row_buf [row];
389 393
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 394 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 395 }
395 396
396 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 399
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 412 }
412 413
413 free (prev_chunk); 414 chunk_free (prev_chunk, prev_chunk_size);
414 415
415 free (tabs); 416 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 417 tabs = (char *)rxvt_malloc (ncol);
417 418
418 for (int col = ncol; col--; ) 419 for (int col = ncol; col--; )
… …
1705 if (rvideo_state != on) 1706 if (rvideo_state != on)
1706 { 1707 {
1707 rvideo_state = on; 1708 rvideo_state = on;
1708 1709
1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1710#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_IMG
1711 if (bg_img == 0) 1712 if (bg_img == 0)
1712#endif 1713#endif
1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1714 1715
1715 XGCValues gcvalue; 1716 XGCValues gcvalue;
… …
2050 */ 2051 */
2051 refresh_count = 0; 2052 refresh_count = 0;
2052 2053
2053 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2054 bool have_bg = 0; 2055 bool have_bg = 0;
2055#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_IMG
2056 have_bg = bg_img != 0; 2057 have_bg = bg_img != 0;
2057#endif 2058#endif
2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059 2060
2060 /* 2061 /*
… …
2531void ecb_cold 2532void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2533{ 2534{
2534 bool transparent = false; 2535 bool transparent = false;
2535 2536
2536#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_IMG
2537 if (bg_img != 0) 2538 if (bg_img != 0)
2538 { 2539 {
2539# if ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2542 {
… …
2563 if (scrollBar.win) 2564 if (scrollBar.win)
2564 { 2565 {
2565 if (transparent) 2566 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2568 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = SB_STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2571 scrollBar.show (0);
2571 } 2572 }
2572 2573
2573 if (refresh) 2574 if (refresh)

Diff Legend

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