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.420 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 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);
… …
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 printf ("pc %p\n", prev_chunk);//D
415 chunk_free (prev_chunk, prev_chunk_size);
414 416
415 free (tabs); 417 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
417 419
418 for (int col = ncol; col--; ) 420 for (int col = ncol; col--; )
… …
429} 431}
430 432
431void ecb_cold 433void ecb_cold
432rxvt_term::scr_release () NOTHROW 434rxvt_term::scr_release () NOTHROW
433{ 435{
434 free (chunk); chunk = 0; row_buf = 0; 436 chunk_free (chunk, chunk_size);
435 free (tabs); tabs = 0; 437 chunk = 0;
438 row_buf = 0;
439
440 free (tabs);
441 tabs = 0;
436} 442}
437 443
438/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
439/* 445/*
440 * Hard/Soft reset 446 * Hard/Soft reset
… …
1702 { 1708 {
1703 rvideo_state = on; 1709 rvideo_state = on;
1704 1710
1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1706#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1707 if (bg_pixmap == None) 1713 if (bg_img == 0)
1708#endif 1714#endif
1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1710 1716
1711 XGCValues gcvalue; 1717 XGCValues gcvalue;
1712 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
2047 refresh_count = 0; 2053 refresh_count = 0;
2048 2054
2049 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2050 bool have_bg = 0; 2056 bool have_bg = 0;
2051#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2052 have_bg = bg_pixmap != None; 2058 have_bg = bg_img != 0;
2053#endif 2059#endif
2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2055 2061
2056 /* 2062 /*
2057 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2528rxvt_term::scr_recolour (bool refresh) NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2529{ 2535{
2530 bool transparent = false; 2536 bool transparent = false;
2531 2537
2532#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2533 if (bg_pixmap != None) 2539 if (bg_img != 0)
2534 { 2540 {
2535# if ENABLE_TRANSPARENCY 2541# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT) 2542 if (bg_flags & BG_IS_TRANSPARENT)
2537 { 2543 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2540 2546
2541 transparent = true; 2547 transparent = true;
2542 } 2548 }
2543 else 2549 else
2544# endif 2550# endif
2545 { 2551 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 } 2554 }
2549 } 2555 }
2550 else 2556 else
2551#endif 2557#endif
2552 { 2558 {

Diff Legend

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