--- rxvt-unicode/src/screen.C 2006/01/15 06:39:19 1.229 +++ rxvt-unicode/src/screen.C 2006/01/20 10:35:25 1.245 @@ -117,7 +117,7 @@ /* Fill part/all of a line with blanks. */ void -rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) +rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW { if (!l.t) { @@ -144,7 +144,7 @@ /* ------------------------------------------------------------------------- */ /* Fill a full line with blanks - make sure it is allocated first */ void -rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) +rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW { scr_blank_line (l, 0, ncol, efs); @@ -236,7 +236,6 @@ selection.op = SELECTION_CLEAR; selection.screen = PRIMARY; selection.clicks = 0; - CLEAR_ALL_SELECTION (); rvideo = 0; } else @@ -327,6 +326,10 @@ int qcol = 0; + // see below for cursor adjustment rationale + if (p == ocur.row) + screen.cur.row = q - (total_rows - nrow); + // fill a single destination line while (lofs < llen && qcol < ncol) { @@ -346,8 +349,10 @@ int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); +#if DEBUG_STRICT assert (len); assert (pline.t); +#endif memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); @@ -391,11 +396,6 @@ term_start = 0; } -#ifdef DEBUG_STRICT //TODO: remove - for (int i = top_row; i < nrow; i++) - assert (ROW (i).t); -#endif - free (old_buf); delete old_ta; delete old_ra; @@ -407,6 +407,8 @@ free (tabs); } + CLEAR_ALL_SELECTION (); + prev_nrow = nrow; prev_ncol = ncol; @@ -425,7 +427,7 @@ * Free everything. That way malloc debugging can find leakage. */ void -rxvt_term::scr_release () +rxvt_term::scr_release () NOTHROW { delete talloc; talloc = 0; delete ralloc; ralloc = 0; @@ -443,14 +445,14 @@ * Hard reset */ void -rxvt_term::scr_poweron () +rxvt_term::scr_poweron () NOTHROW { scr_release (); prev_nrow = prev_ncol = 0; scr_reset (); scr_clear (true); - scr_refresh (SLOW_REFRESH); + scr_refresh (); } /* ------------------------------------------------------------------------- * @@ -462,7 +464,7 @@ * XTERM_SEQ: Restore cursor: ESC 8 */ void -rxvt_term::scr_cursor (int mode) +rxvt_term::scr_cursor (cursor_mode mode) NOTHROW { screen_t *s; @@ -511,7 +513,7 @@ * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l */ int -rxvt_term::scr_change_screen (int scrn) +rxvt_term::scr_change_screen (int scrn) NOTHROW { want_refresh = 1; view_start = 0; @@ -552,7 +554,7 @@ // clear WrapNext indicator, solidifying position on next line void -rxvt_term::scr_do_wrap () +rxvt_term::scr_do_wrap () NOTHROW { if (!(screen.flags & Screen_WrapNext)) return; @@ -572,7 +574,7 @@ * Change the colour for following text */ void -rxvt_term::scr_color (unsigned int color, int fgbg) +rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW { if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) color = fgbg; @@ -588,7 +590,7 @@ * Change the rendition style for following text */ void -rxvt_term::scr_rendition (int set, int style) +rxvt_term::scr_rendition (int set, int style) NOTHROW { if (set) rstyle |= style; @@ -605,7 +607,7 @@ * count negative ==> scroll down */ int -rxvt_term::scr_scroll_text (int row1, int row2, int count) +rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW { if (count == 0 || (row1 > row2)) return 0; @@ -619,24 +621,22 @@ { top_row = max (top_row - count, -saveLines); - HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); - // scroll everything up 'count' lines term_start = (term_start + count) % total_rows; + // sever bottommost line { - // severe bottommost scrolled line line_t &l = ROW(row2 - count); - l.touch (); l.is_longer (0); + l.touch (); } - // erase newly scorlled-in lines - for (int i = count; i; --i ) + // erase newly scrolled-in lines + for (int i = count; i--; ) { // basically this is a slightly optimized scr_blank_screen_mem // it is worth the effort on slower machines - line_t &l = ROW(nrow - i); + line_t &l = ROW(nrow - 1 - i); scr_blank_line (l, 0, l.l, rstyle); @@ -677,6 +677,9 @@ && view_start != 0 && view_start != -saveLines) scr_page (UP, count); + + if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) + HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); } else { @@ -732,7 +735,7 @@ * Add text given in of length to screen struct */ void -rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) +rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW { if (len <= 0) /* sanity */ return; @@ -818,11 +821,11 @@ if (screen.flags & Screen_WrapNext) { - max_it (line->l, ncol); - line->is_longer (1); - scr_do_wrap (); + line->l = ncol; + line->is_longer (1); + row = screen.cur.row; line = &ROW(row); /* _must_ refresh */ } @@ -996,7 +999,7 @@ * XTERM_SEQ: CTRL-H */ void -rxvt_term::scr_backspace () +rxvt_term::scr_backspace () NOTHROW { want_refresh = 1; @@ -1024,7 +1027,7 @@ * XTERM_SEQ: CTRL-I */ void -rxvt_term::scr_tab (int count, bool ht) +rxvt_term::scr_tab (int count, bool ht) NOTHROW { int i, x; @@ -1101,7 +1104,7 @@ */ #if ENABLE_FRILLS void -rxvt_term::scr_backindex () +rxvt_term::scr_backindex () NOTHROW { if (screen.cur.col > 0) scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); @@ -1118,7 +1121,7 @@ */ #if ENABLE_FRILLS void -rxvt_term::scr_forwardindex () +rxvt_term::scr_forwardindex () NOTHROW { if (screen.cur.col < ncol - 1) scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); @@ -1141,7 +1144,7 @@ * Goto Row/Column */ void -rxvt_term::scr_gotorc (int row, int col, int relative) +rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW { want_refresh = 1; ZERO_SCROLLBACK (); @@ -1189,7 +1192,7 @@ * direction should be UP or DN */ void -rxvt_term::scr_index (enum page_dirn direction) +rxvt_term::scr_index (enum page_dirn direction) NOTHROW { int dirn; @@ -1218,7 +1221,7 @@ * XTERM_SEQ: Clear whole line : ESC [ 2 K */ void -rxvt_term::scr_erase_line (int mode) +rxvt_term::scr_erase_line (int mode) NOTHROW { unsigned int col, num; @@ -1272,7 +1275,7 @@ * XTERM_SEQ: Clear whole screen : ESC [ 2 J */ void -rxvt_term::scr_erase_screen (int mode) +rxvt_term::scr_erase_screen (int mode) NOTHROW { int num; int32_t row; @@ -1342,7 +1345,7 @@ #if ENABLE_FRILLS void -rxvt_term::scr_erase_savelines () +rxvt_term::scr_erase_savelines () NOTHROW { want_refresh = 1; ZERO_SCROLLBACK (); @@ -1357,7 +1360,7 @@ * XTERM_SEQ: Screen Alignment Test: ESC # 8 */ void -rxvt_term::scr_E () +rxvt_term::scr_E () NOTHROW { rend_t fs; @@ -1388,7 +1391,7 @@ * Insert/Delete lines */ void -rxvt_term::scr_insdel_lines (int count, int insdel) +rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW { int end; @@ -1418,7 +1421,7 @@ * Insert/Delete characters from the current position */ void -rxvt_term::scr_insdel_chars (int count, int insdel) +rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW { int col, row; rend_t tr; @@ -1516,7 +1519,7 @@ * XTERM_SEQ: Set region - inclusive: ESC [ ; r */ void -rxvt_term::scr_scroll_region (int top, int bot) +rxvt_term::scr_scroll_region (int top, int bot) NOTHROW { max_it (top, 0); min_it (bot, nrow - 1); @@ -1536,7 +1539,7 @@ * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l */ void -rxvt_term::scr_cursor_visible (int mode) +rxvt_term::scr_cursor_visible (int mode) NOTHROW { want_refresh = 1; @@ -1553,7 +1556,7 @@ * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l */ void -rxvt_term::scr_autowrap (int mode) +rxvt_term::scr_autowrap (int mode) NOTHROW { if (mode) screen.flags |= Screen_Autowrap; @@ -1572,7 +1575,7 @@ * XTERM_SEQ: Set Relative: ESC [ ? 6 l */ void -rxvt_term::scr_relative_origin (int mode) +rxvt_term::scr_relative_origin (int mode) NOTHROW { if (mode) screen.flags |= Screen_Relative; @@ -1589,7 +1592,7 @@ * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l */ void -rxvt_term::scr_insert_mode (int mode) +rxvt_term::scr_insert_mode (int mode) NOTHROW { if (mode) screen.flags |= Screen_Insert; @@ -1605,7 +1608,7 @@ * XTERM_SEQ: Clear all tabs : ESC [ 3 g */ void -rxvt_term::scr_set_tab (int mode) +rxvt_term::scr_set_tab (int mode) NOTHROW { if (mode < 0) memset (tabs, 0, ncol * sizeof (char)); @@ -1620,7 +1623,7 @@ * XTERM_SEQ: Normal video : ESC [ ? 5 l */ void -rxvt_term::scr_rvideo_mode (int mode) +rxvt_term::scr_rvideo_mode (int mode) NOTHROW { XGCValues gcvalue; @@ -1652,7 +1655,7 @@ * XTERM_SEQ: Report position: ESC [ 6 n */ void -rxvt_term::scr_report_position () +rxvt_term::scr_report_position () NOTHROW { tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); } @@ -1665,7 +1668,7 @@ * Set font style */ void -rxvt_term::set_font_style () +rxvt_term::set_font_style () NOTHROW { #if 0 switch (charsets [screen.charset]) @@ -1697,7 +1700,7 @@ * XTERM_SEQ: Invoke G3 character set: ESC O */ void -rxvt_term::scr_charset_choose (int set) +rxvt_term::scr_charset_choose (int set) NOTHROW { screen.charset = set; set_font_style (); @@ -1713,7 +1716,7 @@ * See set_font_style for possible values for */ void -rxvt_term::scr_charset_set (int set, unsigned int ch) +rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW { charsets[set] = (unsigned char)ch; set_font_style (); @@ -1728,7 +1731,7 @@ * refresh matching text. */ bool -rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) +rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW { bool found = false; @@ -1758,7 +1761,7 @@ }; void -rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) +rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW { int i; row_col_t rc[RC_COUNT]; @@ -1791,8 +1794,10 @@ for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); + num_scr_allow = 0; + if (refresh) - scr_refresh (SLOW_REFRESH); + scr_refresh (); } /* ------------------------------------------------------------------------- */ @@ -1800,7 +1805,7 @@ * Refresh the entire screen */ void -rxvt_term::scr_touch (bool refresh) +rxvt_term::scr_touch (bool refresh) NOTHROW { scr_expose (0, 0, width, height, refresh); } @@ -1811,11 +1816,9 @@ * the top of the screen */ void -rxvt_term::scr_move_to (int y, int len) +rxvt_term::scr_move_to (int y, int len) NOTHROW { - int p = (top_row - nrow) * (len - y) / len + (nrow - 1); - - scr_changeview (p); + scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); } /* ------------------------------------------------------------------------- */ @@ -1824,7 +1827,7 @@ * direction should be UP or DN */ bool -rxvt_term::scr_page (enum page_dirn direction, int nlines) +rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW { int new_view_start = direction == UP ? view_start - nlines @@ -1834,7 +1837,7 @@ } bool -rxvt_term::scr_changeview (int new_view_start) +rxvt_term::scr_changeview (int new_view_start) NOTHROW { clamp_it (new_view_start, top_row, 0); @@ -1843,15 +1846,16 @@ num_scr += new_view_start - view_start; view_start = new_view_start; - HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); want_refresh = 1; + HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); + return true; } /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_bell () +rxvt_term::scr_bell () NOTHROW { #ifndef NO_BELL @@ -1878,7 +1882,7 @@ /* ------------------------------------------------------------------------- */ /* ARGSUSED */ void -rxvt_term::scr_printscreen (int fullhist) +rxvt_term::scr_printscreen (int fullhist) NOTHROW { #ifdef PRINTPIPE int nrows, row_start; @@ -1937,7 +1941,7 @@ * screen.text/screen.rend contain what the screen will change to. */ void -rxvt_term::scr_refresh (unsigned char refresh_type) +rxvt_term::scr_refresh () NOTHROW { unsigned char must_clear, /* use draw_string not draw_image_string */ showcursor; /* show the cursor */ @@ -2071,7 +2075,6 @@ * D: CopyArea pass - very useful for slower links * This has been deliberately kept simple. */ - i = num_scr; if (!display->is_local && refresh_type == FAST_REFRESH && num_scr_allow && num_scr && abs (num_scr) < nrow && !must_clear) @@ -2079,6 +2082,7 @@ int16_t nits; int j; int len, wlen; + dLocal (int, num_scr); j = nrow; wlen = len = -1; @@ -2388,7 +2392,7 @@ } void -rxvt_term::scr_remap_chars (line_t &l) +rxvt_term::scr_remap_chars (line_t &l) NOTHROW { if (!l.t) return; @@ -2400,7 +2404,7 @@ } void -rxvt_term::scr_remap_chars () +rxvt_term::scr_remap_chars () NOTHROW { for (int i = total_rows; i--; ) scr_remap_chars (row_buf [i]); @@ -2413,7 +2417,7 @@ } void -rxvt_term::scr_recolour () +rxvt_term::scr_recolour () NOTHROW { if (1 #if TRANSPARENT @@ -2444,7 +2448,7 @@ /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_clear (bool really) +rxvt_term::scr_clear (bool really) NOTHROW { if (!mapped) return; @@ -2457,7 +2461,7 @@ } void -rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) +rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW { int view_end = view_start + nrow; int row, col; @@ -2479,7 +2483,7 @@ } void -rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) +rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW { int view_end = view_start + nrow; int row, col; @@ -2506,7 +2510,7 @@ /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_reverse_selection () +rxvt_term::scr_reverse_selection () NOTHROW { if (selection.op && current_screen == selection.screen @@ -2532,7 +2536,7 @@ */ #if 0 void -rxvt_term::scr_dump (int fd) +rxvt_term::scr_dump (int fd) NOTHROW { int row, wrote; unsigned int width, towrite; @@ -2561,7 +2565,7 @@ * CHARACTER SELECTION * * ------------------------------------------------------------------------- */ void -rxvt_term::selection_check (int check_more) +rxvt_term::selection_check (int check_more) NOTHROW { row_col_t pos; @@ -2592,7 +2596,7 @@ * Paste a selection direct to the command fd */ void -rxvt_term::paste (char *data, unsigned int len) +rxvt_term::paste (char *data, unsigned int len) NOTHROW { /* convert normal newline chars into common keyboard Return key sequence */ for (unsigned int i = 0; i < len; i++) @@ -2608,7 +2612,7 @@ * EXT: SelectionNotify */ void -rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) +rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW { if (prop == None) /* check for failed XConvertSelection */ { @@ -2770,7 +2774,7 @@ } void -rxvt_term::incr_cb (time_watcher &w) +rxvt_term::incr_cb (time_watcher &w) NOTHROW { selection_wait = Sel_none; @@ -2781,7 +2785,7 @@ } void -rxvt_term::selection_property (Window win, Atom prop) +rxvt_term::selection_property (Window win, Atom prop) NOTHROW { if (prop == None || selection_wait != Sel_incr) return; @@ -2800,12 +2804,9 @@ * EXT: button 2 release */ void -rxvt_term::selection_request (Time tm, int x, int y) +rxvt_term::selection_request (Time tm, int selnum) NOTHROW { - if (x < 0 || x >= width || y < 0 || y >= height) - return; /* outside window */ - - if (selection.text) + if (selection.text && selnum == Sel_Primary) { /* internal selection */ char *str = rxvt_wcstombs (selection.text, selection.len); paste (str, strlen (str)); @@ -2814,23 +2815,18 @@ } else { - int i; - selection_request_time = tm; selection_wait = Sel_normal; - for (i = Sel_Primary; i <= Sel_Clipboard; i++) - { #if X_HAVE_UTF8_STRING - selection_type = Sel_UTF8String; - if (selection_request_other (xa[XA_UTF8_STRING], i)) - return; + selection_type = Sel_UTF8String; + if (selection_request_other (xa[XA_UTF8_STRING], selnum)) + return; #else - selection_type = Sel_CompoundText; - if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) - return; + selection_type = Sel_CompoundText; + if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) + return; #endif - } } selection_wait = Sel_none; /* don't loop in selection_paste () */ @@ -2838,7 +2834,7 @@ } int -rxvt_term::selection_request_other (Atom target, int selnum) +rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW { Atom sel; @@ -2867,7 +2863,7 @@ * EXT: SelectionClear */ void -rxvt_term::selection_clear () +rxvt_term::selection_clear () NOTHROW { want_refresh = 1; free (selection.text); @@ -3012,7 +3008,7 @@ } bool -rxvt_term::selection_grab (Time tm) +rxvt_term::selection_grab (Time tm) NOTHROW { selection_time = tm; @@ -3045,7 +3041,7 @@ * EXT: button 1 press */ void -rxvt_term::selection_click (int clicks, int x, int y) +rxvt_term::selection_click (int clicks, int x, int y) NOTHROW { clicks = ((clicks - 1) % 3) + 1; selection.clicks = clicks; /* save clicks so extend will work */ @@ -3074,7 +3070,7 @@ * Mark a selection at the specified col/row */ void -rxvt_term::selection_start_colrow (int col, int row) +rxvt_term::selection_start_colrow (int col, int row) NOTHROW { want_refresh = 1; @@ -3110,7 +3106,7 @@ #define DELIMIT_REND(x) 1 void -rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) +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; row_col_t bound; @@ -3194,7 +3190,7 @@ * flag == 2 ==> button 3 motion */ void -rxvt_term::selection_extend (int x, int y, int flag) +rxvt_term::selection_extend (int x, int y, int flag) NOTHROW { int col = clamp (Pixel2Col (x), 0, ncol); int row = clamp (Pixel2Row (y), 0, nrow - 1); @@ -3230,7 +3226,7 @@ * Extend the selection to the specified col/row */ void -rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) +rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW { row_col_t pos; enum { @@ -3426,7 +3422,7 @@ #if ENABLE_FRILLS void -rxvt_term::selection_remove_trailing_spaces () +rxvt_term::selection_remove_trailing_spaces () NOTHROW { int32_t end_col, end_row; text_t *stp; @@ -3474,7 +3470,7 @@ * EXT: button 3 double click */ void -rxvt_term::selection_rotate (int x, int y) +rxvt_term::selection_rotate (int x, int y) NOTHROW { selection.clicks = selection.clicks % 3 + 1; selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); @@ -3486,7 +3482,7 @@ * EXT: SelectionRequest */ void -rxvt_term::selection_send (const XSelectionRequestEvent &rq) +rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW { XSelectionEvent ev; dDisp; @@ -3624,7 +3620,7 @@ * return col/row values corresponding to x/y pixel values */ void -rxvt_term::pixel_position (int *x, int *y) +rxvt_term::pixel_position (int *x, int *y) NOTHROW { *x = Pixel2Col (*x); /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ @@ -3635,7 +3631,7 @@ /* ------------------------------------------------------------------------- */ #ifdef USE_XIM void -rxvt_term::im_set_position (XPoint &pos) +rxvt_term::im_set_position (XPoint &pos) NOTHROW { XWindowAttributes xwa; @@ -3648,7 +3644,7 @@ #if ENABLE_OVERLAY void -rxvt_term::scr_overlay_new (int x, int y, int w, int h) +rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW { if (nrow < 1 || ncol < 1) return; @@ -3703,7 +3699,7 @@ } void -rxvt_term::scr_overlay_off () +rxvt_term::scr_overlay_off () NOTHROW { if (!ov_text) return; @@ -3721,7 +3717,7 @@ } void -rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) +rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW { if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) return; @@ -3733,14 +3729,14 @@ } void -rxvt_term::scr_overlay_set (int x, int y, const char *s) +rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW { while (*s) scr_overlay_set (x++, y, *s++); } void -rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) +rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW { while (*s) { @@ -3756,7 +3752,7 @@ } void -rxvt_term::scr_swap_overlay () +rxvt_term::scr_swap_overlay () NOTHROW { if (!ov_text) return;