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.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

… …
169 tsize -= tsize % sizeof (rend_t); 169 tsize -= tsize % sizeof (rend_t);
170 170
171 int all_rows = total_rows + nrow + nrow; 171 int all_rows = total_rows + nrow + nrow;
172 172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 174 chunk = chunk_alloc (chunk_size, 0);
175 175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 177
178 for (int row = 0; row < all_rows; ++row) 178 for (int row = 0; row < all_rows; ++row)
179 { 179 {
… …
225 225
226 screen.tscroll = 0; 226 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
228 228
229 void *prev_chunk = chunk; 229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 231 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 232 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 233 line_t *prev_row_buf = row_buf;
233 234
234 int common_col = min (prev_ncol, ncol); 235 int common_col = min (prev_ncol, ncol);
… …
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281 282
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 283 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 (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 286 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); 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;
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
… …
389 393
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
391 395
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col); 396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_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;
394 } 400 }
395 401
396 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 404
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 414 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); 415 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); 416 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 417 }
412 418
413 free (prev_chunk); 419 chunk_free (prev_chunk, prev_chunk_size);
414 420
415 free (tabs); 421 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 422 tabs = (char *)rxvt_malloc (ncol);
417 423
418 for (int col = ncol; col--; ) 424 for (int col = ncol; col--; )
… …
429} 435}
430 436
431void ecb_cold 437void ecb_cold
432rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
433{ 439{
434 free (chunk); chunk = 0; row_buf = 0; 440 chunk_free (chunk, chunk_size);
435 free (tabs); tabs = 0; 441 chunk = 0;
442 row_buf = 0;
443
444 free (tabs);
445 tabs = 0;
436} 446}
437 447
438/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
439/* 449/*
440 * Hard/Soft reset 450 * Hard/Soft reset
… …
1701 if (rvideo_state != on) 1711 if (rvideo_state != on)
1702 { 1712 {
1703 rvideo_state = on; 1713 rvideo_state = on;
1704 1714
1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1706#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1707 if (bg_img == 0) 1717 if (bg_img == 0)
1708#endif 1718#endif
1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1710 1720
1711 XGCValues gcvalue; 1721 XGCValues gcvalue;
… …
2046 */ 2056 */
2047 refresh_count = 0; 2057 refresh_count = 0;
2048 2058
2049 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2050 bool have_bg = 0; 2060 bool have_bg = 0;
2051#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2052 have_bg = bg_img != 0; 2062 have_bg = bg_img != 0;
2053#endif 2063#endif
2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2055 2065
2056 /* 2066 /*
… …
2527void ecb_cold 2537void ecb_cold
2528rxvt_term::scr_recolour (bool refresh) NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2529{ 2539{
2530 bool transparent = false; 2540 bool transparent = false;
2531 2541
2532#ifdef HAVE_BG_PIXMAP 2542#ifdef HAVE_IMG
2533 if (bg_img != 0) 2543 if (bg_img != 0)
2534 { 2544 {
2535# if ENABLE_TRANSPARENCY 2545# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT) 2546 if (bg_flags & BG_IS_TRANSPARENT)
2537 { 2547 {
… …
2559 if (scrollBar.win) 2569 if (scrollBar.win)
2560 { 2570 {
2561 if (transparent) 2571 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else 2573 else
2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2565 scrollBar.state = SB_STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2566 scrollBar.show (0); 2576 scrollBar.show (0);
2567 } 2577 }
2568 2578
2569 if (refresh) 2579 if (refresh)

Diff Legend

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