--- rxvt-unicode/src/screen.C 2011/11/15 02:24:25 1.400 +++ rxvt-unicode/src/screen.C 2012/05/28 16:40:03 1.417 @@ -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) { @@ -100,9 +98,9 @@ void rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW { - if (!l.t) + if (!l.valid ()) { - lalloc (l); + l.alloc (); col = 0; width = ncol; } @@ -159,6 +157,40 @@ * ------------------------------------------------------------------------- */ void +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 + // need to adjust tsize. + tsize = (tsize + sizeof (rend_t) - 1); + tsize -= tsize % sizeof (rend_t); + + int all_rows = total_rows + nrow + nrow; + + chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; + chunk = rxvt_malloc (chunk_size); + + char *base = (char *)chunk + sizeof (line_t) * all_rows; + + for (int row = 0; row < all_rows; ++row) + { + line_t &l = ((line_t *)chunk) [row]; + + l.t = (text_t *)base; base += tsize; + l.r = (rend_t *)base; base += rsize; + l.l = -1; + l.f = 0; + } + + drawn_buf = (line_t *)chunk; + swap_buf = drawn_buf + nrow; + row_buf = swap_buf + nrow; +} + +void ecb_cold rxvt_term::scr_reset () { #if ENABLE_OVERLAY @@ -194,7 +226,16 @@ screen.tscroll = 0; screen.bscroll = nrow - 1; - if (!row_buf) + void *prev_chunk = chunk; + line_t *prev_drawn_buf = drawn_buf; + line_t *prev_swap_buf = swap_buf; + line_t *prev_row_buf = row_buf; + + int common_col = min (prev_ncol, ncol); + + scr_alloc (); + + if (!prev_row_buf) { /* * first time called so just malloc everything: don't rely on realloc @@ -202,20 +243,6 @@ top_row = 0; term_start = 0; - talloc = new rxvt_salloc (ncol * sizeof (text_t)); - ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - - row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); - drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); - swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); - - for (int row = nrow; row--; ) - { - scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); - scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); - scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); - } - memset (charsets, 'B', sizeof (charsets)); rstyle = DEFAULT_RSTYLE; screen.flags = Screen_DefaultFlags; @@ -247,38 +274,17 @@ * add or delete rows as appropriate */ - rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); - rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - -#if 0 - if (nrow < prev_nrow) - { - for (int row = nrow; row < prev_nrow; row++) - { - lfree (swap_buf [row]); - lfree (drawn_buf[row]); - } - } -#endif - - drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); - swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); - for (int row = min (nrow, prev_nrow); row--; ) { - lresize (drawn_buf[row]); - lresize (swap_buf [row]); - } + scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); + scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); - for (int row = prev_nrow; row < nrow; row++) - { - swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); - drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); + memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); + memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); + memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); + memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); } - line_t *old_buf = row_buf; - row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); - int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row int pend = MOD (term_start + top_row , prev_total_rows); int q = total_rows; // rewrapped row @@ -295,11 +301,11 @@ do { p = MOD (p - 1, prev_total_rows); - assert (old_buf [MOD (p, prev_total_rows)].t); + assert (prev_row_buf [MOD (p, prev_total_rows)].t); int plines = 1; - int llen = old_buf [MOD (p, prev_total_rows)].l; + int llen = prev_row_buf [MOD (p, prev_total_rows)].l; - while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) + while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) { p = MOD (p - 1, prev_total_rows); @@ -322,7 +328,7 @@ for (int qrow = q; qlines--; qrow++) { qline = row_buf + qrow; - lalloc (*qline); + qline->alloc (); // redundant with next line qline->l = ncol; qline->is_longer (1); @@ -347,7 +353,7 @@ if (prow == ocur.row) screen.cur.row = q - (total_rows - nrow); - line_t &pline = old_buf [prow]; + line_t &pline = prev_row_buf [prow]; int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); @@ -378,29 +384,34 @@ for (int row = min (nrow, prev_nrow); row--; ) { - line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; - line_t &qline = row_buf [row]; + line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; + line_t &dst = row_buf [row]; + + scr_blank_screen_mem (dst, DEFAULT_RSTYLE); - qline = pline; - lresize (qline); + memcpy (dst.t, src.t, sizeof (text_t) * common_col); + memcpy (dst.r, src.r, sizeof (rend_t) * common_col); } for (int row = prev_nrow; row < nrow; row++) - { - row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); - } + scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); term_start = 0; } - free (old_buf); - delete old_ta; - delete old_ra; - clamp_it (screen.cur.row, 0, nrow - 1); clamp_it (screen.cur.col, 0, ncol - 1); } + for (int row = nrow; row--; ) + { + if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); + if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); + if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); + } + + free (prev_chunk); + free (tabs); tabs = (char *)rxvt_malloc (ncol); @@ -421,32 +432,24 @@ /* * Free everything. That way malloc debugging can find leakage. */ -void +void ecb_cold rxvt_term::scr_release () NOTHROW { - if (row_buf) - { - delete talloc; talloc = 0; - delete ralloc; ralloc = 0; - - free (row_buf); - free (swap_buf); - free (drawn_buf); - row_buf = 0; // signal that we freed all the arrays above - - free (tabs); - tabs = 0; - } + free (chunk); + free (tabs); } /* ------------------------------------------------------------------------- */ /* * 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 (); @@ -456,8 +459,8 @@ scr_refresh (); } -void -rxvt_term::scr_soft_reset () +void ecb_cold +rxvt_term::scr_soft_reset () NOTHROW { /* only affects modes, nothing drastic such as clearing the screen */ #if ENABLE_OVERLAY @@ -522,7 +525,7 @@ } void -rxvt_term::scr_swap_screen () +rxvt_term::scr_swap_screen () NOTHROW { if (!option (Opt_secondaryScreen)) return; @@ -551,7 +554,12 @@ want_refresh = 1; view_start = 0; - selection_check (2); /* check for boundary cross */ + /* check for boundary cross */ + row_col_t pos; + pos.row = pos.col = 0; + if (ROWCOL_IS_BEFORE (selection.beg, pos) + && ROWCOL_IS_AFTER (selection.end, pos)) + CLEAR_SELECTION (); current_screen = scrn; @@ -627,7 +635,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)) @@ -684,7 +692,8 @@ } // move and/or clear selection, if any - if (selection.op && current_screen == selection.screen) + if (selection.op && current_screen == selection.screen + && selection.beg.row <= row2) { selection.beg.row -= count; selection.end.row -= count; @@ -770,13 +779,13 @@ /* * 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 */ return; - unsigned char checksel; + bool checksel; unicode_t c; int ncol = this->ncol; const wchar_t *strend = str + len; @@ -1130,7 +1139,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) @@ -1147,7 +1156,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) @@ -1308,7 +1317,7 @@ /* ------------------------------------------------------------------------- */ /* - * Erase part of whole of the screen + * Erase part or whole of the screen * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J * XTERM_SEQ: Clear whole screen : ESC [ 2 J @@ -1327,19 +1336,16 @@ switch (mode) { case 0: /* erase to end of screen */ - selection_check (1); scr_erase_line (0); row = screen.cur.row + 1; /* possible OOB */ num = nrow - row; break; case 1: /* erase to beginning of screen */ - selection_check (3); scr_erase_line (1); row = 0; num = screen.cur.row; break; case 2: /* erase whole screen */ - selection_check (3); row = 0; num = nrow; break; @@ -1366,7 +1372,7 @@ if (mapped) XClearArea (dpy, vt, 0, - Row2Pixel (row - view_start), (unsigned int)width, + Row2Pixel (row - view_start), (unsigned int)vt_width, (unsigned int)Height2Pixel (num), False); } else @@ -1379,7 +1385,7 @@ XChangeGC (dpy, gc, GCForeground, &gcvalue); XFillRectangle (dpy, vt, gc, 0, Row2Pixel (row - view_start), - (unsigned int)width, + (unsigned int)vt_width, (unsigned int)Height2Pixel (num)); gcvalue.foreground = pix_colors[Color_fg]; XChangeGC (dpy, gc, GCForeground, &gcvalue); @@ -1411,7 +1417,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; @@ -1420,7 +1426,11 @@ ZERO_SCROLLBACK (); num_scr_allow = 0; - selection_check (3); + + row_col_t pos; + pos.row = pos.col = 0; + if (ROWCOL_IS_AFTER (selection.end, pos)) + CLEAR_SELECTION (); fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); for (int row = nrow; row--; ) @@ -1581,7 +1591,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); @@ -1601,7 +1611,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; @@ -1618,7 +1628,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) @@ -1637,7 +1647,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) @@ -1654,7 +1664,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) @@ -1670,7 +1680,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) @@ -1719,7 +1729,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); @@ -1732,7 +1742,7 @@ /* * Set font style */ -void +void ecb_cold rxvt_term::set_font_style () NOTHROW { #if 0 @@ -1764,7 +1774,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; @@ -1795,7 +1805,7 @@ /* * refresh matching text. */ -bool +bool ecb_cold rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW { bool found = false; @@ -1824,7 +1834,7 @@ RC_COUNT }; -void +void ecb_hot rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW { int i; @@ -1871,7 +1881,7 @@ void rxvt_term::scr_touch (bool refresh) NOTHROW { - scr_expose (0, 0, width, height, refresh); + scr_expose (0, 0, vt_width, vt_height, refresh); } /* ------------------------------------------------------------------------- */ @@ -1960,7 +1970,7 @@ } /* ------------------------------------------------------------------------- */ -void +void ecb_cold rxvt_term::scr_printscreen (int fullhist) NOTHROW { #ifdef PRINTPIPE @@ -2019,7 +2029,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 */ @@ -2043,7 +2053,7 @@ refresh_count = 0; unsigned int old_screen_flags = screen.flags; - char have_bg = 0; + bool have_bg = 0; #ifdef HAVE_BG_PIXMAP have_bg = bg_pixmap != None; #endif @@ -2059,13 +2069,13 @@ scr_swap_overlay (); #endif - char showcursor = screen.flags & Screen_VisibleCursor; + bool showcursor = screen.flags & Screen_VisibleCursor; /* * C: set the cursor character (s) */ { - unsigned char setoldcursor; + bool setoldcursor; #ifdef CURSOR_BLINK if (hidden_cursor) @@ -2162,7 +2172,6 @@ int i = num_scr; int j; int len, wlen; - dLocal (int, num_scr); j = nrow; wlen = len = -1; @@ -2477,7 +2486,7 @@ Col2Pixel (col), Row2Pixel (oldcursor.row), (unsigned int) (Width2Pixel (cursorwidth) - 1), - (unsigned int) (Height2Pixel (1) - lineSpace - 1)); + (unsigned int) (Height2Pixel (1) - 1)); } } @@ -2496,10 +2505,10 @@ num_scr_allow = 1; } -void +void ecb_cold rxvt_term::scr_remap_chars (line_t &l) NOTHROW { - if (!l.t) + if (!l.valid ()) return; l.touch (); // maybe a bit of an overkill, but it's not performance-relevant @@ -2508,7 +2517,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--; ) @@ -2521,7 +2530,7 @@ } } -void +void ecb_cold rxvt_term::scr_recolour (bool refresh) NOTHROW { bool transparent = false; @@ -2634,7 +2643,7 @@ } /* ------------------------------------------------------------------------- */ -void +void ecb_hot rxvt_term::scr_reverse_selection () NOTHROW { if (selection.op @@ -2663,26 +2672,8 @@ void rxvt_term::scr_dump (int fd) NOTHROW { - int row, wrote; - unsigned int width, towrite; - const char r1[] = "\n"; - - for (row = saveLines + top_row; - row < saveLines + nrow - 1; row++) - { - width = row_buf[row].l >= 0 ? row_buf[row].l - : ncol; - for (towrite = width; towrite; towrite -= wrote) - { - wrote = write (fd, & (row_buf[row].t[width - towrite]), - towrite); - if (wrote < 0) - return; /* XXX: death, no report */ - } - if (row_buf[row].l >= 0) - if (write (fd, r1, 1) <= 0) - return; /* XXX: death, no report */ - } + // if this method is needed, it can be implemented by factoring the + // relevant code in scr_printscreen } #endif @@ -2695,21 +2686,13 @@ if (!selection.op) return; - row_col_t pos; - pos.row = pos.col = 0; - if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) || !IN_RANGE_EXC (selection.end.row, top_row, nrow) || (check_more == 1 && current_screen == selection.screen && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) - && ROWCOL_IS_BEFORE (screen.cur, selection.end)) - || (check_more == 2 - && ROWCOL_IS_BEFORE (selection.beg, pos) - && ROWCOL_IS_AFTER (selection.end, pos)) - || (check_more == 3 - && ROWCOL_IS_AFTER (selection.end, pos))) + && ROWCOL_IS_BEFORE (screen.cur, selection.end))) CLEAR_ALL_SELECTION (); } @@ -2726,12 +2709,12 @@ data[i] = C0_CR; if (priv_modes & PrivMode_BracketPaste) - tt_printf ("\e[200~"); + tt_printf ("\x1b[200~"); tt_write (data, len); if (priv_modes & PrivMode_BracketPaste) - tt_printf ("\e[201~"); + tt_printf ("\x1b[201~"); } void @@ -2961,7 +2944,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; @@ -2990,7 +2973,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; @@ -3027,7 +3010,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; @@ -3111,7 +3094,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); @@ -3147,7 +3130,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; @@ -3348,7 +3331,7 @@ } #if !ENABLE_MINIMAL -void +void ecb_cold rxvt_term::selection_remove_trailing_spaces () NOTHROW { int32_t end_col, end_row; @@ -3396,7 +3379,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; @@ -3408,7 +3391,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; @@ -3552,7 +3535,7 @@ /* ------------------------------------------------------------------------- */ #ifdef USE_XIM -void +void ecb_cold rxvt_term::im_set_position (XPoint &pos) NOTHROW { XWindowAttributes xwa;