--- rxvt-unicode/src/screen.C 2012/05/28 14:25:16 1.415 +++ rxvt-unicode/src/screen.C 2012/12/29 15:59:51 1.427 @@ -30,8 +30,6 @@ #include -#include "salloc.C" // HACK, should be a separate compile! - static inline void fill_text (text_t *start, text_t value, int len) { @@ -159,13 +157,13 @@ * ------------------------------------------------------------------------- */ void -rxvt_term::scr_alloc () +rxvt_term::scr_alloc () NOTHROW { int tsize = sizeof (text_t) * ncol; int rsize = sizeof (rend_t) * ncol; // we assume that rend_t size is a sufficient alignment - // factor for tetx_t and line_t values, and we only + // factor for text_t and line_t values, and we only // need to adjust tsize. tsize = (tsize + sizeof (rend_t) - 1); tsize -= tsize % sizeof (rend_t); @@ -173,7 +171,7 @@ int all_rows = total_rows + nrow + nrow; chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; - chunk = rxvt_malloc (chunk_size); + chunk = chunk_alloc (chunk_size, 0); char *base = (char *)chunk + sizeof (line_t) * all_rows; @@ -192,7 +190,7 @@ row_buf = swap_buf + nrow; } -void +void ecb_cold rxvt_term::scr_reset () { #if ENABLE_OVERLAY @@ -229,6 +227,7 @@ screen.bscroll = nrow - 1; void *prev_chunk = chunk; + size_t prev_chunk_size = chunk_size; line_t *prev_drawn_buf = drawn_buf; line_t *prev_swap_buf = swap_buf; line_t *prev_row_buf = row_buf; @@ -240,7 +239,7 @@ if (!prev_row_buf) { /* - * first time called so just malloc everything: don't rely on realloc + * first time called (or after scr_release) so just malloc everything: don't rely on realloc */ top_row = 0; term_start = 0; @@ -412,7 +411,7 @@ if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); } - free (prev_chunk); + chunk_free (prev_chunk, prev_chunk_size); free (tabs); tabs = (char *)rxvt_malloc (ncol); @@ -430,28 +429,26 @@ HOOK_INVOKE ((this, HOOK_RESET, DT_END)); } -/* ------------------------------------------------------------------------- */ -/* - * Free everything. That way malloc debugging can find leakage. - */ -void +void ecb_cold rxvt_term::scr_release () NOTHROW { - free (chunk); + chunk_free (chunk, chunk_size); + chunk = 0; + row_buf = 0; + free (tabs); + tabs = 0; } /* ------------------------------------------------------------------------- */ /* * Hard/Soft reset */ -void +void ecb_cold rxvt_term::scr_poweron () { scr_release (); - row_buf = 0; - tabs = 0; prev_nrow = prev_ncol = 0; rvideo_mode = false; scr_soft_reset (); @@ -461,7 +458,7 @@ scr_refresh (); } -void +void ecb_cold rxvt_term::scr_soft_reset () NOTHROW { /* only affects modes, nothing drastic such as clearing the screen */ @@ -637,7 +634,7 @@ * count positive ==> scroll up * count negative ==> scroll down */ -int +int ecb_hot rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW { if (count == 0 || (row1 > row2)) @@ -781,7 +778,7 @@ /* * Add text given in of length to screen struct */ -void +void ecb_hot rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW { if (len <= 0) /* sanity */ @@ -1141,7 +1138,7 @@ * in that row right. Clear left column. */ #if !ENABLE_MINIMAL -void +void ecb_cold rxvt_term::scr_backindex () NOTHROW { if (screen.cur.col > 0) @@ -1158,7 +1155,7 @@ * in that row left. Clear right column. */ #if !ENABLE_MINIMAL -void +void ecb_cold rxvt_term::scr_forwardindex () NOTHROW { if (screen.cur.col < ncol - 1) @@ -1419,7 +1416,7 @@ * Fill the screen with `E's * XTERM_SEQ: Screen Alignment Test: ESC # 8 */ -void +void ecb_cold rxvt_term::scr_E () NOTHROW { rend_t fs; @@ -1593,7 +1590,7 @@ * Set the scrolling region * XTERM_SEQ: Set region - inclusive: ESC [ ; r */ -void +void ecb_cold rxvt_term::scr_scroll_region (int top, int bot) NOTHROW { max_it (top, 0); @@ -1613,7 +1610,7 @@ * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l */ -void +void ecb_cold rxvt_term::scr_cursor_visible (int mode) NOTHROW { want_refresh = 1; @@ -1630,7 +1627,7 @@ * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l */ -void +void ecb_cold rxvt_term::scr_autowrap (int mode) NOTHROW { if (mode) @@ -1649,7 +1646,7 @@ * XTERM_SEQ: Set Absolute: ESC [ ? 6 h * XTERM_SEQ: Set Relative: ESC [ ? 6 l */ -void +void ecb_cold rxvt_term::scr_relative_origin (int mode) NOTHROW { if (mode) @@ -1666,7 +1663,7 @@ * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l */ -void +void ecb_cold rxvt_term::scr_insert_mode (int mode) NOTHROW { if (mode) @@ -1682,7 +1679,7 @@ * XTERM_SEQ: Clear tab at current column: ESC [ 0 g * XTERM_SEQ: Clear all tabs : ESC [ 3 g */ -void +void ecb_cold rxvt_term::scr_set_tab (int mode) NOTHROW { if (mode < 0) @@ -1711,8 +1708,8 @@ rvideo_state = on; ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); -#ifdef HAVE_BG_PIXMAP - if (bg_pixmap == None) +#ifdef HAVE_IMG + if (bg_img == 0) #endif XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); @@ -1731,7 +1728,7 @@ * Report current cursor position * XTERM_SEQ: Report position: ESC [ 6 n */ -void +void ecb_cold rxvt_term::scr_report_position () NOTHROW { tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); @@ -1744,7 +1741,7 @@ /* * Set font style */ -void +void ecb_cold rxvt_term::set_font_style () NOTHROW { #if 0 @@ -1776,7 +1773,7 @@ * XTERM_SEQ: Invoke G2 character set: ESC N * XTERM_SEQ: Invoke G3 character set: ESC O */ -void +void ecb_cold rxvt_term::scr_charset_choose (int set) NOTHROW { screen.charset = set; @@ -1807,7 +1804,7 @@ /* * refresh matching text. */ -bool +bool ecb_cold rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW { bool found = false; @@ -1836,7 +1833,7 @@ RC_COUNT }; -void +void ecb_hot rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW { int i; @@ -1972,7 +1969,7 @@ } /* ------------------------------------------------------------------------- */ -void +void ecb_cold rxvt_term::scr_printscreen (int fullhist) NOTHROW { #ifdef PRINTPIPE @@ -2031,7 +2028,7 @@ * drawn_text/drawn_rend contain the screen information before the update. * screen.text/screen.rend contain what the screen will change to. */ -void +void ecb_hot rxvt_term::scr_refresh () NOTHROW { int16_t col, row, /* column/row we're processing */ @@ -2056,8 +2053,8 @@ unsigned int old_screen_flags = screen.flags; bool have_bg = 0; -#ifdef HAVE_BG_PIXMAP - have_bg = bg_pixmap != None; +#ifdef HAVE_IMG + have_bg = bg_img != 0; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -2507,7 +2504,7 @@ num_scr_allow = 1; } -void +void ecb_cold rxvt_term::scr_remap_chars (line_t &l) NOTHROW { if (!l.valid ()) @@ -2519,7 +2516,7 @@ l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); } -void +void ecb_cold rxvt_term::scr_remap_chars () NOTHROW { for (int i = total_rows; i--; ) @@ -2532,18 +2529,18 @@ } } -void +void ecb_cold rxvt_term::scr_recolour (bool refresh) NOTHROW { bool transparent = false; -#ifdef HAVE_BG_PIXMAP - if (bg_pixmap != None) +#ifdef HAVE_IMG + if (bg_img != 0) { -# ifdef ENABLE_TRANSPARENCY +# if ENABLE_TRANSPARENCY if (bg_flags & BG_IS_TRANSPARENT) { - XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); + XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); transparent = true; @@ -2552,7 +2549,7 @@ # endif { XSetWindowBackground (dpy, parent, pix_colors[Color_border]); - XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); + XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); } } else @@ -2569,7 +2566,7 @@ if (transparent) XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); else - XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); + XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); scrollBar.state = SB_STATE_IDLE; scrollBar.show (0); } @@ -2645,7 +2642,7 @@ } /* ------------------------------------------------------------------------- */ -void +void ecb_hot rxvt_term::scr_reverse_selection () NOTHROW { if (selection.op @@ -2946,7 +2943,7 @@ * Mark or select text based upon number of clicks: 1, 2, or 3 * EXT: button 1 press */ -void +void ecb_cold rxvt_term::selection_click (int clicks, int x, int y) NOTHROW { clicks = ((clicks - 1) % 3) + 1; @@ -2975,7 +2972,7 @@ /* * Mark a selection at the specified col/row */ -void +void ecb_cold rxvt_term::selection_start_colrow (int col, int row) NOTHROW { want_refresh = 1; @@ -3012,7 +3009,7 @@ (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) #define DELIMIT_REND(x) 1 -void +void ecb_cold rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW { int col, row, dirnadd, tcol, trow, w1, w2; @@ -3096,7 +3093,7 @@ * flag == 1 ==> button 3 press * flag == 2 ==> button 3 motion */ -void +void ecb_cold rxvt_term::selection_extend (int x, int y, int flag) NOTHROW { int col = clamp (Pixel2Col (x), 0, ncol); @@ -3132,7 +3129,7 @@ /* * Extend the selection to the specified col/row */ -void +void ecb_cold rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW { row_col_t pos; @@ -3333,7 +3330,7 @@ } #if !ENABLE_MINIMAL -void +void ecb_cold rxvt_term::selection_remove_trailing_spaces () NOTHROW { int32_t end_col, end_row; @@ -3381,7 +3378,7 @@ * Double click on button 3 when already selected * EXT: button 3 double click */ -void +void ecb_cold rxvt_term::selection_rotate (int x, int y) NOTHROW { selection.clicks = selection.clicks % 3 + 1; @@ -3393,7 +3390,7 @@ * Respond to a request for our current selection * EXT: SelectionRequest */ -void +void ecb_cold rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW { Atom property = rq.property == None ? rq.target : rq.property; @@ -3536,8 +3533,8 @@ } /* ------------------------------------------------------------------------- */ -#ifdef USE_XIM -void +#if USE_XIM +void ecb_cold rxvt_term::im_set_position (XPoint &pos) NOTHROW { XWindowAttributes xwa;