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.418 by sf-exg, Mon May 28 21:13:36 2012 UTC vs.
Revision 1.423 by sf-exg, Fri Jun 29 14:01:53 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);
… …
236 scr_alloc (); 237 scr_alloc ();
237 238
238 if (!prev_row_buf) 239 if (!prev_row_buf)
239 { 240 {
240 /* 241 /*
241 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
242 */ 243 */
243 top_row = 0; 244 top_row = 0;
244 term_start = 0; 245 term_start = 0;
245 246
246 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
… …
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--; )
… …
426 tt_winch (); 427 tt_winch ();
427 428
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 429 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 430}
430 431
431/* ------------------------------------------------------------------------- */
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void ecb_cold 432void ecb_cold
436rxvt_term::scr_release () NOTHROW 433rxvt_term::scr_release () NOTHROW
437{ 434{
438 free (chunk); 435 chunk_free (chunk, chunk_size);
436 chunk = 0;
437 row_buf = 0;
438
439 free (tabs); 439 free (tabs);
440 tabs = 0;
440} 441}
441 442
442/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
443/* 444/*
444 * Hard/Soft reset 445 * Hard/Soft reset
… …
446void ecb_cold 447void ecb_cold
447rxvt_term::scr_poweron () 448rxvt_term::scr_poweron ()
448{ 449{
449 scr_release (); 450 scr_release ();
450 451
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 453 rvideo_mode = false;
455 scr_soft_reset (); 454 scr_soft_reset ();
456 scr_reset (); 455 scr_reset ();
457 456
… …
1708 { 1707 {
1709 rvideo_state = on; 1708 rvideo_state = on;
1710 1709
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_BG_PIXMAP
1713 if (bg_pixmap == None) 1712 if (bg_img == 0)
1714#endif 1713#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1715
1717 XGCValues gcvalue; 1716 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
2053 refresh_count = 0; 2052 refresh_count = 0;
2054 2053
2055 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2055 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_BG_PIXMAP
2058 have_bg = bg_pixmap != None; 2057 have_bg = bg_img != 0;
2059#endif 2058#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2060
2062 /* 2061 /*
2063 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
… …
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2535{ 2534{
2536 bool transparent = false; 2535 bool transparent = false;
2537 2536
2538#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_BG_PIXMAP
2539 if (bg_pixmap != None) 2538 if (bg_img != 0)
2540 { 2539 {
2541# ifdef ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2542 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2545
2547 transparent = true; 2546 transparent = true;
2548 } 2547 }
2549 else 2548 else
2550# endif 2549# endif
2551 { 2550 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2553 }
2555 } 2554 }
2556 else 2555 else
2557#endif 2556#endif
2558 { 2557 {
… …
3532 3531
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3533}
3535 3534
3536/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3536#if USE_XIM
3538void ecb_cold 3537void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3539{
3541 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3542 3541

Diff Legend

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