--- rxvt-unicode/src/screen.C 2005/12/21 14:25:41 1.185 +++ rxvt-unicode/src/screen.C 2006/01/25 13:24:45 1.250 @@ -3,7 +3,7 @@ *---------------------------------------------------------------------------* * * Copyright (c) 1997-2001 Geoff Wing - * Copyright (c) 2003-2004 Marc Lehmann + * Copyright (c) 2003-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "rxvtperl.h" /* NECESSARY */ #include /* get the typedef for CARD32 */ @@ -48,7 +49,7 @@ * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * * ------------------------------------------------------------------------- */ #define ZERO_SCROLLBACK() \ - if (options & Opt_scrollTtyOutput) \ + if (OPTION (Opt_scrollTtyOutput)) \ view_start = 0 #define CLEAR_SELECTION() \ selection.beg.row = selection.beg.col \ @@ -116,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) { @@ -125,6 +126,8 @@ width = ncol; } + l.touch (); + efs &= ~RS_baseattrMask; efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); @@ -141,20 +144,21 @@ /* ------------------------------------------------------------------------- */ /* 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); + + l.l = 0; + l.f = 0; } /* ------------------------------------------------------------------------- * * SCREEN INITIALISATION * * ------------------------------------------------------------------------- */ + void rxvt_term::scr_reset () { - unsigned int p, q; - int k; - #if ENABLE_OVERLAY scr_overlay_off (); #endif @@ -171,12 +175,16 @@ if (ncol == prev_ncol && nrow == prev_nrow) return; + if (current_screen != PRIMARY) + scr_swap_screen (); + // we need at least two lines for wrapping to work correctly - if (nrow + saveLines < 2) + while (nrow + saveLines < 2) { + //TODO//FIXME saveLines++; prev_nrow--; - nsaved++; + top_row--; } want_refresh = 1; @@ -187,28 +195,26 @@ screen.tscroll = 0; screen.bscroll = nrow - 1; - if (!save) + if (!row_buf) { /* * first time called so just malloc everything: don't rely on realloc - * Note: this is still needed so that all the scrollback lines are NULL */ - nsaved = 0; /* no saved lines */ + top_row = 0; term_start = 0; talloc = new rxvt_salloc (ncol * sizeof (text_t)); ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); - buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); - drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); - swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); - - for (p = nrow; p--; ) - { - scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); - scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); - scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); + row_buf = (line_t *)rxvt_calloc (total_rows + nrow, 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)); @@ -233,8 +239,7 @@ selection.op = SELECTION_CLEAR; selection.screen = PRIMARY; selection.clicks = 0; - CLEAR_ALL_SELECTION (); - rvideo = 0; + rvideo_state = rvideo_mode = false; } else { @@ -242,204 +247,179 @@ * add or delete rows as appropriate */ - rxvt_salloc *old_ta; - rxvt_salloc *old_ra; + 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) { - /* delete rows */ - k = min (nsaved, prev_nrow - nrow); - // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO - scr_scroll_text (0, (int)prev_nrow - 1, k); - - for (p = nrow; p < prev_nrow; p++) + for (int row = nrow; row < prev_nrow; row++) { - lfree (ROW(p)); - lfree (swap_save[p]); - lfree (drawn[p]); + lfree (swap_buf [row]); + lfree (drawn_buf[row]); } - - /* we have fewer rows so fix up cursor position */ - min_it (screen.cur.row, (int32_t)nrow - 1); - - scr_reset_realloc (); /* realloc _last_ */ } - else if (nrow > prev_nrow) - { - /* add rows */ - scr_reset_realloc (); /* realloc _first_ */ - - int ocol = ncol; - ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this - - k = min (nsaved, nrow - prev_nrow); - - for (p = prev_total_rows; p < total_rows; p++) - save[p].clear (); - - for (p = prev_total_rows; p < total_rows - k; p++) - scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); - - for (p = prev_nrow; p < nrow; p++) - { - swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); - drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); - } +#endif - if (k > 0) - { - scr_scroll_text (0, (int)nrow - 1, -k); - screen.cur.row += k; - screen.s_cur.row += k; - nsaved -= k; - } + drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); + swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); -#ifdef DEBUG_STRICT - assert (screen.cur.row < nrow); -#else /* drive with your eyes closed */ - min_it (screen.cur.row, nrow - 1); -#endif - ncol = ocol; // save b/c scr_blank_screen_mem uses this + for (int row = min (nrow, prev_nrow); row--; ) + { + lresize (drawn_buf[row]); + lresize (swap_buf [row]); } - /* resize columns */ - if (ncol != prev_ncol) + for (int row = prev_nrow; row < nrow; row++) { - old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); - old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - - for (p = total_rows; p--; ) - lresize (save[p]); - - for (p = nrow; p--; ) - { - lresize (drawn[p]); - lresize (swap_save[p]); - } - - min_it (screen.cur.col, (int16_t)ncol - 1); - - delete old_ta; - delete old_ra; + 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); } -#if 0 - // re-wrap lines, this is rather ugly, possibly because I am too dumb - // to come up with a lean and mean algorithm. - rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); - rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); - - text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); - rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); - tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t)); - - for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D - - p = prev_total_rows; - q = total_rows; + line_t *old_buf = row_buf; + row_buf = (line_t *)rxvt_calloc (total_rows + nrow, 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 - while (p > 0 && q > 0) + if (top_row) { - --p; + // Re-wrap lines. This is rather ugly, possibly because I am too dumb + // to come up with a lean and mean algorithm. - printf ("pq %d:%d\n", p, q); - if (save[p].t) - { - int llen = save[p].l; + row_col_t ocur = screen.cur; + ocur.row = MOD (term_start + ocur.row, prev_total_rows); - assert (llen >= 0); + do + { + p = MOD (p - 1, prev_total_rows); +#ifdef DEBUG_STRICT + assert (old_buf [MOD (p, prev_total_rows)].t); +#endif + int plines = 1; + int llen = old_buf [MOD (p, prev_total_rows)].l; - while (p && save[p - 1].l < 0) + while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) { - --p; + p = MOD (p - 1, prev_total_rows); + + plines++; llen += prev_ncol; } - int qlines = llen / ncol + 1; - int lofs = 0; + int qlines = max (0, (llen - 1) / ncol) + 1; + + // drop partial lines completely + if (q < qlines) + break; q -= qlines; - int qrow = q; + int lofs = 0; + line_t *qline; - printf ("QL %d llen %d\n", qlines, llen);//D - for (; qlines--; qrow++) + // re-assemble the full line by destination lines + for (int qrow = q; qlines--; qrow++) { - if (qrow >= 0) + qline = row_buf + qrow; + lalloc (*qline); + qline->l = ncol; + qline->is_longer (1); + + 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) { - tp [qrow] = (text_t *)ta->alloc (); - rp [qrow] = (rend_t *)ra->alloc (); - tl [qrow] = LINE_CONT1; - - int qcol = 0; + int prow = lofs / prev_ncol; + int pcol = lofs % prev_ncol; - for (;;) - { - int prow = lofs / prev_ncol + p; - int pcol = lofs % prev_ncol; + prow = MOD (p + prow, prev_total_rows); - int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); + // we only adjust the cursor _row_ and put it into + // the topmost line of "long line" it was in, as + // this seems to upset applications/shells/readline + // least. + if (prow == ocur.row) + screen.cur.row = q - (total_rows - nrow); - printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); + line_t &pline = old_buf [prow]; - if (len <= 0) - { - tl [qrow] = qcol; + int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); - TODO - scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, - ncol - qcol, DEFAULT_RSTYLE); + memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); + memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); - break; - } - - assert (lofs < 1000); + lofs += len; + qcol += len; + } + } - memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); - memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); + qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; + qline->is_longer (0); + scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); + } + while (p != pend && q > 0); + + term_start = total_rows - nrow; + top_row = q - term_start; + + // make sure all terminal lines exist + while (top_row > 0) + scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); + } + else + { + // if no scrollback exists (yet), wing, instead of wrap + + 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]; - lofs += len; - qcol += len; + qline = pline; + lresize (qline); + } - if (qcol == ncol) - break; - } - } - else - lofs += ncol; - } + for (int row = prev_nrow; row < nrow; row++) + { + row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); } + + term_start = 0; } - free (screen.text); screen.text = tp; - free (screen.rend); screen.rend = rp; - free (screen.tlen); screen.tlen = tl; + free (old_buf); + delete old_ta; + delete old_ra; - for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D -#endif + clamp_it (screen.cur.row, 0, nrow - 1); + clamp_it (screen.cur.col, 0, ncol - 1); - if (tabs) - free (tabs); + free (tabs); } + CLEAR_ALL_SELECTION (); + prev_nrow = nrow; prev_ncol = ncol; tabs = (char *)rxvt_malloc (ncol * sizeof (char)); - for (p = 0; p < ncol; p++) - tabs[p] = (p % TABSIZE == 0) ? 1 : 0; + for (int col = ncol; col--; ) + tabs [col] = col % TABSIZE == 0; + + if (current_screen != PRIMARY) + scr_swap_screen (); tt_winch (); -} -void -rxvt_term::scr_reset_realloc () -{ - swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); - drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); - buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t)); - save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); + HOOK_INVOKE ((this, HOOK_RESET, DT_END)); } /* ------------------------------------------------------------------------- */ @@ -447,16 +427,20 @@ * 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; + if (row_buf) + { + delete talloc; talloc = 0; + delete ralloc; ralloc = 0; - free (save); - free (swap_save); - free (drawn); - free (buf); - free (tabs); + free (row_buf); + free (swap_buf); + free (drawn_buf); + free (tabs); + + row_buf = 0; // signal that we freed all the arrays + } } /* ------------------------------------------------------------------------- */ @@ -471,7 +455,7 @@ scr_reset (); scr_clear (true); - scr_refresh (SLOW_REFRESH); + scr_refresh (); } /* ------------------------------------------------------------------------- * @@ -483,7 +467,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; @@ -522,61 +506,64 @@ #ifdef DEBUG_STRICT assert (s->cur.row >= 0); assert (s->cur.col >= 0); -#else /* drive with your eyes closed */ - max_it (s->cur.row, 0); - max_it (s->cur.col, 0); #endif } +void +rxvt_term::scr_swap_screen () +{ + if (!OPTION (Opt_secondaryScreen)) + return; + + for (int i = prev_nrow; i--; ) + ::swap (ROW(i), swap_buf [i]); + + ::swap (screen.cur, swap.cur); + + screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); + screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); +} + /* ------------------------------------------------------------------------- */ /* * Swap between primary and secondary screens * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l */ -int +void rxvt_term::scr_change_screen (int scrn) { + if (scrn == current_screen) + return; + want_refresh = 1; view_start = 0; - if (current_screen == scrn) - return scrn; - selection_check (2); /* check for boundary cross */ int i = current_screen; current_screen = scrn; scrn = i; - ::swap (screen.cur.row, swap.cur.row); - ::swap (screen.cur.col, swap.cur.col); - - screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); - screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); - #if NSCREENS - if (options & Opt_secondaryScreen) + if (OPTION (Opt_secondaryScreen)) { num_scr = 0; - for (int i = nrow; i--; ) - ::swap (ROW(i), swap_save[i]); + scr_swap_screen (); ::swap (screen.charset, swap.charset); - ::swap (screen.flags, swap.flags); + ::swap (screen.flags, swap.flags); screen.flags |= Screen_VisibleCursor; - swap.flags |= Screen_VisibleCursor; + swap.flags |= Screen_VisibleCursor; } else #endif - if (options & Opt_secondaryScroll) + if (OPTION (Opt_secondaryScroll)) scr_scroll_text (0, prev_nrow - 1, prev_nrow); - - return scrn; } // 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; @@ -596,9 +583,9 @@ * 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 (color > maxTermCOLOR) + if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) color = fgbg; if (fgbg == Color_fg) @@ -612,7 +599,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; @@ -629,7 +616,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; @@ -639,47 +626,85 @@ if (count > 0 && row1 == 0 - && row2 == nrow - 1 - && (current_screen == PRIMARY || options & Opt_secondaryScroll)) + && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) { - nsaved = min (nsaved + count, saveLines); + top_row = max (top_row - count, -saveLines); + + // scroll everything up 'count' lines term_start = (term_start + count) % total_rows; + // sever bottommost line + { + line_t &l = ROW(row2 - count); + l.is_longer (0); + l.touch (); + } + + // 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 - 1 - i); + + scr_blank_line (l, 0, l.l, rstyle); + + l.l = 0; + l.f = 0; + } + + // now copy lines below the scroll region bottom to the + // bottom of the screen again, so they look as if they + // hadn't moved. + for (int i = nrow; --i > row2; ) + { + line_t &l1 = ROW(i - count); + line_t &l2 = ROW(i); + + ::swap (l1, l2); + l2.touch (); + } + + // move and/or clear selection, if any if (selection.op && current_screen == selection.screen) { selection.beg.row -= count; selection.end.row -= count; selection.mark.row -= count; - selection_check (0); + if (selection.beg.row < top_row + || selection.end.row < top_row + || selection.mark.row < top_row) + { + CLEAR_ALL_SELECTION (); + selection.op = SELECTION_CLEAR; + } } - for (int i = count; i--; ) - scr_blank_screen_mem (ROW(row2 - i), rstyle); - - if ((options & Opt_scrollWithBuffer) + // finally move the view window, if desired + if (OPTION (Opt_scrollWithBuffer) && view_start != 0 - && view_start != saveLines) + && 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 { if (selection.op && current_screen == selection.screen) { - int i = selection.beg.row; - int j = selection.end.row; - - if ((i < row1 && j > row1) - || (i < row2 && j > row2) - || (i - count < row1 && i >= row1) - || (i - count > row2 && i <= row2) - || (j - count < row1 && j >= row1) - || (j - count > row2 && j <= row2)) + if ((selection.beg.row < row1 && selection.end.row > row1) + || (selection.beg.row < row2 && selection.end.row > row2) + || (selection.beg.row - count < row1 && selection.beg.row >= row1) + || (selection.beg.row - count > row2 && selection.beg.row <= row2) + || (selection.end.row - count < row1 && selection.end.row >= row1) + || (selection.end.row - count > row2 && selection.end.row <= row2)) { CLEAR_ALL_SELECTION (); - selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ + selection.op = SELECTION_CLEAR; } - else if (j >= row1 && j <= row2) + else if (selection.end.row >= row1 && selection.end.row <= row2) { /* move selected region too */ selection.beg.row -= count; @@ -695,16 +720,20 @@ int rows = row2 - row1 + 1; + min_it (count, rows); + + line_t *temp_buf = row_buf + total_rows; + for (int row = 0; row < rows; row++) { - buf [row] = ROW(row1 + (row + count + rows) % rows); + temp_buf [row] = ROW(row1 + (row + count + rows) % rows); if (!IN_RANGE_EXC (row + count, 0, rows)) - scr_blank_screen_mem (buf [row], rstyle); + scr_blank_screen_mem (temp_buf [row], rstyle); } for (int row = 0; row < rows; row++) - ROW(row1 + row) = buf [row]; + ROW(row1 + row) = temp_buf [row]; } return count; @@ -715,43 +744,40 @@ * Add text given in of length to screen struct */ void -rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) +rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW { if (len <= 0) /* sanity */ return; unsigned char checksel; unicode_t c; - int row, last_col; - const unicode_t *strend = str + len; + int ncol = this->ncol; + const wchar_t *strend = str + len; want_refresh = 1; ZERO_SCROLLBACK (); - last_col = ncol; - if (nlines > 0) + if (minlines > 0) { - nlines += screen.cur.row - screen.bscroll; - if ((nlines > 0) - && (screen.tscroll == 0) - && (screen.bscroll == (nrow - 1))) + minlines += screen.cur.row - screen.bscroll; + min_it (minlines, screen.cur.row - top_row); + + if (minlines > 0 + && screen.tscroll == 0 + && screen.bscroll == nrow - 1) { /* _at least_ this many lines need to be scrolled */ - scr_scroll_text (screen.tscroll, screen.bscroll, nlines); - screen.cur.row -= nlines; + scr_scroll_text (screen.tscroll, screen.bscroll, minlines); + screen.cur.row -= minlines; } } #ifdef DEBUG_STRICT - assert (screen.cur.col < last_col); - assert ((screen.cur.row < nrow) - && (screen.cur.row >= - (int32_t)nsaved)); -#else /* drive with your eyes closed */ - min_it (screen.cur.col, last_col - 1); - min_it (screen.cur.row, (int32_t)nrow - 1); - max_it (screen.cur.row, - (int32_t)nsaved); + assert (screen.cur.col < ncol); + assert (screen.cur.row < nrow + && screen.cur.row >= top_row); #endif - row = screen.cur.row; + int row = screen.cur.row; checksel = selection.op && current_screen == selection.screen ? 1 : 0; @@ -759,13 +785,12 @@ while (str < strend) { - c = *str++; + c = (unicode_t)*str++; // convert to rxvt-unicodes representation if (c < 0x20) if (c == C0_LF) - { - if (!line->is_longer ()) /* XXX: think about this */ - max_it (line->l, screen.cur.col); + { + max_it (line->l, screen.cur.col); screen.flags &= ~Screen_WrapNext; @@ -779,8 +804,7 @@ } else if (c == C0_CR) { - if (!line->is_longer ()) /* XXX: think about this */ - max_it (line->l, screen.cur.col); + max_it (line->l, screen.cur.col); screen.flags &= ~Screen_WrapNext; screen.cur.col = 0; @@ -807,10 +831,11 @@ if (screen.flags & Screen_WrapNext) { - line->set_is_longer (); - scr_do_wrap (); + line->l = ncol; + line->is_longer (1); + row = screen.cur.row; line = &ROW(row); /* _must_ refresh */ } @@ -819,13 +844,13 @@ if (IN_RANGE_INC (c, 0xd800, 0xdfff)) c = 0xfffd; - // rely on wcwidth to tell us the character width, at least for non-latin1 - // do wcwidth before further replacements, as wcwidth might return -1 - // for the line drawing characters below as they might be invalid in the current + // rely on wcwidth to tell us the character width, do wcwidth before + // further replacements, as wcwidth might return -1 for the line + // drawing characters below as they might be invalid in the current // locale. - int width = c < 0x100 ? 1 : wcwidth (c); + int width = WCWIDTH (c); - if (charsets[screen.charset] == '0') // DEC SPECIAL + if (charsets [screen.charset] == '0') // DEC SPECIAL { // vt100 special graphics and line drawing // 5f-7e standard vt100 @@ -887,7 +912,7 @@ rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); // if the character doesn't fit into the remaining columns... - if (screen.cur.col > last_col - width && last_col >= width) + if (screen.cur.col > ncol - width && ncol >= width) { // ...output spaces c = ' '; @@ -895,16 +920,18 @@ --str; } + line->touch (); + do { line->t[screen.cur.col] = c; line->r[screen.cur.col] = rend; - if (screen.cur.col < last_col - 1) + if (screen.cur.col < ncol - 1) screen.cur.col++; else { - line->l = last_col; + line->l = ncol; if (screen.flags & Screen_Autowrap) screen.flags |= Screen_WrapNext; break; @@ -916,11 +943,15 @@ // pad with spaces when overwriting wide character with smaller one if (!width) - for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) - { - line->t[c] = ' '; - line->r[c] = rend; - } + { + line->touch (); + + for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) + { + line->t[c] = ' '; + line->r[c] = rend; + } + } } else // width == 0 { @@ -929,31 +960,31 @@ // we just tag the accent on the previous on-screen character. // this is arguably not correct, but also arguably not wrong. // we don't handle double-width characters nicely yet. + line_t *linep; text_t *tp; rend_t *rp; if (screen.cur.col > 0) { + linep = line; tp = line->t + screen.cur.col - 1; rp = line->r + screen.cur.col - 1; - - while (*tp == NOCHAR && tp > line->t) - tp--, rp--; } else if (screen.cur.row > 0 && ROW(screen.cur.row - 1).is_longer ()) { - line_t *line = &ROW(screen.cur.row - 1); - - tp = line->t + last_col - 1; - rp = line->r + last_col - 1; - - while (*tp == NOCHAR && tp > line->t) - tp--, rp--; + linep = &ROW(screen.cur.row - 1); + tp = line->t + ncol - 1; + rp = line->r + ncol - 1; } else continue; + linep->touch (); + + while (*tp == NOCHAR && tp > linep->t) + tp--, rp--; + // first try to find a precomposed character unicode_t n = rxvt_compose (*tp, c); if (n == NOCHAR) @@ -965,13 +996,10 @@ } } - if (!line->is_longer ()) /* XXX: think about this */ - max_it (line->l, screen.cur.col); + max_it (line->l, screen.cur.col); #ifdef DEBUG_STRICT assert (screen.cur.row >= 0); -#else /* drive with your eyes closed */ - max_it (screen.cur.row, 0); #endif } @@ -981,7 +1009,7 @@ * XTERM_SEQ: CTRL-H */ void -rxvt_term::scr_backspace () +rxvt_term::scr_backspace () NOTHROW { want_refresh = 1; @@ -1009,7 +1037,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; @@ -1020,9 +1048,7 @@ return; else if (count > 0) { - int row = screen.cur.row; - - line_t &l = ROW(row); + line_t &l = ROW(screen.cur.row); rend_t base_rend = l.r[i]; ht &= l.t[i] == ' '; @@ -1030,6 +1056,7 @@ if (tabs[i]) { x = i; + if (!--count) break; } @@ -1042,12 +1069,11 @@ // store horizontal tab commands as characters inside the text // buffer so they can be selected and pasted. - if (ht && options & Opt_pastableTabs) + if (ht && OPTION (Opt_pastableTabs)) { base_rend = SET_FONT (base_rend, 0); - if (!l.is_longer ()) /* XXX: think about this */ - max_it (l.l, x); + l.touch (x); i = screen.cur.col; @@ -1088,7 +1114,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); @@ -1105,18 +1131,16 @@ */ #if ENABLE_FRILLS void -rxvt_term::scr_forwardindex () +rxvt_term::scr_forwardindex () NOTHROW { - int row; - if (screen.cur.col < ncol - 1) scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); else { - row = screen.cur.row; + line_t &l = ROW(screen.cur.row); - if (ROW(row).is_longer ()) //TODO//FIXME//LEN - ROW(row).l = ncol; + l.touch (); + l.is_longer (0); scr_gotorc (0, 0, R_RELATIVE); scr_insdel_chars (1, DELETE); @@ -1130,14 +1154,13 @@ * 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 (); screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; - max_it (screen.cur.col, 0); - min_it (screen.cur.col, (int32_t)ncol - 1); + clamp_it (screen.cur.col, 0, ncol - 1); screen.flags &= ~Screen_WrapNext; @@ -1171,8 +1194,7 @@ screen.cur.row = row; } - max_it (screen.cur.row, 0); - min_it (screen.cur.row, (int32_t)nrow - 1); + clamp_it (screen.cur.row, 0, nrow - 1); } /* ------------------------------------------------------------------------- */ @@ -1180,7 +1202,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; @@ -1197,8 +1219,7 @@ else screen.cur.row += dirn; - max_it (screen.cur.row, 0); - min_it (screen.cur.row, (int32_t)nrow - 1); + clamp_it (screen.cur.row, 0, nrow - 1); selection_check (0); } @@ -1210,23 +1231,26 @@ * 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 row, col, num; + unsigned int col, num; want_refresh = 1; ZERO_SCROLLBACK (); selection_check (1); - row = screen.cur.row; + line_t &line = ROW(screen.cur.row); + + line.touch (); + line.is_longer (0); switch (mode) { case 0: /* erase to end of line */ col = screen.cur.col; num = ncol - col; - min_it (ROW(row).l, (int16_t)col); + min_it (line.l, col); if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) CLEAR_SELECTION (); @@ -1241,7 +1265,7 @@ case 2: /* erase whole line */ col = 0; num = ncol; - ROW(row).l = 0; + line.l = 0; if (selection.beg.row <= screen.cur.row && selection.end.row >= screen.cur.row) CLEAR_SELECTION (); @@ -1250,7 +1274,7 @@ return; } - scr_blank_line (ROW(row), col, num, rstyle); + scr_blank_line (line, col, num, rstyle); } /* ------------------------------------------------------------------------- */ @@ -1261,7 +1285,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; @@ -1303,7 +1327,7 @@ if (row >= nrow) /* Out Of Bounds */ return; - min_it (num, (nrow - row)); + min_it (num, nrow - row); if (rstyle & (RS_RVid | RS_Uline)) ren = (rend_t) ~RS_None; @@ -1315,7 +1339,7 @@ else { ren = rstyle & (RS_fgMask | RS_bgMask); - gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; + gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; XChangeGC (display->display, gc, GCForeground, &gcvalue); ERASE_ROWS (row, num); gcvalue.foreground = pix_colors[Color_fg]; @@ -1324,20 +1348,19 @@ for (; num--; row++) { - scr_blank_screen_mem (ROW (row), rstyle); - ROW (row).l = 0; - scr_blank_line (drawn[row], 0, ncol, ren); + scr_blank_screen_mem (ROW(row), rstyle); + scr_blank_line (drawn_buf [row], 0, ncol, ren); } } #if ENABLE_FRILLS void -rxvt_term::scr_erase_savelines () +rxvt_term::scr_erase_savelines () NOTHROW { want_refresh = 1; ZERO_SCROLLBACK (); - nsaved = 0; + top_row = 0; } #endif @@ -1347,7 +1370,7 @@ * XTERM_SEQ: Screen Alignment Test: ESC # 8 */ void -rxvt_term::scr_E () +rxvt_term::scr_E () NOTHROW { rend_t fs; @@ -1368,7 +1391,8 @@ for (int j = ncol; j--; ) *r1++ = fs; - line.l = ncol; /* make the `E's selectable */ + line.is_longer (0); + line.touch (ncol); } } @@ -1377,7 +1401,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; @@ -1407,7 +1431,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; @@ -1421,12 +1445,15 @@ scr_do_wrap (); selection_check (1); - min_it (count, (ncol - screen.cur.col)); + min_it (count, ncol - screen.cur.col); row = screen.cur.row; line_t *line = &ROW(row); + line->touch (); + line->is_longer (0); + switch (insdel) { case INSERT: @@ -1436,11 +1463,7 @@ line->r[col] = line->r[col - count]; } - if (!line->is_longer ()) - { - line->l += count; - min_it (line->l, ncol); - } + line->l = min (line->l + count, ncol); if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) @@ -1463,6 +1486,8 @@ screen.cur.col += count; /* don't worry if > ncol */ selection_check (1); screen.cur.col -= count; + + line->l = max (line->l - count, 0); scr_blank_line (*line, screen.cur.col, count, rstyle); break; @@ -1475,12 +1500,8 @@ line->r[col] = line->r[col + count]; } - scr_blank_line (*line, ncol - count, count, tr); - - if (line->is_longer ()) /* break line continuation */ - line->l = ncol; - line->l = max (line->l - count, 0); + scr_blank_line (*line, ncol - count, count, tr); if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) @@ -1508,10 +1529,10 @@ * 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, (int)nrow - 1); + min_it (bot, nrow - 1); if (top > bot) return; @@ -1528,7 +1549,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; @@ -1545,7 +1566,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; @@ -1564,7 +1585,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; @@ -1581,7 +1602,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; @@ -1597,12 +1618,12 @@ * 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)); else if (screen.cur.col < ncol) - tabs[screen.cur.col] = (mode ? 1 : 0); + tabs [screen.cur.col] = !!mode; } /* ------------------------------------------------------------------------- */ @@ -1612,27 +1633,32 @@ * XTERM_SEQ: Normal video : ESC [ ? 5 l */ void -rxvt_term::scr_rvideo_mode (int mode) +rxvt_term::scr_rvideo_mode (bool on) NOTHROW { - XGCValues gcvalue; + rvideo_mode = on; + +#ifndef NO_BELL + on ^= rvideo_bell; +#endif - if (rvideo != mode) + if (rvideo_state != on) { - rvideo = mode; + rvideo_state = on; + ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); #if XPM_BACKGROUND if (bgPixmap.pixmap == None) #endif #if TRANSPARENT - if (! (options & Opt_transparent) || am_transparent == 0) + if (!OPTION (Opt_transparent) || am_transparent == 0) #endif - XSetWindowBackground (display->display, vt, - pix_colors[Color_bg]); + XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); + XGCValues gcvalue; gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; - XChangeGC (display->display, gc, GCBackground | GCForeground, - &gcvalue); + XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); + scr_clear (); scr_touch (true); } @@ -1644,7 +1670,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); } @@ -1657,9 +1683,10 @@ * Set font style */ void -rxvt_term::set_font_style () +rxvt_term::set_font_style () NOTHROW { - switch (charsets[screen.charset]) +#if 0 + switch (charsets [screen.charset]) { case '0': /* DEC Special Character & Line Drawing Set */ break; @@ -1676,6 +1703,7 @@ case 'K': /* German character set */ break; } +#endif } /* ------------------------------------------------------------------------- */ @@ -1687,7 +1715,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 (); @@ -1703,7 +1731,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 (); @@ -1718,14 +1746,14 @@ * 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; for (int i = 0; i < nrow; i++) { int col = 0; - rend_t *drp = drawn[i].r; + rend_t *drp = drawn_buf[i].r; for (; col < ncol; col++, drp++) if ((*drp & mask) == value) @@ -1748,12 +1776,12 @@ }; 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]; - if (!drawn) /* sanity check */ + if (!drawn_buf) /* sanity check */ return; #ifndef NO_SLOW_LINK_SUPPORT @@ -1764,14 +1792,6 @@ } #endif -#ifdef DEBUG_STRICT -#if 0 - // that's not debugging //TODO //FIXME - clamp_it (x, 0, width); - clamp_it (y, 0, height); -#endif -#endif - /* round down */ rc[PART_BEG].col = Pixel2Col (x); rc[PART_BEG].row = Pixel2Row (y); @@ -1787,10 +1807,12 @@ } for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) - fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); + 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 (); } /* ------------------------------------------------------------------------- */ @@ -1798,7 +1820,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); } @@ -1808,24 +1830,10 @@ * Move the display so that the line represented by scrollbar value Y is at * the top of the screen */ -int -rxvt_term::scr_move_to (int y, int len) +void +rxvt_term::scr_move_to (int y, int len) NOTHROW { - long p = 0; - unsigned int oldviewstart; - - oldviewstart = view_start; - - if (y < len) - { - p = (nrow + nsaved) * (len - y) / len; - p -= (long) (nrow - 1); - p = max (p, 0); - } - - view_start = (unsigned int)min (p, nsaved); - - return scr_changeview (oldviewstart); + scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); } /* ------------------------------------------------------------------------- */ @@ -1833,58 +1841,62 @@ * Page the screen up/down nlines * direction should be UP or DN */ -int -rxvt_term::scr_page (enum page_dirn direction, int nlines) +bool +rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW { - int n; - unsigned int oldviewstart; + int new_view_start = + direction == UP ? view_start - nlines + : view_start + nlines; - oldviewstart = view_start; + return scr_changeview (new_view_start); +} - if (direction == UP) - { - n = view_start + nlines; - view_start = min (n, nsaved); - } - else - { - n = view_start - nlines; - view_start = max (n, 0); - } +bool +rxvt_term::scr_changeview (int new_view_start) NOTHROW +{ + clamp_it (new_view_start, top_row, 0); - return scr_changeview (oldviewstart); + if (new_view_start == view_start) + return false; + + num_scr += new_view_start - view_start; + view_start = new_view_start; + want_refresh = 1; + + HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); + + return true; } -int -rxvt_term::scr_changeview (unsigned int oldviewstart) +#ifndef NO_BELL +void +rxvt_term::bell_cb (time_watcher &w) { - if (view_start != oldviewstart) - { - want_refresh = 1; - num_scr -= (view_start - oldviewstart); - } - - return (int) (view_start - oldviewstart); + rvideo_bell = false; + scr_rvideo_mode (rvideo_mode); } +#endif /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_bell () +rxvt_term::scr_bell () NOTHROW { #ifndef NO_BELL # ifndef NO_MAPALERT # ifdef MAPALERT_OPTION - if (options & Opt_mapAlert) + if (OPTION (Opt_mapAlert)) # endif XMapWindow (display->display, parent[0]); # endif - if (options & Opt_visualBell) + if (OPTION (Opt_visualBell)) { - scr_rvideo_mode (!rvideo); /* refresh also done */ - rxvt_usleep (VISUAL_BELL_DURATION); - scr_rvideo_mode (!rvideo); /* refresh also done */ + rvideo_bell = true; + scr_rvideo_mode (rvideo_mode); + display->flush (); + + bell_ev.start (NOW + VISUAL_BELL_DURATION); } else XBell (display->display, 0); @@ -1895,7 +1907,7 @@ /* ------------------------------------------------------------------------- */ /* ARGSUSED */ void -rxvt_term::scr_printscreen (int fullhist) +rxvt_term::scr_printscreen (int fullhist) NOTHROW { #ifdef PRINTPIPE int nrows, row_start; @@ -1906,13 +1918,13 @@ if (fullhist) { - nrows = nrow + nsaved; - row_start = -nsaved; + nrows = nrow - top_row; + row_start = top_row; } else { nrows = nrow; - row_start = -view_start; + row_start = view_start; } wctomb (0, 0); @@ -1954,7 +1966,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 */ @@ -1981,7 +1993,7 @@ must_clear |= bgPixmap.pixmap != None; #endif #if TRANSPARENT - must_clear |= (options & Opt_transparent) && am_transparent; + must_clear |= OPTION (Opt_transparent) && am_transparent; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -2015,7 +2027,7 @@ if (showcursor && focus) { - if (options & Opt_cursorUnderline) + if (OPTION (Opt_cursorUnderline)) *crp ^= RS_Uline; else { @@ -2027,7 +2039,7 @@ ccol1 = Color_cursor; else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol1 = GET_FGCOLOR (rstyle); + ccol1 = fgcolor_of (rstyle); #else ccol1 = Color_fg; #endif @@ -2035,7 +2047,7 @@ ccol2 = Color_cursor2; else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol2 = GET_BGCOLOR (rstyle); + ccol2 = bgcolor_of (rstyle); #else ccol2 = Color_bg; #endif @@ -2050,12 +2062,12 @@ setoldcursor = 0; if (ocrow != -1) { - if (screen.cur.row + view_start != ocrow + if (screen.cur.row - view_start != ocrow || screen.cur.col != oldcursor.col) { if (ocrow < nrow && oldcursor.col < ncol) - drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); + drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); if (focus || !showcursor) oldcursor.row = -1; @@ -2068,16 +2080,17 @@ if (setoldcursor) { - if (screen.cur.row + view_start >= nrow) + if (screen.cur.row - view_start >= nrow) oldcursor.row = -1; else { - oldcursor.row = screen.cur.row + view_start; + oldcursor.row = screen.cur.row - view_start; oldcursor.col = screen.cur.col; } } } + HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); #if ENABLE_OVERLAY scr_swap_overlay (); #endif @@ -2087,7 +2100,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) @@ -2095,6 +2107,7 @@ int16_t nits; int j; int len, wlen; + dLocal (int, num_scr); j = nrow; wlen = len = -1; @@ -2103,9 +2116,9 @@ { if (row + i >= 0 && row + i < nrow && row + i != ocrow) { - line_t s = ROW(row - view_start); - line_t d = drawn[row]; - line_t d2 = drawn[row + i]; + line_t s = ROW(view_start + row); + line_t d = drawn_buf[row]; + line_t d2 = drawn_buf[row + i]; for (nits = 0, col = ncol; col--; ) if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) @@ -2137,7 +2150,7 @@ XCopyArea (display->display, vt, vt, gc, 0, Row2Pixel (len + i), - (unsigned int)TermWin_TotalWidth (), + (unsigned int)this->width, (unsigned int)Height2Pixel (wlen - len + 1), 0, Row2Pixel (len)); len = -1; @@ -2151,10 +2164,10 @@ */ for (row = 0; row < nrow; row++) { - text_t *stp = ROW(row - view_start).t; - rend_t *srp = ROW(row - view_start).r; - text_t *dtp = drawn[row].t; - rend_t *drp = drawn[row].r; + text_t *stp = ROW(view_start + row).t; + rend_t *srp = ROW(view_start + row).r; + text_t *dtp = drawn_buf[row].t; + rend_t *drp = drawn_buf[row].r; /* * E2: OK, now the real pass @@ -2226,22 +2239,28 @@ /* * Determine the attributes for the string */ - int fore = GET_FGCOLOR (rend); // desired foreground - int back = GET_BGCOLOR (rend); // desired background + int fore = fgcolor_of (rend); // desired foreground + int back = bgcolor_of (rend); // desired background - // only do special processing if any attributes are set, which is rare + // only do special processing if any attributes are set, which is unlikely if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) { #if ENABLE_STYLES - // force redraw after "careful" characters to avoid pixel droppings - if (srp[col] & RS_Careful && col < ncol - 1 && 0) - drp[col + 1] = ~srp[col + 1]; + // "careful" (too wide) character handling // include previous careful character(s) if possible, looks nicer (best effort...) while (text > stp && srp[text - stp - 1] & RS_Careful && RS_SAME (rend, srp[text - stp - 1])) text--, count++, xpixel -= fwidth; + + // force redraw after "careful" characters to avoid pixel droppings + for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) + drp[col + i + 1] = ~srp[col + i + 1]; + + // force redraw before "careful" characters to avoid pixel droppings + for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) + drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; #endif bool invert = rend & RS_RVid; @@ -2350,6 +2369,7 @@ #if ENABLE_OVERLAY scr_swap_overlay (); #endif + HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); /* * G: cleanup cursor and display outline cursor if necessary @@ -2358,7 +2378,7 @@ { if (focus) { - if (options & Opt_cursorUnderline) + if (OPTION (Opt_cursorUnderline)) *crp ^= RS_Uline; else { @@ -2377,7 +2397,7 @@ col--; while (col + cursorwidth < ncol - && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) + && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) cursorwidth++; #ifndef NO_CURSORCOLOR @@ -2398,38 +2418,37 @@ */ scr_reverse_selection (); - if (refresh_type & SMOOTH_REFRESH) - XFlush (display->display); - num_scr = 0; num_scr_allow = 1; } void -rxvt_term::scr_remap_chars (const line_t &l) +rxvt_term::scr_remap_chars (line_t &l) NOTHROW { if (!l.t) return; + l.touch (); // maybe a bit of an overkill, but it's not performance-relevant + for (int i = ncol; i--; ) l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); } void -rxvt_term::scr_remap_chars () +rxvt_term::scr_remap_chars () NOTHROW { for (int i = total_rows; i--; ) - scr_remap_chars (save[i]); + scr_remap_chars (row_buf [i]); for (int i = nrow; i--; ) { - scr_remap_chars (drawn[i]); - scr_remap_chars (swap_save[i]); + scr_remap_chars (drawn_buf [i]); + scr_remap_chars (swap_buf [i]); } } void -rxvt_term::scr_recolour () +rxvt_term::scr_recolour () NOTHROW { if (1 #if TRANSPARENT @@ -2460,7 +2479,7 @@ /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_clear (bool really) +rxvt_term::scr_clear (bool really) NOTHROW { if (!mapped) return; @@ -2472,46 +2491,72 @@ XClearWindow (display->display, vt); } +void +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; + + for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) + { + text_t *stp = ROW(row).t; + rend_t *srp = ROW(row).r; + + for (col = beg_col; col < end_col; col++) + srp[col] ^= rstyle1; + + while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) + srp[col] ^= rstyle2; + + if (++col < end_col) + srp[col] ^= rstyle2; + } +} + +void +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; + + if (beg_row >= view_start) + { + col = beg_col; + row = beg_row; + } + else + { + col = 0; + row = view_start; + } + + for (; row < min (end_row, view_end); row++, col = 0) + for (rend_t *srp = ROW(row).r; col < ncol; col++) + srp[col] ^= rstyle; + + if (row == end_row) + for (rend_t *srp = ROW(row).r; col < end_col; col++) + srp[col] ^= rstyle; +} + /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_reverse_selection () +rxvt_term::scr_reverse_selection () NOTHROW { if (selection.op && current_screen == selection.screen - && selection.end.row >= -view_start) + && selection.end.row >= view_start) { - int view_end = -view_start + nrow; - int row, col; - #if ENABLE_FRILLS if (selection.rect) - { - for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) - for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) - srp[col] ^= RS_RVid; - } + scr_xor_rect (selection.beg.row, selection.beg.col, + selection.end.row, selection.end.col, + RS_RVid, RS_RVid | RS_Uline); else #endif - { - if (selection.beg.row >= -view_start) - { - col = selection.beg.col; - row = selection.beg.row; - } - else - { - col = 0; - row = view_start; - } - - for (; row < min (selection.end.row, view_end); row++, col = 0) - for (rend_t *srp = ROW(row).r; col < ncol; col++) - srp[col] ^= RS_RVid; - - if (row == selection.end.row) - for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) - srp[col] ^= RS_RVid; - } + scr_xor_span (selection.beg.row, selection.beg.col, + selection.end.row, selection.end.col, + RS_RVid); } } @@ -2522,7 +2567,7 @@ */ #if 0 void -rxvt_term::scr_dump (int fd) +rxvt_term::scr_dump (int fd) NOTHROW { int row, wrote; unsigned int width, towrite; @@ -2531,16 +2576,16 @@ for (row = saveLines - nsaved; row < saveLines + nrow - 1; row++) { - width = save[row].l >= 0 ? save[row].l + width = row_buf[row].l >= 0 ? row_buf[row].l : ncol; for (towrite = width; towrite; towrite -= wrote) { - wrote = write (fd, & (save[row].t[width - towrite]), + wrote = write (fd, & (row_buf[row].t[width - towrite]), towrite); if (wrote < 0) return; /* XXX: death, no report */ } - if (save[row].l >= 0) + if (row_buf[row].l >= 0) if (write (fd, r1, 1) <= 0) return; /* XXX: death, no report */ } @@ -2551,7 +2596,7 @@ * CHARACTER SELECTION * * ------------------------------------------------------------------------- */ void -rxvt_term::selection_check (int check_more) +rxvt_term::selection_check (int check_more) NOTHROW { row_col_t pos; @@ -2559,9 +2604,9 @@ return; pos.row = pos.col = 0; - if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) - || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) - || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) + 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) @@ -2582,7 +2627,7 @@ * Paste a selection direct to the command fd */ void -rxvt_term::paste (unsigned 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++) @@ -2598,7 +2643,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 */ { @@ -2736,7 +2781,7 @@ char *s = rxvt_wcstombs (w); free (w); // TODO: strlen == only the first element will be converted. well... - paste ((unsigned char *)s, strlen (s)); + paste (s, strlen (s)); free (s); } else @@ -2745,12 +2790,12 @@ && cl) { for (int i = 0; i < cr; i++) - paste ((unsigned char *)cl[i], strlen (cl[i])); + paste (cl[i], strlen (cl[i])); XFreeStringList (cl); } else - paste (ct.value, ct.nitems); // paste raw + paste ((char *)ct.value, ct.nitems); // paste raw bailout: XFree (ct.value); @@ -2760,7 +2805,7 @@ } void -rxvt_term::incr_cb (time_watcher &w) +rxvt_term::incr_cb (time_watcher &w) NOTHROW { selection_wait = Sel_none; @@ -2771,7 +2816,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; @@ -2790,37 +2835,29 @@ * 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 ((unsigned char *)str, strlen (str)); + paste (str, strlen (str)); free (str); return; } 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 () */ @@ -2828,7 +2865,7 @@ } int -rxvt_term::selection_request_other (Atom target, int selnum) +rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW { Atom sel; @@ -2857,7 +2894,7 @@ * EXT: SelectionClear */ void -rxvt_term::selection_clear () +rxvt_term::selection_clear () NOTHROW { want_refresh = 1; free (selection.text); @@ -2900,6 +2937,9 @@ if (selection.clicks == 4) return; /* nothing selected, go away */ + if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) + return; + i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); @@ -2921,14 +2961,19 @@ } else #endif - end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN + end_col = ROW(row).l; col = max (col, 0); - if (row == selection.end.row || selection.rect) - end_col = min (end_col, selection.end.col); + if (row == selection.end.row +#if ENABLE_FRILLS + || selection.rect +#endif + ) + min_it (end_col, selection.end.col); t = ROW(row).t + col; + for (; col < end_col; col++) { if (*t == NOCHAR) @@ -2954,8 +2999,20 @@ new_selection_text[ofs++] = *t++; } - if (!ROW(row).is_longer () && row != selection.end.row) - new_selection_text[ofs++] = C0_LF; +#if ENABLE_FRILLS + if (selection.rect) + { + while (ofs + && new_selection_text[ofs - 1] != C0_LF + && unicode::is_space (new_selection_text[ofs - 1])) + --ofs; + + new_selection_text[ofs++] = C0_LF; + } + else +#endif + if (!ROW(row).is_longer () && row != selection.end.row) + new_selection_text[ofs++] = C0_LF; } if (end_col != selection.end.col) @@ -2975,11 +3032,28 @@ selection.len = ofs; selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); + if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) + return; + + selection_grab (tm); +} + +bool +rxvt_term::selection_grab (Time tm) NOTHROW +{ + selection_time = tm; + XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) - display->set_selection_owner (this); + { + display->set_selection_owner (this); + return true; + } else - rxvt_warn ("can't get primary selection, ignoring.\n"); + { + selection_clear (); + return false; + } #if 0 XTextProperty ct; @@ -2990,8 +3064,6 @@ XFree (ct.value); } #endif - - selection_time = tm; } /* ------------------------------------------------------------------------- */ @@ -3000,16 +3072,25 @@ * 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 */ + if (clicks == 2 && !selection.rect + && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) + { + MEvent.clicks = 1; // what a mess + selection.screen = current_screen; + selection.op = SELECTION_CONT; + return; + } + selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); if (clicks == 2 || clicks == 3) selection_extend_colrow (selection.mark.col, - selection.mark.row + view_start, + selection.mark.row - view_start, 0, /* button 3 */ 1, /* button press */ 0); /* click change */ @@ -3020,14 +3101,14 @@ * 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; - selection.mark.row = row - view_start; + selection.mark.row = row + view_start; selection.mark.col = col; - selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); + selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); while (selection.mark.col > 0 @@ -3056,7 +3137,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; @@ -3065,7 +3146,7 @@ if (dirn == UP) { - bound.row = - nsaved - 1; + bound.row = top_row - 1; bound.col = 0; dirnadd = -1; } @@ -3123,7 +3204,6 @@ break; } -Old_Word_Selection_You_Die: if (dirn == DN) col++; /* put us on one past the end */ @@ -3141,7 +3221,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); @@ -3154,7 +3234,7 @@ */ if (((selection.clicks % 3) == 1) && !flag && (col == selection.mark.col - && (row == selection.mark.row + view_start))) + && (row == selection.mark.row - view_start))) { /* select nothing */ selection.beg.row = selection.end.row = 0; @@ -3177,7 +3257,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 { @@ -3219,7 +3299,7 @@ } pos.col = col; - pos.row = row - view_start; + pos.row = view_start + row; /* * This is mainly xterm style selection with a couple of differences, mainly @@ -3316,7 +3396,7 @@ else if (selection.clicks == 3) { #if ENABLE_FRILLS - if (options & Opt_tripleclickwords) + if (OPTION (Opt_tripleclickwords)) { selection_delimit_word (UP, &selection.beg, &selection.beg); @@ -3373,7 +3453,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; @@ -3387,9 +3467,8 @@ while (--end_col >= 0) { - if (stp[end_col] != ' ' - && stp[end_col] != '\t' - && stp[end_col] != NOCHAR) + if (stp[end_col] != NOCHAR + && !unicode::is_space (stp[end_col])) break; } @@ -3422,7 +3501,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); @@ -3434,7 +3513,7 @@ * EXT: SelectionRequest */ void -rxvt_term::selection_send (const XSelectionRequestEvent &rq) +rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW { XSelectionEvent ev; dDisp; @@ -3572,7 +3651,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); */ @@ -3583,7 +3662,7 @@ /* ------------------------------------------------------------------------- */ #ifdef USE_XIM void -rxvt_term::im_set_position (XPoint &pos) +rxvt_term::im_set_position (XPoint &pos) NOTHROW { XWindowAttributes xwa; @@ -3596,9 +3675,9 @@ #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 < 3 || ncol < 3) + if (nrow < 1 || ncol < 1) return; want_refresh = 1; @@ -3612,11 +3691,8 @@ w += 2; min_it (w, ncol); h += 2; min_it (h, nrow); - x -= 1; max_it (x, 0); - y -= 1; max_it (y, 0); - - min_it (x, ncol - w); - min_it (y, nrow - h); + x -= 1; clamp_it (x, 0, ncol - w); + y -= 1; clamp_it (y, 0, nrow - h); ov_x = x; ov_y = y; ov_w = w; ov_h = h; @@ -3654,7 +3730,7 @@ } void -rxvt_term::scr_overlay_off () +rxvt_term::scr_overlay_off () NOTHROW { if (!ov_text) return; @@ -3672,7 +3748,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; @@ -3684,19 +3760,19 @@ } 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) { text_t t = *s++; - int width = wcwidth (t); + int width = WCWIDTH (t); while (width--) { @@ -3707,7 +3783,7 @@ } void -rxvt_term::scr_swap_overlay () +rxvt_term::scr_swap_overlay () NOTHROW { if (!ov_text) return; @@ -3718,8 +3794,8 @@ text_t *t1 = ov_text[y]; rend_t *r1 = ov_rend[y]; - text_t *t2 = ROW(y - view_start).t + ov_x; - rend_t *r2 = ROW(y - view_start).r + ov_x; + text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; + rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; for (int x = ov_w; x--; ) {