--- rxvt-unicode/src/screen.C 2004/02/22 10:38:11 1.32 +++ rxvt-unicode/src/screen.C 2006/01/15 16:47:29 1.230 @@ -1,8 +1,9 @@ /*--------------------------------*-C-*--------------------------------------* - * File: screen.c + * File: screen.C *---------------------------------------------------------------------------* * * Copyright (c) 1997-2001 Geoff Wing + * 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 @@ -18,21 +19,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *--------------------------------------------------------------------------*/ + /* - * We handle _all_ screen updates and selections + * This file handles _all_ screen updates and selections */ #include "../config.h" /* NECESSARY */ -#define INTERN_SCREEN #include "rxvt.h" /* NECESSARY */ -#include "screen.intpro" /* PROTOS for internal routines */ +#include "rxvtperl.h" /* NECESSARY */ #include /* get the typedef for CARD32 */ -#include -#include +#include -#include "salloc.C" // HACK!! +#include "salloc.C" // HACK, should be a seperate compile! inline void fill_text (text_t *start, text_t value, int len) { @@ -41,48 +41,49 @@ } /* ------------------------------------------------------------------------- */ -#define PROP_SIZE 16384 +#define PROP_SIZE 256*1024 +#define PASTE_SIZE 32768 #define TABSIZE 8 /* default tab size */ /* ------------------------------------------------------------------------- * * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * * ------------------------------------------------------------------------- */ #define ZERO_SCROLLBACK() \ - if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ - TermWin.view_start = 0 + if (OPTION (Opt_scrollTtyOutput)) \ + view_start = 0 #define CLEAR_SELECTION() \ - selection.beg.row = selection.beg.col \ + selection.beg.row = selection.beg.col \ = selection.end.row = selection.end.col = 0 #define CLEAR_ALL_SELECTION() \ - selection.beg.row = selection.beg.col \ - = selection.mark.row = selection.mark.col \ + selection.beg.row = selection.beg.col \ + = selection.mark.row = selection.mark.col \ = selection.end.row = selection.end.col = 0 -#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ +#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) -#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ +#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) -#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ (((A) == (C)) && ((B) > (D))) -#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ (((A) == (C)) && ((B) >= (D))) -#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ (((A) == (C)) && ((B) < (D))) -#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ (((A) == (C)) && ((B) <= (D))) /* these must be row_col_t */ -#define ROWCOL_IS_AFTER(X, Y) \ +#define ROWCOL_IS_AFTER(X, Y) \ ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IS_BEFORE(X, Y) \ +#define ROWCOL_IS_BEFORE(X, Y) \ ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_AFTER(X, Y) \ +#define ROWCOL_IN_ROW_AFTER(X, Y) \ ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_BEFORE(X, Y) \ +#define ROWCOL_IN_ROW_BEFORE(X, Y) \ ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ +#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ +#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) /* @@ -90,35 +91,48 @@ * CLEAR_CHARS: clear chars starting from pixel position * ERASE_ROWS : set rows starting from row to the foreground colour */ -#define drawBuffer TermWin.vt +#define drawBuffer vt -#define CLEAR_ROWS(row, num) \ - if (TermWin.mapped) \ - XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ - Row2Pixel (row), (unsigned int)TermWin.width, \ +#define CLEAR_ROWS(row, num) \ + if (mapped) \ + XClearArea (display->display, drawBuffer, 0, \ + Row2Pixel (row), (unsigned int)width, \ (unsigned int)Height2Pixel (num), False) -#define CLEAR_CHARS(x, y, num) \ - if (TermWin.mapped) \ - XClearArea (display->display, drawBuffer, x, y, \ - (unsigned int)Width2Pixel (num), \ +#define CLEAR_CHARS(x, y, num) \ + if (mapped) \ + XClearArea (display->display, drawBuffer, x, y, \ + (unsigned int)Width2Pixel (num), \ (unsigned int)Height2Pixel (1), False) -#define ERASE_ROWS(row, num) \ - XFillRectangle (display->display, drawBuffer, TermWin.gc, \ - TermWin.int_bwidth, Row2Pixel (row), \ - (unsigned int)TermWin.width, \ +#define ERASE_ROWS(row, num) \ + XFillRectangle (display->display, drawBuffer, gc, \ + 0, Row2Pixel (row), \ + (unsigned int)width, \ (unsigned int)Height2Pixel (num)) /* ------------------------------------------------------------------------- * * SCREEN `COMMON' ROUTINES * * ------------------------------------------------------------------------- */ + /* Fill part/all of a line with blanks. */ void -rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) +rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) { + if (!l.t) + { + lalloc (l); + col = 0; + width = ncol; + } + + l.touch (); + efs &= ~RS_baseattrMask; - efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); + efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); + + text_t *et = l.t + col; + rend_t *er = l.r + col; while (width--) { @@ -130,92 +144,77 @@ /* ------------------------------------------------------------------------- */ /* Fill a full line with blanks - make sure it is allocated first */ void -rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) +rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) { -#ifdef DEBUG_STRICT - assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); -#endif - if (tp[row] == NULL) - { - tp[row] = (text_t *)talloc->alloc (); - rp[row] = (rend_t *)ralloc->alloc (); - } + scr_blank_line (l, 0, ncol, efs); - scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); + l.l = 0; + l.f = 0; } /* ------------------------------------------------------------------------- * * SCREEN INITIALISATION * * ------------------------------------------------------------------------- */ + void rxvt_term::scr_reset () { - unsigned int ncol, nrow, total_rows, prev_total_rows; - unsigned int p, q; - int k; - rend_t setrstyle; - - D_SCREEN ((stderr, "rxvt_scr_reset ()")); +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif - TermWin.view_start = 0; + view_start = 0; num_scr = 0; - if (TermWin.ncol == 0) - TermWin.ncol = 80; + if (ncol == 0) + ncol = 80; - if (TermWin.nrow == 0) - TermWin.nrow = 24; - - ncol = TermWin.ncol; - nrow = TermWin.nrow; + if (nrow == 0) + nrow = 24; if (ncol == prev_ncol && nrow == prev_nrow) return; + // we need at least two lines for wrapping to work correctly + if (nrow + saveLines < 2) + { + //TODO//FIXME + saveLines++; + prev_nrow--; + top_row--; + } + want_refresh = 1; - total_rows = nrow + TermWin.saveLines; - prev_total_rows = prev_nrow + TermWin.saveLines; + int prev_total_rows = prev_nrow + saveLines; + total_rows = nrow + saveLines; screen.tscroll = 0; screen.bscroll = nrow - 1; - if (!talloc) + if (!row_buf) { + /* + * first time called so just malloc everything: don't rely on realloc + */ + top_row = 0; /* no saved lines */ + term_start = 0; + talloc = new rxvt_salloc (ncol * sizeof (text_t)); ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - } - if (prev_nrow == 0) - { - /* - * 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 - */ - screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); - buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); - drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); - swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); - - screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); - swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); - - screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); - buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); - drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); - swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); - - for (p = 0; p < nrow; p++) - { - q = p + TermWin.saveLines; - scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); - scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); - screen.tlen[q] = swap.tlen[p] = 0; - scr_blank_screen_mem (drawn_text, drawn_rend, 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)); - TermWin.nscrolled = 0; /* no saved lines */ + memset (charsets, 'B', sizeof (charsets)); rstyle = DEFAULT_RSTYLE; screen.flags = Screen_DefaultFlags; screen.cur.row = screen.cur.col = 0; @@ -245,150 +244,165 @@ /* * add or delete rows as appropriate */ - setrstyle = DEFAULT_RSTYLE; + 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 (TermWin.nscrolled, prev_nrow - nrow); - scr_scroll_text (0, (int)prev_nrow - 1, k, 1); - - for (p = nrow; p < prev_nrow; p++) + for (int row = nrow; row < prev_nrow; row++) { - q = p + TermWin.saveLines; - if (screen.text[q]) - { -#ifdef DEBUG_STRICT - assert (screen.rend[q]); -#endif - talloc->free (screen.text[q]); - ralloc->free (screen.rend[q]); - } - if (swap.text[p]) - { -#ifdef DEBUG_STRICT - assert (swap.rend[p]); -#endif - talloc->free (swap.text[p]); - ralloc->free (swap.rend[p]); - } -#ifdef DEBUG_STRICT - assert (drawn_text[p] && drawn_rend[p]); -#endif - talloc->free (drawn_text[p]); - ralloc->free (drawn_rend[p]); + lfree (swap_buf [row]); + lfree (drawn_buf[row]); } + } +#endif - /* we have fewer rows so fix up cursor position */ - MIN_IT (screen.cur.row, (int32_t)nrow - 1); - MIN_IT (swap.cur.row, (int32_t)nrow - 1); + drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); + swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); - scr_reset_realloc (); /* realloc _last_ */ + for (int row = min (nrow, prev_nrow); row--; ) + { + lresize (drawn_buf[row]); + lresize (swap_buf [row]); } - else if (nrow > prev_nrow) + + for (int row = prev_nrow; row < nrow; row++) { - /* add rows */ - scr_reset_realloc (); /* realloc _first_ */ + 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); + } + + 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 - TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this + if (top_row) + { + // re-wrap lines, this is rather ugly, possibly because I am too dumb + // to come up with a lean and mean algorithm. - k = min (TermWin.nscrolled, nrow - prev_nrow); + row_col_t ocur = screen.cur; + ocur.row = MOD (term_start + ocur.row, prev_total_rows); - for (p = prev_total_rows; p < total_rows; p++) + do { - screen.tlen[p] = 0; - screen.text[p] = NULL; - screen.rend[p] = NULL; - } + 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; - for (p = prev_total_rows; p < total_rows - k; p++) - scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); + while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) + { + p = MOD (p - 1, prev_total_rows); - for (p = prev_nrow; p < nrow; p++) - { - swap.tlen[p] = 0; - swap.text[p] = NULL; - swap.rend[p] = NULL; - drawn_text[p] = NULL; - drawn_rend[p] = NULL; - scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); - scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); - } + plines++; + llen += prev_ncol; + } - if (k > 0) - { - scr_scroll_text (0, (int)nrow - 1, -k, 1); - screen.cur.row += k; - screen.s_cur.row += k; - TermWin.nscrolled -= k; - } -#ifdef DEBUG_STRICT - assert (screen.cur.row < TermWin.nrow); - assert (swap.cur.row < TermWin.nrow); -#else /* drive with your eyes closed */ + int qlines = max (0, (llen - 1) / ncol) + 1; - MIN_IT (screen.cur.row, nrow - 1); - MIN_IT (swap.cur.row, nrow - 1); -#endif - TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this - } + // drop partial lines completely + if (q < qlines) + break; - /* resize columns */ - if (ncol != prev_ncol) - { - int common = min (prev_ncol, ncol); - rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); - rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); + q -= qlines; - for (p = 0; p < total_rows; p++) - { - if (screen.text[p]) + int lofs = 0; + line_t *qline; + + // re-assemble the full line by destination lines + for (int qrow = q; qlines--; qrow++) { - text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; - rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; + qline = row_buf + qrow; + lalloc (*qline); + qline->l = ncol; + qline->is_longer (1); - MIN_IT (screen.tlen[p], (int16_t)ncol); + int qcol = 0; - if (ncol > prev_ncol) - scr_blank_line (& (screen.text[p][prev_ncol]), - & (screen.rend[p][prev_ncol]), - ncol - prev_ncol, - setrstyle); - } - } + // fill a single destination line + while (lofs < llen && qcol < ncol) + { + int prow = lofs / prev_ncol; + int pcol = lofs % prev_ncol; - for (p = 0; p < nrow; p++) - { - text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; - rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; + prow = MOD (p + prow, prev_total_rows); - if (ncol > prev_ncol) - scr_blank_line (& (drawn_text[p][prev_ncol]), - & (drawn_rend[p][prev_ncol]), - ncol - prev_ncol, setrstyle); + // 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); - if (swap.text[p]) - { - text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; - rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; + line_t &pline = old_buf [prow]; + + int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); + + assert (len); + assert (pline.t); - MIN_IT (swap.tlen[p], (int16_t)ncol); + memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); + memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); - if (ncol > prev_ncol) - scr_blank_line (& (swap.text[p][prev_ncol]), - & (swap.rend[p][prev_ncol]), - ncol - prev_ncol, setrstyle); + lofs += len; + qcol += len; + } } + 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); - MIN_IT (screen.cur.col, (int16_t)ncol - 1); - MIN_IT (swap.cur.col, (int16_t)ncol - 1); + 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]; + + qline = pline; + lresize (qline); + } + + for (int row = prev_nrow; row < nrow; row++) + { + row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); + } - delete talloc; talloc = ta; - delete ralloc; ralloc = ra; + 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; + + clamp_it (screen.cur.row, 0, nrow - 1); + clamp_it (screen.cur.col, 0, ncol - 1); + if (tabs) free (tabs); } @@ -398,33 +412,12 @@ 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; tt_winch (); -} -void -rxvt_term::scr_reset_realloc () -{ - uint16_t total_rows, nrow; - - nrow = TermWin.nrow; - total_rows = nrow + TermWin.saveLines; - /* *INDENT-OFF* */ - screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); - buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); - drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); - swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); - - screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); - swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); - - screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); - buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); - drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); - swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); - /* *INDENT-ON* */ + HOOK_INVOKE ((this, HOOK_RESET, DT_END)); } /* ------------------------------------------------------------------------- */ @@ -434,42 +427,15 @@ void rxvt_term::scr_release () { - uint16_t total_rows; - int i; - - total_rows = TermWin.nrow + TermWin.saveLines; - -#ifdef DEBUG_STRICT - for (i = 0; i < total_rows; i++) - { - if (screen.text[i]) - /* then so is screen.rend[i] */ - assert (screen.rend[i]); - } -#endif - delete talloc; talloc = 0; delete ralloc; ralloc = 0; - free (screen.text); - free (screen.tlen); - free (screen.rend); - free (drawn_text); - free (drawn_rend); - free (swap.text); - free (swap.tlen); - free (swap.rend); - free (buf_text); - free (buf_rend); + free (row_buf); + free (swap_buf); + free (drawn_buf); free (tabs); - /* NULL these so if anything tries to use them, we'll know about it */ - screen.text = drawn_text = swap.text = NULL; - screen.rend = drawn_rend = swap.rend = NULL; - screen.tlen = swap.tlen = NULL; - buf_text = NULL; - buf_rend = NULL; - tabs = NULL; + row_buf = 0; // signal that we freed all the arrays } /* ------------------------------------------------------------------------- */ @@ -479,13 +445,11 @@ void rxvt_term::scr_poweron () { - D_SCREEN ((stderr, "rxvt_scr_poweron ()")); - scr_release (); prev_nrow = prev_ncol = 0; scr_reset (); - scr_clear (); + scr_clear (true); scr_refresh (SLOW_REFRESH); } @@ -500,45 +464,43 @@ void rxvt_term::scr_cursor (int mode) { - screen_t *s; - - D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); + screen_t *s; #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) if (current_screen == SECONDARY) - s = & (swap); + s = &swap; else #endif - s = & (screen); + s = &screen; + switch (mode) { case SAVE: - s->s_cur.row = s->cur.row; - s->s_cur.col = s->cur.col; + s->s_cur.row = screen.cur.row; + s->s_cur.col = screen.cur.col; s->s_rstyle = rstyle; - s->s_charset = s->charset; - s->s_charset_char = charsets[s->charset]; + s->s_charset = screen.charset; + s->s_charset_char = charsets[screen.charset]; break; + case RESTORE: want_refresh = 1; - s->cur.row = s->s_cur.row; - s->cur.col = s->s_cur.col; - s->flags &= ~Screen_WrapNext; + screen.cur.row = s->s_cur.row; + screen.cur.col = s->s_cur.col; + screen.flags &= ~Screen_WrapNext; rstyle = s->s_rstyle; - s->charset = s->s_charset; - charsets[s->charset] = s->s_charset_char; + screen.charset = s->s_charset; + charsets[screen.charset] = s->s_charset_char; set_font_style (); break; } + /* boundary check in case screen size changed between SAVE and RESTORE */ - MIN_IT (s->cur.row, TermWin.nrow - 1); - MIN_IT (s->cur.col, TermWin.ncol - 1); + min_it (s->cur.row, nrow - 1); + min_it (s->cur.col, ncol - 1); #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 } @@ -551,56 +513,60 @@ int rxvt_term::scr_change_screen (int scrn) { - int i; -#if NSCREENS - int offset; -#endif - want_refresh = 1; - - D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); - - TermWin.view_start = 0; + view_start = 0; if (current_screen == scrn) - return current_screen; + return scrn; selection_check (2); /* check for boundary cross */ - SWAP_IT (current_screen, scrn, int); + 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 - num_scr = 0; - offset = TermWin.saveLines; - for (i = prev_nrow; i--;) + if (OPTION (Opt_secondaryScreen)) { - SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); - SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); - SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); - } - SWAP_IT (screen.cur.row, swap.cur.row, int16_t); - SWAP_IT (screen.cur.col, swap.cur.col, int16_t); -# ifdef DEBUG_STRICT - assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); - assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); -# else /* drive with your eyes closed */ - MAX_IT (screen.cur.row, 0); - MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); - MAX_IT (screen.cur.col, 0); - MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); -# endif - SWAP_IT (screen.charset, swap.charset, int16_t); - SWAP_IT (screen.flags, swap.flags, int); - screen.flags |= Screen_VisibleCursor; - swap.flags |= Screen_VisibleCursor; -#else -# ifdef SCROLL_ON_NO_SECONDARY - if (current_screen == PRIMARY) - scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); -# endif + num_scr = 0; + + for (int i = prev_nrow; i--; ) + ::swap (ROW(i), swap_buf [i]); + + ::swap (screen.charset, swap.charset); + ::swap (screen.flags, swap.flags); + screen.flags |= Screen_VisibleCursor; + swap.flags |= Screen_VisibleCursor; + } + else #endif + 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 () +{ + if (!(screen.flags & Screen_WrapNext)) + return; + + screen.flags &= ~Screen_WrapNext; + + screen.cur.col = 0; + + if (screen.cur.row == screen.bscroll) + scr_scroll_text (screen.tscroll, screen.bscroll, 1); + else if (screen.cur.row < nrow - 1) + screen.cur.row++; +} + /* ------------------------------------------------------------------------- */ /* * Change the colour for following text @@ -608,7 +574,9 @@ void rxvt_term::scr_color (unsigned int color, int fgbg) { - color &= RS_fgMask; + if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) + color = fgbg; + if (fgbg == Color_fg) rstyle = SET_FGCOLOR (rstyle, color); else @@ -635,123 +603,125 @@ * Scroll text between and inclusive, by lines * count positive ==> scroll up * count negative ==> scroll down - * spec == 0 for normal routines */ int -rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) +rxvt_term::scr_scroll_text (int row1, int row2, int count) { - int i, j; - long nscrolled; - if (count == 0 || (row1 > row2)) return 0; want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); + num_scr += count; - if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) - { - nscrolled = (long)TermWin.nscrolled + (long)count; + if (count > 0 + && row1 == 0 + && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) + { + 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; - if (nscrolled > (long)TermWin.saveLines) - TermWin.nscrolled = TermWin.saveLines; - else - TermWin.nscrolled = (uint16_t)nscrolled; + { + // severe bottommost scrolled line + line_t &l = ROW(row2 - count); + l.touch (); + l.is_longer (0); + } - if ((Options & Opt_scrollWithBuffer) - && TermWin.view_start != 0 - && TermWin.view_start != TermWin.saveLines) - scr_page (UP, count); - } - else if (!spec) - row1 += TermWin.saveLines; + // erase newly scorlled-in lines + for (int i = count; i; --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); - row2 += TermWin.saveLines; + scr_blank_line (l, 0, l.l, rstyle); - if (selection.op && current_screen == selection.screen) - { - i = selection.beg.row + TermWin.saveLines; - j = selection.end.row + TermWin.saveLines; - 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)) - { - CLEAR_ALL_SELECTION (); - selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ - } - else if (j >= row1 && j <= row2) - { - /* move selected region too */ - selection.beg.row -= count; - selection.end.row -= count; - selection.mark.row -= count; + l.l = 0; + l.f = 0; } - } - - selection_check (0); /* _after_ TermWin.nscrolled update */ - - num_scr += count; - j = count; - if (count < 0) - count = -count; - - i = row2 - row1 + 1; - MIN_IT (count, i); - - if (j > 0) - { - /* A: scroll up */ - - /* A1: Copy lines that will get clobbered by the rotation */ - for (i = 0, j = row1; i < count; i++, j++) + // 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; ) { - buf_text[i] = screen.text[j]; - buf_rend[i] = screen.rend[j]; + line_t &l1 = ROW(i - count); + line_t &l2 = ROW(i); + + ::swap (l1, l2); + l2.touch (); } - /* A2: Rotate lines */ - for (j = row1, i = j + count; i <= row2; i++, j++) + + // move and/or clear selection, if any + if (selection.op && current_screen == selection.screen) { - screen.tlen[j] = screen.tlen[i]; - screen.text[j] = screen.text[i]; - screen.rend[j] = screen.rend[i]; + selection.beg.row -= count; + selection.end.row -= count; + selection.mark.row -= count; + + if (selection.beg.row < top_row + || selection.end.row < top_row + || selection.mark.row < top_row) + { + CLEAR_ALL_SELECTION (); + selection.op = SELECTION_CLEAR; + } } - j = row2 - count + 1, i = count; + + // finally move the view window, if desired + if (OPTION (Opt_scrollWithBuffer) + && view_start != 0 + && view_start != -saveLines) + scr_page (UP, count); } - else /* if (j < 0) */ + else { - /* B: scroll down */ - - /* B1: Copy lines that will get clobbered by the rotation */ - for (i = 0, j = row2; i < count; i++, j--) + if (selection.op && current_screen == selection.screen) { - buf_text[i] = screen.text[j]; - buf_rend[i] = screen.rend[j]; + 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; + } + else if (selection.end.row >= row1 && selection.end.row <= row2) + { + /* move selected region too */ + selection.beg.row -= count; + selection.end.row -= count; + selection.mark.row -= count; + + selection_check (0); + } } - /* B2: Rotate lines */ - for (j = row2, i = j - count; i >= row1; i--, j--) + + // use a simple and robust scrolling algorithm, this + // part of scr_scroll_text is not time-critical. + + int rows = row2 - row1 + 1; + + min_it (count, rows); + + line_t *temp_buf = row_buf + total_rows; + + for (int row = 0; row < rows; row++) { - screen.tlen[j] = screen.tlen[i]; - screen.text[j] = screen.text[i]; - screen.rend[j] = screen.rend[i]; - } - j = row1, i = count; - count = -count; - } + temp_buf [row] = ROW(row1 + (row + count + rows) % rows); - /* C: Resurrect lines */ - for (; i--; j++) - { - screen.tlen[j] = 0; - screen.text[j] = buf_text[i]; - screen.rend[j] = buf_rend[i]; + if (!IN_RANGE_EXC (row + count, 0, rows)) + scr_blank_screen_mem (temp_buf [row], rstyle); + } - if (!spec) /* line length may not equal TermWin.ncol */ - scr_blank_screen_mem (screen.text, screen.rend, - (unsigned int)j, rstyle); + for (int row = 0; row < rows; row++) + ROW(row1 + row) = temp_buf [row]; } return count; @@ -762,164 +732,261 @@ * Add text given in of length to screen struct */ void -rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) +rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) { - unsigned char checksel, clearsel; - uint32_t c; - int i, row, last_col; - text_t *stp; - rend_t *srp; - if (len <= 0) /* sanity */ return; - want_refresh = 1; - last_col = TermWin.ncol; + unsigned char checksel; + unicode_t c; + int ncol = this->ncol; + const wchar_t *strend = str + len; - D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); + want_refresh = 1; ZERO_SCROLLBACK (); - if (nlines > 0) + + if (minlines > 0) { - nlines += (screen.cur.row - screen.bscroll); - if ((nlines > 0) - && (screen.tscroll == 0) - && (screen.bscroll == (TermWin.nrow - 1))) + minlines += screen.cur.row - screen.bscroll; + + 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, 0); - 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 < TermWin.nrow) - && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); -#else /* drive with your eyes closed */ - MIN_IT (screen.cur.col, last_col - 1); - MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); - MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); -#endif - row = screen.cur.row + TermWin.saveLines; - - checksel = (selection.op - && current_screen == selection.screen) ? 1 : 0; - clearsel = 0; - - stp = screen.text[row]; - srp = screen.rend[row]; + assert (screen.cur.col < ncol); + assert (screen.cur.row < nrow + && screen.cur.row >= top_row); +#endif + int row = screen.cur.row; - for (i = 0; i < len;) + checksel = selection.op && current_screen == selection.screen ? 1 : 0; + + line_t *line = &ROW(row); + + while (str < strend) { - c = str[i++]; - switch (c) - { - case '\t': - scr_tab (1); - continue; - case '\n': - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); + c = (unicode_t)*str++; // convert to rxvt-unicodes representation + + if (c < 0x20) + if (c == C0_LF) + { + max_it (line->l, screen.cur.col); + screen.flags &= ~Screen_WrapNext; + if (screen.cur.row == screen.bscroll) - scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); - else if (screen.cur.row < (TermWin.nrow - 1)) - row = (++screen.cur.row) + TermWin.saveLines; - stp = screen.text[row]; /* _must_ refresh */ - srp = screen.rend[row]; /* _must_ refresh */ + scr_scroll_text (screen.tscroll, screen.bscroll, 1); + else if (screen.cur.row < (nrow - 1)) + row = ++screen.cur.row; + + line = &ROW(row); /* _must_ refresh */ continue; - case '\r': - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); + } + else if (c == C0_CR) + { + max_it (line->l, screen.cur.col); + screen.flags &= ~Screen_WrapNext; screen.cur.col = 0; continue; - default: - if (c == 127) - continue; /* yummmm..... */ - break; - } + } + else if (c == C0_HT) + { + scr_tab (1, true); + continue; + } if (checksel /* see if we're writing within selection */ && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) && ROWCOL_IS_BEFORE (screen.cur, selection.end)) { checksel = 0; - clearsel = 1; + /* + * If we wrote anywhere in the selected area, kill the selection + * XXX: should we kill the mark too? Possibly, but maybe that + * should be a similar check. + */ + CLEAR_SELECTION (); } + if (screen.flags & Screen_WrapNext) { - screen.tlen[row] = -1; - if (screen.cur.row == screen.bscroll) - scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); - else if (screen.cur.row < (TermWin.nrow - 1)) - row = (++screen.cur.row) + TermWin.saveLines; - stp = screen.text[row]; /* _must_ refresh */ - srp = screen.rend[row]; /* _must_ refresh */ - screen.cur.col = 0; - screen.flags &= ~Screen_WrapNext; + max_it (line->l, ncol); + line->is_longer (1); + + scr_do_wrap (); + + row = screen.cur.row; + line = &ROW(row); /* _must_ refresh */ + } + + // some utf-8 decoders "decode" surrogate characters: let's fix this. + 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 + // locale. + int width = c < 0x100 ? 1 : wcwidth (c); + + if (charsets [screen.charset] == '0') // DEC SPECIAL + { + // vt100 special graphics and line drawing + // 5f-7e standard vt100 + // 40-5e rxvt extension for extra curses acs chars + static uint16_t vt100_0[62] = { // 41 .. 7e + 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! + 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f + 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 + 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f + 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 + 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f + 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 + 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e + }; + + if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) + { + c = vt100_0[c - 0x41]; + width = 1; // vt100 line drawing characters are always single-width + } } + if (screen.flags & Screen_Insert) - scr_insdel_chars (1, INSERT); + scr_insdel_chars (width, INSERT); - if (charsets[screen.charset] == '0') // DEC SPECIAL - switch (c) - { - case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; - case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; - case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; - case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; - case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; - case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; - case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; - case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; - case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; - case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; - case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; - } + if (width != 0) + { +#if !UNICODE_3 + // trim characters we can't store directly :( + if (c >= 0x10000) +# if ENABLE_COMBINING + c = rxvt_composite.compose (c); // map to lower 16 bits +# else + c = 0xfffd; +# endif +#endif - rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); - // rely on wcwidth to tell us the character width, at least for non-ascii - int width = c <= 128 ? 1 : wcwidth (c); - - // width -1 characters (e.g. combining chars) are ignored currently. - if (width > 0) - do - { - stp[screen.cur.col] = c; - srp[screen.cur.col] = rend; + // nuke the character at this position, if required + if (line->t[screen.cur.col] == NOCHAR + || (screen.cur.col < ncol - 1 + && line->t[screen.cur.col + 1] == NOCHAR)) + { + int col = screen.cur.col; - if (screen.cur.col < last_col - 1) - screen.cur.col++; - else - { - screen.tlen[row] = last_col; - if (screen.flags & Screen_Autowrap) - screen.flags |= Screen_WrapNext; - break; - } + // find begin + while (col > 0 && line->t[col] == NOCHAR) + col--; + + rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); + + // found begin, nuke + do { + line->t[col] = ' '; + line->r[col] = rend; + col++; + } while (col < ncol && line->t[col] == NOCHAR); + } - c = NOCHAR; - } - while (--width > 0); - else - (void)0; /* handle combining character etc. here. */ - } + rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); + // if the character doesn't fit into the remaining columns... + if (screen.cur.col > ncol - width && ncol >= width) + { + // ...output spaces + c = ' '; + // and try the same character next loop iteration + --str; + } - /* - * If we wrote anywhere in the selected area, kill the selection - * XXX: should we kill the mark too? Possibly, but maybe that - * should be a similar check. - */ - if (clearsel) - CLEAR_SELECTION (); + line->touch (); + + do + { + line->t[screen.cur.col] = c; + line->r[screen.cur.col] = rend; + + if (screen.cur.col < ncol - 1) + screen.cur.col++; + else + { + line->l = ncol; + if (screen.flags & Screen_Autowrap) + screen.flags |= Screen_WrapNext; + break; + } + + c = NOCHAR; + } + while (--width > 0); + + // pad with spaces when overwriting wide character with smaller one + if (!width) + { + 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 + { +#if ENABLE_COMBINING + // handle combining characters + // 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; + } + else if (screen.cur.row > 0 + && ROW(screen.cur.row - 1).is_longer ()) + { + 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) + n = rxvt_composite.compose (*tp, c); + + *tp = n; + *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); +#endif + } + } + + 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 } @@ -932,20 +999,21 @@ rxvt_term::scr_backspace () { want_refresh = 1; + if (screen.cur.col == 0) { if (screen.cur.row > 0) { #ifdef TERMCAP_HAS_BW - screen.cur.col = TermWin.ncol - 1; + screen.cur.col = ncol - 1; screen.cur.row--; return; #endif - } } - else if ((screen.flags & Screen_WrapNext) == 0) + else if (!(screen.flags & Screen_WrapNext)) scr_gotorc (0, -1, RELATIVE); + screen.flags &= ~Screen_WrapNext; } @@ -956,26 +1024,55 @@ * XTERM_SEQ: CTRL-I */ void -rxvt_term::scr_tab (int count) +rxvt_term::scr_tab (int count, bool ht) { - int i, x; + int i, x; - D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); want_refresh = 1; i = x = screen.cur.col; + if (count == 0) return; else if (count > 0) { - for (; ++i < TermWin.ncol; ) + line_t &l = ROW(screen.cur.row); + rend_t base_rend = l.r[i]; + ht &= l.t[i] == ' '; + + for (; ++i < ncol; ) if (tabs[i]) { x = i; + if (!--count) break; } + else + ht &= l.t[i] == ' ' + && RS_SAME (l.r[i], base_rend); + if (count) - x = TermWin.ncol - 1; + x = ncol - 1; + + // store horizontal tab commands as characters inside the text + // buffer so they can be selected and pasted. + if (ht && OPTION (Opt_pastableTabs)) + { + base_rend = SET_FONT (base_rend, 0); + + l.touch (x); + + i = screen.cur.col; + + l.t[i] = '\t'; + l.r[i] = base_rend; + + while (++i < x) + { + l.t[i] = NOCHAR; + l.r[i] = base_rend; + } + } } else /* if (count < 0) */ { @@ -986,9 +1083,11 @@ if (!++count) break; } + if (count) x = 0; } + if (x != screen.cur.col) scr_gotorc (0, x, R_RELATIVE); } @@ -1000,18 +1099,14 @@ * Move cursor left in row. If we're at the left boundary, shift everything * in that row right. Clear left column. */ -#ifndef NO_FRILLS +#if ENABLE_FRILLS void rxvt_term::scr_backindex () { if (screen.cur.col > 0) scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); else - { - if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) - return; /* um, yeah? */ - scr_insdel_chars (1, INSERT); - } + scr_insdel_chars (1, INSERT); } #endif /* ------------------------------------------------------------------------- */ @@ -1021,24 +1116,22 @@ * Move cursor right in row. If we're at the right boundary, shift everything * in that row left. Clear right column. */ -#ifndef NO_FRILLS +#if ENABLE_FRILLS void rxvt_term::scr_forwardindex () { - int row; - - if (screen.cur.col < TermWin.ncol - 1) + if (screen.cur.col < ncol - 1) scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); else { - row = screen.cur.row + TermWin.saveLines; - if (screen.tlen[row] == 0) - return; /* um, yeah? */ - else if (screen.tlen[row] == -1) - screen.tlen[row] = TermWin.ncol; + line_t &l = ROW(screen.cur.row); + + l.touch (); + l.is_longer (0); + scr_gotorc (0, 0, R_RELATIVE); scr_insdel_chars (1, DELETE); - scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); + scr_gotorc (0, ncol - 1, R_RELATIVE); } } #endif @@ -1053,14 +1146,11 @@ want_refresh = 1; ZERO_SCROLLBACK (); - D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); - - screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) - : col); - MAX_IT (screen.cur.col, 0); - MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); + screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; + clamp_it (screen.cur.col, 0, ncol - 1); screen.flags &= ~Screen_WrapNext; + if (relative & R_RELATIVE) { if (row > 0) @@ -1085,38 +1175,38 @@ if (screen.flags & Screen_Relative) { /* relative origin mode */ screen.cur.row = row + screen.tscroll; - MIN_IT (screen.cur.row, screen.bscroll); + min_it (screen.cur.row, screen.bscroll); } else screen.cur.row = row; } - MAX_IT (screen.cur.row, 0); - MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); + + clamp_it (screen.cur.row, 0, nrow - 1); } /* ------------------------------------------------------------------------- */ /* - * direction should be UP or DN + * direction should be UP or DN */ void rxvt_term::scr_index (enum page_dirn direction) { - int dirn; + int dirn; want_refresh = 1; - dirn = ((direction == UP) ? 1 : -1); - D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); - ZERO_SCROLLBACK (); + dirn = ((direction == UP) ? 1 : -1); + screen.flags &= ~Screen_WrapNext; + if ((screen.cur.row == screen.bscroll && direction == UP) || (screen.cur.row == screen.tscroll && direction == DN)) - scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); + scr_scroll_text (screen.tscroll, screen.bscroll, dirn); else screen.cur.row += dirn; - MAX_IT (screen.cur.row, 0); - MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); + + clamp_it (screen.cur.row, 0, nrow - 1); selection_check (0); } @@ -1130,23 +1220,24 @@ void rxvt_term::scr_erase_line (int mode) { - unsigned int row, col, num; + unsigned int col, num; want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); ZERO_SCROLLBACK (); selection_check (1); - screen.flags &= ~Screen_WrapNext; + line_t &line = ROW(screen.cur.row); + + line.touch (); + line.is_longer (0); - row = TermWin.saveLines + screen.cur.row; switch (mode) { case 0: /* erase to end of line */ col = screen.cur.col; - num = TermWin.ncol - col; - MIN_IT (screen.tlen[row], (int16_t)col); + num = ncol - 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 (); @@ -1160,8 +1251,8 @@ break; case 2: /* erase whole line */ col = 0; - num = TermWin.ncol; - screen.tlen[row] = 0; + num = ncol; + line.l = 0; if (selection.beg.row <= screen.cur.row && selection.end.row >= screen.cur.row) CLEAR_SELECTION (); @@ -1170,11 +1261,7 @@ return; } - if (screen.text[row]) - scr_blank_line (& (screen.text[row][col]), - & (screen.rend[row][col]), num, rstyle); - else - scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); + scr_blank_line (line, col, num, rstyle); } /* ------------------------------------------------------------------------- */ @@ -1187,15 +1274,13 @@ void rxvt_term::scr_erase_screen (int mode) { - int num; - int32_t row, row_offset; - rend_t ren; - XGCValues gcvalue; + int num; + int32_t row; + rend_t ren; + XGCValues gcvalue; want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); ZERO_SCROLLBACK (); - row_offset = (int32_t)TermWin.saveLines; switch (mode) { @@ -1203,7 +1288,7 @@ selection_check (1); scr_erase_line (0); row = screen.cur.row + 1; /* possible OOB */ - num = TermWin.nrow - row; + num = nrow - row; break; case 1: /* erase to beginning of screen */ selection_check (3); @@ -1214,20 +1299,23 @@ case 2: /* erase whole screen */ selection_check (3); row = 0; - num = TermWin.nrow; + num = nrow; break; default: return; } - refresh_type |= REFRESH_BOUNDS; + if (selection.op && current_screen == selection.screen && ((selection.beg.row >= row && selection.beg.row <= row + num) || (selection.end.row >= row && selection.end.row <= row + num))) CLEAR_SELECTION (); - if (row >= TermWin.nrow) /* Out Of Bounds */ + + if (row >= nrow) /* Out Of Bounds */ return; - MIN_IT (num, (TermWin.nrow - row)); + + min_it (num, nrow - row); + if (rstyle & (RS_RVid | RS_Uline)) ren = (rend_t) ~RS_None; else if (GET_BASEBG (rstyle) == Color_bg) @@ -1237,23 +1325,32 @@ } else { - ren = (rstyle & (RS_fgMask | RS_bgMask)); - gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; - XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); + ren = rstyle & (RS_fgMask | RS_bgMask); + gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; + XChangeGC (display->display, gc, GCForeground, &gcvalue); ERASE_ROWS (row, num); - gcvalue.foreground = PixColors[Color_fg]; - XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); + gcvalue.foreground = pix_colors[Color_fg]; + XChangeGC (display->display, gc, GCForeground, &gcvalue); } + for (; num--; row++) { - scr_blank_screen_mem (screen.text, screen.rend, - (unsigned int) (row + row_offset), rstyle); - screen.tlen[row + row_offset] = 0; - scr_blank_line (drawn_text[row], drawn_rend[row], - (unsigned int)TermWin.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 () +{ + want_refresh = 1; + ZERO_SCROLLBACK (); + + top_row = 0; +} +#endif + /* ------------------------------------------------------------------------- */ /* * Fill the screen with `E's @@ -1262,21 +1359,27 @@ void rxvt_term::scr_E () { - int i, j, k; - rend_t *r1, fs; + rend_t fs; want_refresh = 1; - num_scr_allow = 0; ZERO_SCROLLBACK (); + + num_scr_allow = 0; selection_check (3); - fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); - for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) + fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); + for (int row = nrow; row--; ) { - screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ - fill_text (screen.text[k], 'E', TermWin.ncol); - for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) + line_t &line = ROW(row); + + fill_text (line.t, 'E', ncol); + rend_t *r1 = line.r; + + for (int j = ncol; j--; ) *r1++ = fs; + + line.is_longer (0); + line.touch (ncol); } } @@ -1287,7 +1390,7 @@ void rxvt_term::scr_insdel_lines (int count, int insdel) { - int end; + int end; ZERO_SCROLLBACK (); @@ -1304,9 +1407,10 @@ else if (insdel == INSERT) count = end; } - screen.flags &= ~Screen_WrapNext; - scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); + scr_do_wrap (); + + scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count); } /* ------------------------------------------------------------------------- */ @@ -1316,11 +1420,8 @@ void rxvt_term::scr_insdel_chars (int count, int insdel) { - int col, row; - rend_t tr; - text_t *stp; - rend_t *srp; - int16_t *slp; + int col, row; + rend_t tr; want_refresh = 1; ZERO_SCROLLBACK (); @@ -1328,82 +1429,83 @@ if (count <= 0) return; + scr_do_wrap (); + selection_check (1); - MIN_IT (count, (TermWin.ncol - screen.cur.col)); + min_it (count, ncol - screen.cur.col); - row = screen.cur.row + TermWin.saveLines; - screen.flags &= ~Screen_WrapNext; + row = screen.cur.row; + + line_t *line = &ROW(row); + + line->touch (); + line->is_longer (0); - stp = screen.text[row]; - srp = screen.rend[row]; - slp = & (screen.tlen[row]); switch (insdel) { case INSERT: - for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; - col--) - { - stp[col] = stp[col - count]; - srp[col] = srp[col - count]; - } - if (*slp != -1) + for (col = ncol - 1; (col - count) >= screen.cur.col; col--) { - *slp += count; - MIN_IT (*slp, TermWin.ncol); + line->t[col] = line->t[col - count]; + line->r[col] = line->r[col - count]; } + + line->l = min (line->l + count, ncol); + if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) { if (selection.end.row != screen.cur.row - || (selection.end.col + count >= TermWin.ncol)) + || (selection.end.col + count >= ncol)) CLEAR_SELECTION (); else { /* shift selection */ - selection.beg.col += count; + selection.beg.col += count; selection.mark.col += count; /* XXX: yes? */ - selection.end.col += count; + selection.end.col += count; } } - scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), - (unsigned int)count, rstyle); + + scr_blank_line (*line, screen.cur.col, count, rstyle); break; + case ERASE: - screen.cur.col += count; /* don't worry if > TermWin.ncol */ + screen.cur.col += count; /* don't worry if > ncol */ selection_check (1); screen.cur.col -= count; - scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), - (unsigned int)count, rstyle); + + line->l = max (line->l - count, 0); + scr_blank_line (*line, screen.cur.col, count, rstyle); break; + case DELETE: - tr = srp[TermWin.ncol - 1] - & (RS_fgMask | RS_bgMask | RS_baseattrMask); - for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) + tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); + + for (col = screen.cur.col; (col + count) < ncol; col++) { - stp[col] = stp[col + count]; - srp[col] = srp[col + count]; + line->t[col] = line->t[col + count]; + line->r[col] = line->r[col + count]; } - scr_blank_line (& (stp[TermWin.ncol - count]), - & (srp[TermWin.ncol - count]), - (unsigned int)count, tr); - if (*slp == -1) /* break line continuation */ - *slp = TermWin.ncol; - *slp -= count; - MAX_IT (*slp, 0); + + 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)) { if (selection.end.row != screen.cur.row || (screen.cur.col >= selection.beg.col - count) - || selection.end.col >= TermWin.ncol) + || selection.end.col >= ncol) CLEAR_SELECTION (); else { /* shift selection */ - selection.beg.col -= count; + selection.beg.col -= count; selection.mark.col -= count; /* XXX: yes? */ - selection.end.col -= count; + selection.end.col -= count; } } + break; } } @@ -1416,10 +1518,12 @@ void rxvt_term::scr_scroll_region (int top, int bot) { - MAX_IT (top, 0); - MIN_IT (bot, (int)TermWin.nrow - 1); + max_it (top, 0); + min_it (bot, nrow - 1); + if (top > bot) return; + screen.tscroll = top; screen.bscroll = bot; scr_gotorc (0, 0, 0); @@ -1435,6 +1539,7 @@ rxvt_term::scr_cursor_visible (int mode) { want_refresh = 1; + if (mode) screen.flags |= Screen_VisibleCursor; else @@ -1453,7 +1558,7 @@ if (mode) screen.flags |= Screen_Autowrap; else - screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); + screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); } /* ------------------------------------------------------------------------- */ @@ -1473,6 +1578,7 @@ screen.flags |= Screen_Relative; else screen.flags &= ~Screen_Relative; + scr_gotorc (0, 0, 0); } @@ -1502,9 +1608,9 @@ rxvt_term::scr_set_tab (int mode) { if (mode < 0) - MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); - else if (screen.cur.col < TermWin.ncol) - tabs[screen.cur.col] = (mode ? 1 : 0); + memset (tabs, 0, ncol * sizeof (char)); + else if (screen.cur.col < ncol) + tabs [screen.cur.col] = !!mode; } /* ------------------------------------------------------------------------- */ @@ -1516,24 +1622,24 @@ void rxvt_term::scr_rvideo_mode (int mode) { - XGCValues gcvalue; + XGCValues gcvalue; if (rvideo != mode) { rvideo = mode; - SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); -#if defined(XPM_BACKGROUND) + ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); +#if XPM_BACKGROUND if (bgPixmap.pixmap == None) #endif -#if defined(TRANSPARENT) - if (! (Options & Opt_transparent) || am_transparent == 0) +#if TRANSPARENT + if (! OPTION (Opt_transparent) || am_transparent == 0) #endif - XSetWindowBackground (display->display, TermWin.vt, - PixColors[Color_bg]); + XSetWindowBackground (display->display, vt, + pix_colors[Color_bg]); - gcvalue.foreground = PixColors[Color_fg]; - gcvalue.background = PixColors[Color_bg]; - XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, + gcvalue.foreground = pix_colors[Color_fg]; + gcvalue.background = pix_colors[Color_bg]; + XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); scr_clear (); scr_touch (true); @@ -1561,7 +1667,8 @@ void rxvt_term::set_font_style () { - switch (charsets[screen.charset]) +#if 0 + switch (charsets [screen.charset]) { case '0': /* DEC Special Character & Line Drawing Set */ break; @@ -1578,6 +1685,7 @@ case 'K': /* German character set */ break; } +#endif } /* ------------------------------------------------------------------------- */ @@ -1590,10 +1698,10 @@ */ void rxvt_term::scr_charset_choose (int set) - { - screen.charset = set; - set_font_style (); - } +{ + screen.charset = set; + set_font_style (); +} /* ------------------------------------------------------------------------- */ /* @@ -1606,10 +1714,10 @@ */ void rxvt_term::scr_charset_set (int set, unsigned int ch) - { - charsets[set] = (unsigned char)ch; - set_font_style (); - } +{ + charsets[set] = (unsigned char)ch; + set_font_style (); +} /* ------------------------------------------------------------------------- * @@ -1624,12 +1732,12 @@ { bool found = false; - for (int i = 0; i < TermWin.nrow; i++) + for (int i = 0; i < nrow; i++) { int col = 0; - rend_t *drp = drawn_rend [i]; + rend_t *drp = drawn_buf[i].r; - for (; col < TermWin.ncol; col++, drp++) + for (; col < ncol; col++, drp++) if ((*drp & mask) == value) { found = true; @@ -1650,43 +1758,41 @@ }; void -rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) +rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) { int i; row_col_t rc[RC_COUNT]; - if (drawn_text == NULL) /* sanity check */ + if (!drawn_buf) /* sanity check */ return; -#ifdef DEBUG_STRICT - x = max (x, (int)TermWin.int_bwidth); - x = min (x, (int)TermWin.width); - y = max (y, (int)TermWin.int_bwidth); - y = min (y, (int)TermWin.height); +#ifndef NO_SLOW_LINK_SUPPORT + if (refresh_type == FAST_REFRESH && !display->is_local) + { + y = 0; + eheight = height; + } #endif /* round down */ rc[PART_BEG].col = Pixel2Col (x); rc[PART_BEG].row = Pixel2Row (y); /* round up */ - rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); - rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); + rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); + rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); /* sanity checks */ for (i = PART_BEG; i < RC_COUNT; i++) { - MIN_IT (rc[i].col, TermWin.ncol - 1); - MIN_IT (rc[i].row, TermWin.nrow - 1); + min_it (rc[i].col, ncol - 1); + min_it (rc[i].row, nrow - 1); } - D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); - for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) - fill_text (& (drawn_text[i][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); if (refresh) - scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); + scr_refresh (SLOW_REFRESH); } /* ------------------------------------------------------------------------- */ @@ -1696,7 +1802,7 @@ void rxvt_term::scr_touch (bool refresh) { - scr_expose (0, 0, TermWin.width, TermWin.height, refresh); + scr_expose (0, 0, width, height, refresh); } /* ------------------------------------------------------------------------- */ @@ -1704,23 +1810,14 @@ * Move the display so that the line represented by scrollbar value Y is at * the top of the screen */ -int +void rxvt_term::scr_move_to (int y, int len) { - long p = 0; - uint16_t oldviewstart; - - oldviewstart = TermWin.view_start; - if (y < len) - { - p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; - p -= (long) (TermWin.nrow - 1); - p = max (p, 0); - } - TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); - D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); + int p = len + ? (top_row - nrow) * (len - y) / len + (nrow - 1) + : 0; - return scr_changeview (oldviewstart); + scr_changeview (p); } /* ------------------------------------------------------------------------- */ @@ -1728,39 +1825,30 @@ * Page the screen up/down nlines * direction should be UP or DN */ -int +bool rxvt_term::scr_page (enum page_dirn direction, int nlines) { - int n; - uint16_t oldviewstart; + int new_view_start = + direction == UP ? view_start - nlines + : view_start + nlines; - D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); -#ifdef DEBUG_STRICT - assert ((nlines >= 0) && (nlines <= TermWin.nrow)); -#endif - oldviewstart = TermWin.view_start; - if (direction == UP) - { - n = TermWin.view_start + nlines; - TermWin.view_start = min (n, TermWin.nscrolled); - } - else - { - n = TermWin.view_start - nlines; - TermWin.view_start = max (n, 0); - } - return scr_changeview (oldviewstart); + return scr_changeview (new_view_start); } -int -rxvt_term::scr_changeview (uint16_t oldviewstart) +bool +rxvt_term::scr_changeview (int new_view_start) { - if (TermWin.view_start != oldviewstart) - { - want_refresh = 1; - num_scr -= (TermWin.view_start - oldviewstart); - } - return (int) (TermWin.view_start - oldviewstart); + clamp_it (new_view_start, top_row, 0); + + if (new_view_start == view_start) + return false; + + 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; + + return true; } /* ------------------------------------------------------------------------- */ @@ -1768,19 +1856,24 @@ rxvt_term::scr_bell () { #ifndef NO_BELL + # ifndef NO_MAPALERT # ifdef MAPALERT_OPTION - if (Options & Opt_mapAlert) + if (OPTION (Opt_mapAlert)) # endif - XMapWindow (display->display, TermWin.parent[0]); + XMapWindow (display->display, parent[0]); # endif - if (Options & Opt_visualBell) + + if (OPTION (Opt_visualBell)) { scr_rvideo_mode (!rvideo); /* refresh also done */ + display->flush (); + rxvt_usleep (VISUAL_BELL_DURATION); scr_rvideo_mode (!rvideo); /* refresh also done */ } else XBell (display->display, 0); + #endif } @@ -1790,30 +1883,51 @@ rxvt_term::scr_printscreen (int fullhist) { #ifdef PRINTPIPE - int i, r1, nrows, row_offset; - text_t *t; - FILE *fd; + int nrows, row_start; + FILE *fd; if ((fd = popen_printer ()) == NULL) return; - nrows = TermWin.nrow; - row_offset = TermWin.saveLines; - if (!fullhist) - row_offset -= TermWin.view_start; + + if (fullhist) + { + nrows = nrow - top_row; + row_start = top_row; + } else { - nrows += TermWin.nscrolled; - row_offset -= TermWin.nscrolled; + nrows = nrow; + row_start = view_start; } - for (r1 = 0; r1 < nrows; r1++) + wctomb (0, 0); + + for (int r1 = 0; r1 < nrows; r1++) { - t = screen.text[r1 + row_offset]; - for (i = TermWin.ncol - 1; i >= 0; i--) - if (!isspace (t[i])) - break; - fprintf (fd, "%.*s\n", (i + 1), t); + text_t *tp = ROW(r1).t; + int len = ROW(r1).l; + + for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN + { + char mb[MB_LEN_MAX]; + text_t t = *tp++; + if (t == NOCHAR) + continue; + + len = wctomb (mb, t); + + if (len <= 0) + { + mb[0] = ' '; + len = 1; + } + + fwrite (mb, 1, len, fd); + } + + fputc ('\n', fd); } + pclose_printer (fd); #endif } @@ -1824,58 +1938,35 @@ * drawn_text/drawn_rend contain the screen information before the update. * screen.text/screen.rend contain what the screen will change to. */ - -#define FONT_WIDTH(X, Y) \ - (X)->per_char[ (Y) - (X)->min_char_or_byte2].width -#define FONT_RBEAR(X, Y) \ - (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing -#define FONT_LBEAR(X, Y) \ - (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing -#define IS_FONT_CHAR(X, Y) \ - ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) - void rxvt_term::scr_refresh (unsigned char refresh_type) { - unsigned char clearfirst, /* first character writes before cell */ - clearlast, /* last character writes beyond cell */ - must_clear, /* use draw_string not draw_image_string */ - rvid, /* reverse video this position */ - showcursor; /* show the cursor */ - int16_t col, row, /* column/row we're processing */ - ocrow; /* old cursor row */ - int cursorwidth; - int i, /* tmp */ - row_offset; /* basic offset in screen structure */ + unsigned char must_clear, /* use draw_string not draw_image_string */ + showcursor; /* show the cursor */ + int16_t col, row, /* column/row we're processing */ + ocrow; /* old cursor row */ + int i; /* tmp */ #ifndef NO_CURSORCOLOR - rend_t cc1; /* store colours at cursor position (s) */ + rend_t cc1; /* store colours at cursor position (s) */ #endif - rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ - text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ + rend_t *crp; // cursor rendition pointer + + want_refresh = 0; /* screen is current */ - if (refresh_type == NO_REFRESH || !TermWin.mapped) + if (refresh_type == NO_REFRESH || !mapped) return; /* * A: set up vars */ - clearfirst = clearlast = must_clear = 0; - + must_clear = 0; refresh_count = 0; - row_offset = TermWin.saveLines - TermWin.view_start; - - if ((refresh_type & REFRESH_BOUNDS)) - { - clearfirst = clearlast = 1; - refresh_type &= ~REFRESH_BOUNDS; - } - -#ifdef XPM_BACKGROUND - must_clear |= (bgPixmap.pixmap != None); +#if XPM_BACKGROUND + must_clear |= bgPixmap.pixmap != None; #endif -#ifdef TRANSPARENT - must_clear |= ((Options & Opt_transparent) && am_transparent); +#if TRANSPARENT + must_clear |= OPTION (Opt_transparent) && am_transparent; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -1888,51 +1979,55 @@ * C: set the cursor character (s) */ { - unsigned char setoldcursor; - rend_t ccol1, /* Cursor colour */ - ccol2; /* Cursor colour2 */ + unsigned char setoldcursor; + rend_t ccol1, /* Cursor colour */ + ccol2; /* Cursor colour2 */ showcursor = (screen.flags & Screen_VisibleCursor); - cursorwidth = 0; #ifdef CURSOR_BLINK if (hidden_cursor) showcursor = 0; #endif - cursorwidth = 0; - if (showcursor) { - cursorwidth++; + int col = screen.cur.col; - srp = & (screen.rend[screen.cur.row + TermWin.saveLines] - [screen.cur.col]); + while (col && ROW(screen.cur.row).t[col] == NOCHAR) + col--; - if (showcursor && TermWin.focus) + crp = &ROW(screen.cur.row).r[col]; + + if (showcursor && focus) { - *srp ^= RS_RVid; -#ifndef NO_CURSORCOLOR - cc1 = *srp & (RS_fgMask | RS_bgMask); - if (ISSET_PIXCOLOR (Color_cursor)) - ccol1 = Color_cursor; + if (OPTION (Opt_cursorUnderline)) + *crp ^= RS_Uline; else + { + *crp ^= RS_RVid; + +#ifndef NO_CURSORCOLOR + cc1 = *crp & (RS_fgMask | RS_bgMask); + if (ISSET_PIXCOLOR (Color_cursor)) + ccol1 = Color_cursor; + else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol1 = GET_FGCOLOR (rstyle); + ccol1 = fgcolor_of (rstyle); #else - ccol1 = Color_fg; + ccol1 = Color_fg; #endif - if (ISSET_PIXCOLOR (Color_cursor2)) - ccol2 = Color_cursor2; - else + if (ISSET_PIXCOLOR (Color_cursor2)) + ccol2 = Color_cursor2; + else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol2 = GET_BGCOLOR (rstyle); + ccol2 = bgcolor_of (rstyle); #else - ccol2 = Color_bg; + ccol2 = Color_bg; #endif - *srp = SET_FGCOLOR (*srp, ccol1); - *srp = SET_BGCOLOR (*srp, ccol2); + *crp = SET_FGCOLOR (*crp, ccol1); + *crp = SET_BGCOLOR (*crp, ccol2); #endif - + } } } @@ -1940,75 +2035,76 @@ setoldcursor = 0; if (ocrow != -1) { - if (screen.cur.row + TermWin.view_start != ocrow + if (screen.cur.row - view_start != ocrow || screen.cur.col != oldcursor.col) { - if (ocrow < TermWin.nrow - && oldcursor.col < TermWin.ncol) - { - drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); - } - if (TermWin.focus || !showcursor) + if (ocrow < nrow + && oldcursor.col < ncol) + drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); + + if (focus || !showcursor) oldcursor.row = -1; else setoldcursor = 1; } } - else if (!TermWin.focus) + else if (!focus) setoldcursor = 1; + if (setoldcursor) { - if (screen.cur.row + TermWin.view_start >= TermWin.nrow) + if (screen.cur.row - view_start >= nrow) oldcursor.row = -1; else { - oldcursor.row = screen.cur.row + TermWin.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 + #ifndef NO_SLOW_LINK_SUPPORT /* * D: CopyArea pass - very useful for slower links * This has been deliberately kept simple. */ i = num_scr; - if (refresh_type == FAST_REFRESH && num_scr_allow && i - && abs (i) < TermWin.nrow && !must_clear) - { - int16_t nits; - int j; - rend_t *drp2; - text_t *dtp2; - int len, wlen; + if (!display->is_local + && refresh_type == FAST_REFRESH && num_scr_allow && num_scr + && abs (num_scr) < nrow && !must_clear) + { + int16_t nits; + int j; + int len, wlen; - j = TermWin.nrow; + j = nrow; wlen = len = -1; row = i > 0 ? 0 : j - 1; for (; j-- >= 0; row += (i > 0 ? 1 : -1)) { - if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) + if (row + i >= 0 && row + i < nrow && row + i != ocrow) { - stp = screen.text[row + row_offset]; - srp = screen.rend[row + row_offset]; - dtp = drawn_text[row]; - dtp2 = drawn_text[row + i]; - drp = drawn_rend[row]; - drp2 = drawn_rend[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 = TermWin.ncol; col--; ) - if (stp[col] != dtp2[col] || srp[col] != drp2[col]) + for (nits = 0, col = ncol; col--; ) + if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) nits--; - else if (stp[col] != dtp[col] || srp[col] != drp[col]) + else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) nits++; if (nits > 8) /* XXX: arbitrary choice */ { - for (col = TermWin.ncol; col--; ) + for (col = ncol; col--; ) { - *dtp++ = *dtp2++; - *drp++ = *drp2++; + *d.t++ = *d2.t++; + *d.r++ = *d2.r++; } if (len == -1) @@ -2023,12 +2119,11 @@ { /* also comes here at end if needed because of >= above */ if (wlen < len) - SWAP_IT (wlen, len, int); + ::swap (wlen, len); - D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); - XCopyArea (display->display, TermWin.vt, TermWin.vt, - TermWin.gc, 0, Row2Pixel (len + i), - (unsigned int)TermWin_TotalWidth (), + XCopyArea (display->display, vt, vt, + gc, 0, Row2Pixel (len + i), + (unsigned int)this->width, (unsigned int)Height2Pixel (wlen - len + 1), 0, Row2Pixel (len)); len = -1; @@ -2040,139 +2135,168 @@ /* * E: main pass across every character */ - for (row = 0; row < TermWin.nrow; row++) + for (row = 0; row < nrow; row++) { - stp = screen.text[row + row_offset]; - srp = screen.rend[row + row_offset]; - dtp = drawn_text[row]; - drp = drawn_rend[row]; + 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 */ int ypixel = (int)Row2Pixel (row); - for (col = 0; col < TermWin.ncol; col++) + for (col = 0; col < ncol; col++) { /* compare new text with old - if exactly the same then continue */ - rend_t rend = srp[col]; /* screen rendition (target rendtion) */ - if (stp[col] == dtp[col] /* Must match characters to skip. */ - && (rend == drp[col] /* Either rendition the same or */ + && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ || (stp[col] == ' ' /* space w/ no background change */ - && GET_BGATTR (rend) == GET_BGATTR (drp[col])))) + && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) continue; + // redraw one or more characters + + // seek to the beginning of wide characters + while (stp[col] == NOCHAR && col > 0) + --col; + + rend_t rend = srp[col]; /* screen rendition (target rendtion) */ text_t *text = stp + col; int count = 1; - /* redraw one or more characters */ - dtp[col] = stp[col]; drp[col] = rend; - if (*text == NOCHAR) // never start redrawing at invisible characters. */ - continue; - int xpixel = Col2Pixel (col); - // this loop looks very messy, it can probably be optimized - // and cleaned a bit by you? - for (i = 0; ++col < TermWin.ncol; ) + for (i = 0; ++col < ncol; ) { if (stp[col] == NOCHAR) { dtp[col] = stp[col]; drp[col] = rend; count++; - - if (i) // only possible skip if char unchanged - i++; + i++; continue; } - if (rend != srp[col]) + if (!RS_SAME (rend, srp[col])) break; count++; if (stp[col] != dtp[col] - || srp[col] != drp[col]) + || !RS_SAME (srp[col], drp[col])) { - if (must_clear && (i++ > (count / 2))) + if (must_clear && (i++ > count / 2)) break; dtp[col] = stp[col]; drp[col] = rend; i = 0; } - else if (must_clear || (stp[col] != ' ' && ++i >= 32)) + else if (must_clear || (stp[col] != ' ' && ++i >= 16)) break; } col--; /* went one too far. move back */ count -= i; /* dump any matching trailing chars */ + // sometimes we optimize away the trailing NOCHAR's, add them back + while (i && text[count] == NOCHAR) + count++, i--; + /* * Determine the attributes for the string */ - int fid = GET_FONT (rend); - int fore = GET_FGCOLOR (rend); // desired foreground - int back = GET_BGCOLOR (rend); // desired background - - rend = GET_ATTR (rend); + int fore = fgcolor_of (rend); // desired foreground + int back = bgcolor_of (rend); // desired background - rvid = !! (rend & RS_RVid); - if (rvid) + // 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)) { - SWAP_IT (fore, back, int); +#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]; + + // 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; +#endif + + bool invert = rend & RS_RVid; #ifndef NO_BOLD_UNDERLINE_REVERSE - if (ISSET_PIXCOLOR (Color_RV) -# ifndef NO_CURSORCOLOR - && !ISSET_PIXCOLOR (Color_cursor) + if (rend & RS_Bold + && fore == Color_fg) + { + if (ISSET_PIXCOLOR (Color_BD)) + fore = Color_BD; +# if !ENABLE_STYLES + else + invert = !invert; # endif - ) - back = Color_RV; + } + + if (rend & RS_Italic + && fore == Color_fg) + { + if (ISSET_PIXCOLOR (Color_IT)) + fore = Color_IT; +# if !ENABLE_STYLES + else + invert = !invert; +# endif + } + + if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) + fore = Color_UL; #endif - } + if (invert) + { + ::swap (fore, back); + +#ifndef NO_BOLD_UNDERLINE_REVERSE + if (ISSET_PIXCOLOR (Color_RV)) + back = Color_RV; + + if (fore == back) + { + fore = Color_bg; + back = Color_fg; + } +#endif + } + #ifdef TEXT_BLINK - if (rend & RS_Blink) - { - if (!text_blink_ev.active) + if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) { - text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); - hidden_text = 0; + if (!text_blink_ev.active) + { + text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); + hidden_text = 0; + } + else if (hidden_text) + fore = back; } - else if (hidden_text) - fore = back; - } #endif -#ifndef NO_BOLD_UNDERLINE_REVERSE - else if (rend & RS_Bold) - { - if (ISSET_PIXCOLOR (Color_BD)) - fore = Color_BD; - else if (fore == Color_fg) - fore = Color_White; - } - else if (rend & RS_Uline) - { - if (ISSET_PIXCOLOR (Color_UL)) - fore = Color_UL; } -#endif /* * Actually do the drawing of the string here */ - rxvt_font *font = (*TermWin.fontset)[fid]; + rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; if (back == fore) - font->clear_rect (xpixel, ypixel, - TermWin.fwidth * count, TermWin.fheight, + font->clear_rect (*drawable, xpixel, ypixel, + fwidth * count, fheight, back); else if (back == Color_bg) { @@ -2183,49 +2307,76 @@ for (i = 0; i < count; i++) /* don't draw empty strings */ if (text[i] != ' ') { - font->draw (xpixel, ypixel, text, count, fore, -1); + font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); break; } } else - font->draw (xpixel, ypixel, text, count, fore, Color_bg); + font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); } else - font->draw (xpixel, ypixel, text, count, fore, back); + font->draw (*drawable, xpixel, ypixel, text, count, fore, back); - if ((rend & RS_Uline) && (font->descent > 1)) - XDrawLine (display->display, drawBuffer, TermWin.gc, - xpixel, ypixel + font->ascent + 1, - xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); + if (rend & RS_Uline && font->descent > 1 && fore != back) + { +#if ENABLE_FRILLS + if (ISSET_PIXCOLOR (Color_underline)) + XSetForeground (display->display, gc, pix_colors[Color_underline]); + else +#endif + XSetForeground (display->display, gc, pix_colors[fore]); + + XDrawLine (display->display, drawBuffer, gc, + xpixel, ypixel + font->ascent + 1, + xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); + } } /* for (col....) */ } /* for (row....) */ +#if ENABLE_OVERLAY + scr_swap_overlay (); +#endif + HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); + /* * G: cleanup cursor and display outline cursor if necessary */ if (showcursor) { - if (TermWin.focus) + if (focus) { - srp = & (screen.rend[screen.cur.row + TermWin.saveLines] - [screen.cur.col]); - *srp ^= RS_RVid; + if (OPTION (Opt_cursorUnderline)) + *crp ^= RS_Uline; + else + { + *crp ^= RS_RVid; #ifndef NO_CURSORCOLOR - *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; + *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; #endif - + } } else if (oldcursor.row >= 0) { + int cursorwidth = 1; + int col = oldcursor.col; + + while (col && ROW(screen.cur.row).t[col] == NOCHAR) + col--; + + while (col + cursorwidth < ncol + && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) + cursorwidth++; + #ifndef NO_CURSORCOLOR if (ISSET_PIXCOLOR (Color_cursor)) - XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); + XSetForeground (display->display, gc, pix_colors[Color_cursor]); #endif - XDrawRectangle (display->display, drawBuffer, TermWin.gc, - Col2Pixel (oldcursor.col), - Row2Pixel (oldcursor.row), - (unsigned int) (Width2Pixel (cursorwidth) - 1), - (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); + + XDrawRectangle (display->display, drawBuffer, gc, + Col2Pixel (col), + Row2Pixel (oldcursor.row), + (unsigned int) (Width2Pixel (cursorwidth) - 1), + (unsigned int) (Height2Pixel (1) - lineSpace - 1)); } } @@ -2234,111 +2385,145 @@ */ scr_reverse_selection (); - /* - * I: other general cleanup - */ - if (clearfirst && TermWin.int_bwidth) - /* - * clear the whole screen height, note that width == 0 is treated - * specially by XClearArea - */ - XClearArea (display->display, TermWin.vt, 0, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight (), False); - if (clearlast && TermWin.int_bwidth) - /* - * clear the whole screen height, note that width == 0 is treated - * specially by XClearArea - */ - XClearArea (display->display, TermWin.vt, - TermWin.width + TermWin.int_bwidth, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight (), False); - if (refresh_type & SMOOTH_REFRESH) - XSync (display->display, False); - num_scr = 0; num_scr_allow = 1; - want_refresh = 0; /* screen is current */ } void -rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) +rxvt_term::scr_remap_chars (line_t &l) { - if (!rp || !tp) + if (!l.t) return; - for (int i = TermWin.ncol; i; i--, rp++, tp++) - *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); + 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 () { - for (int i = TermWin.nrow + TermWin.saveLines; i--; ) - scr_remap_chars (screen.text[i], screen.rend[i]); + for (int i = total_rows; i--; ) + scr_remap_chars (row_buf [i]); + + for (int i = nrow; i--; ) + { + scr_remap_chars (drawn_buf [i]); + scr_remap_chars (swap_buf [i]); + } +} - for (int i = TermWin.nrow; i--; ) +void +rxvt_term::scr_recolour () +{ + if (1 +#if TRANSPARENT + && !am_transparent +#endif +#if XPM_BACKGROUND + && !bgPixmap.pixmap +#endif + ) { - scr_remap_chars (drawn_text[i], drawn_rend[i]); - scr_remap_chars (swap.text[i], swap.rend[i]); + XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); + XClearWindow (display->display, parent[0]); + XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); +#if HAVE_SCROLLBARS + if (scrollBar.win) + { + XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); + scrollBar.setIdle (); + scrollbar_show (0); + } +#endif } + + scr_clear (); + scr_touch (true); + want_refresh = 1; } /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_clear () +rxvt_term::scr_clear (bool really) { - if (!TermWin.mapped) + if (!mapped) return; num_scr_allow = 0; want_refresh = 1; -#ifdef TRANSPARENT - if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) + + if (really) + 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) +{ + int view_end = view_start + nrow; + int row, col; + + for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) { - int i; + text_t *stp = ROW(row).t; + rend_t *srp = ROW(row).r; - if (! (Options & Opt_transparent_all)) - i = 0; - else - i = (int) (sizeof (TermWin.parent) / sizeof (Window)); + for (col = beg_col; col < end_col; col++) + srp[col] ^= rstyle1; - while (i--) - if (TermWin.parent[i] != None) - XClearWindow (display->display, TermWin.parent[i]); + while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) + srp[col] ^= rstyle2; + + if (++col < end_col) + srp[col] ^= rstyle2; } -#endif +} + +void +rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) +{ + 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; - XClearWindow (display->display, TermWin.vt); + if (row == end_row) + for (rend_t *srp = ROW(row).r; col < end_col; col++) + srp[col] ^= rstyle; } /* ------------------------------------------------------------------------- */ void rxvt_term::scr_reverse_selection () { - int i, col, row, end_row; - rend_t *srp; - - if (selection.op && current_screen == selection.screen) - { - end_row = TermWin.saveLines - TermWin.view_start; - i = selection.beg.row + TermWin.saveLines; - row = selection.end.row + TermWin.saveLines; - if (i >= end_row) - col = selection.beg.col; + if (selection.op + && current_screen == selection.screen + && selection.end.row >= view_start) + { +#if ENABLE_FRILLS + if (selection.rect) + scr_xor_rect (selection.beg.row, selection.beg.col, + selection.end.row, selection.end.col, + RS_RVid, RS_RVid | RS_Uline); else - { - col = 0; - i = end_row; - } - end_row += TermWin.nrow; - for (; i < row && i < end_row; i++, col = 0) - for (srp = screen.rend[i]; col < TermWin.ncol; col++) - srp[col] ^= RS_RVid; - if (i == row && i < end_row) - for (srp = screen.rend[i]; col < selection.end.col; col++) - srp[col] ^= RS_RVid; +#endif + scr_xor_span (selection.beg.row, selection.beg.col, + selection.end.row, selection.end.col, + RS_RVid); } } @@ -2355,19 +2540,19 @@ unsigned int width, towrite; char r1[] = "\n"; - for (row = TermWin.saveLines - TermWin.nscrolled; - row < TermWin.saveLines + TermWin.nrow - 1; row++) + for (row = saveLines - nsaved; + row < saveLines + nrow - 1; row++) { - width = screen.tlen[row] >= 0 ? screen.tlen[row] - : TermWin.ncol; + width = row_buf[row].l >= 0 ? row_buf[row].l + : ncol; for (towrite = width; towrite; towrite -= wrote) { - wrote = write (fd, & (screen.text[row][width - towrite]), + wrote = write (fd, & (row_buf[row].t[width - towrite]), towrite); if (wrote < 0) return; /* XXX: death, no report */ } - if (screen.tlen[row] >= 0) + if (row_buf[row].l >= 0) if (write (fd, r1, 1) <= 0) return; /* XXX: death, no report */ } @@ -2377,25 +2562,18 @@ /* ------------------------------------------------------------------------- * * CHARACTER SELECTION * * ------------------------------------------------------------------------- */ - -/* - * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 - */ void rxvt_term::selection_check (int check_more) { - row_col_t pos; + row_col_t pos; if (!selection.op) return; pos.row = pos.col = 0; - if ((selection.beg.row < - (int32_t)TermWin.nscrolled) - || (selection.beg.row >= TermWin.nrow) - || (selection.mark.row < - (int32_t)TermWin.nscrolled) - || (selection.mark.row >= TermWin.nrow) - || (selection.end.row < - (int32_t)TermWin.nscrolled) - || (selection.end.row >= TermWin.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) @@ -2407,7 +2585,7 @@ && ROWCOL_IS_AFTER (selection.end, pos)) || (check_more == 4 /* screen width change */ && (selection.beg.row != selection.end.row - || selection.end.col > TermWin.ncol))) + || selection.end.col > ncol))) CLEAR_SELECTION (); } @@ -2416,30 +2594,14 @@ * Paste a selection direct to the command fd */ void -rxvt_term::paste (const unsigned char *data, unsigned int len) +rxvt_term::paste (char *data, unsigned int len) { - unsigned int i, j, n; - unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); - -#if 0 - /* a paste should act like the user is typing, so check scrollTtyKeypress */ - ZERO_SCROLLBACK (r); -#endif - /* convert normal newline chars into common keyboard Return key sequence */ - for (i = 0; i < len; i += PROP_SIZE) - { - n = min (len - i, PROP_SIZE); - MEMCPY (ds, data + i, n); - - for (j = 0; j < n; j++) - if (ds[j] == '\n') - ds[j] = '\r'; - - tt_write (ds, (int)n); - } + for (unsigned int i = 0; i < len; i++) + if (data[i] == C0_LF) + data[i] = C0_CR; - free (ds); + tt_write (data, len); } /* ------------------------------------------------------------------------- */ @@ -2447,15 +2609,9 @@ * Respond to a notification that a primary selection has been sent * EXT: SelectionNotify */ -int +void rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) { - long nread = 0; - unsigned long bytes_after; - XTextProperty ct; - - D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); - if (prop == None) /* check for failed XConvertSelection */ { if ((selection_type & Sel_CompoundText)) @@ -2478,76 +2634,141 @@ selection_type = 0; } - return 0; + return; } - for (;;) + unsigned long bytes_after; + XTextProperty ct; + + if (XGetWindowProperty (display->display, win, prop, + 0, PROP_SIZE / 4, + delete_prop, AnyPropertyType, + &ct.encoding, &ct.format, + &ct.nitems, &bytes_after, + &ct.value) != Success) { - if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), - (long) (PROP_SIZE / 4), delete_prop, - AnyPropertyType, &ct.encoding, &ct.format, - &ct.nitems, &bytes_after, - &ct.value) != Success) - break; + ct.value = 0; + goto bailout; + } - if (ct.encoding == 0) - { - D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); - break; - } + if (ct.encoding == None) + goto bailout; + + if (bytes_after) + { + // fetch and append remaining data + XTextProperty ct2; + + if (XGetWindowProperty (display->display, win, prop, + ct.nitems / 4, (bytes_after + 3) / 4, + delete_prop, AnyPropertyType, + &ct2.encoding, &ct2.format, + &ct2.nitems, &bytes_after, + &ct2.value) != Success) + goto bailout; - if (ct.value == NULL) + // realloc should be compatible to XFree, here, and elsewhere, too + ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); + memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); + ct.nitems += ct2.nitems; + + XFree (ct2.value); + } + + if (ct.value == 0) + goto bailout; + + if (ct.encoding == xa[XA_INCR]) + { + // INCR selection, start handshake + if (!delete_prop) + XDeleteProperty (display->display, win, prop); + + selection_wait = Sel_incr; + incr_buf_fill = 0; + incr_ev.start (NOW + 10); + + goto bailout; + } + + if (ct.nitems == 0) + { + if (selection_wait == Sel_incr) { - D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); - continue; - } + XFree (ct.value); - if (ct.nitems == 0) + // finally complete, now paste the whole thing + selection_wait = Sel_normal; + ct.value = (unsigned char *)incr_buf; + ct.nitems = incr_buf_fill; + incr_buf = 0; + incr_buf_size = 0; + incr_ev.stop (); + } + else { - D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); - if (selection_wait == Sel_normal && nread == 0) + if (selection_wait == Sel_normal + && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion { /* * pass through again trying CUT_BUFFER0 if we've come from * XConvertSelection () but nothing was presented */ - D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); selection_paste (display->root, XA_CUT_BUFFER0, False); } - nread = -1; /* discount any previous stuff */ - break; + goto bailout; } + } + else if (selection_wait == Sel_incr) + { + incr_ev.start (NOW + 10); - nread += ct.nitems; - - char **cl; - int cr; - if (XmbTextPropertyToTextList (display->display, &ct, &cl, - &cr) >= 0 && cl) + while (incr_buf_fill + ct.nitems > incr_buf_size) { - for (int i = 0; i < cr; i++) - paste ((unsigned char *)cl[i], STRLEN (cl[i])); - - XFreeStringList (cl); + incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; + incr_buf = (char *)realloc (incr_buf, incr_buf_size); } - else - paste (ct.value, ct.nitems); - if (bytes_after == 0) - break; + memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); + incr_buf_fill += ct.nitems; - XFree (ct.value); + goto bailout; + } + + char **cl; + int cr; + +#if ENABLE_FRILLS + // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it + // so recode it manually + if (ct.encoding == xa[XA_UTF8_STRING]) + { + wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); + char *s = rxvt_wcstombs (w); + free (w); + // TODO: strlen == only the first element will be converted. well... + paste (s, strlen (s)); + free (s); } + else +#endif + if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 + && cl) + { + for (int i = 0; i < cr; i++) + paste (cl[i], strlen (cl[i])); - if (ct.value) - XFree (ct.value); + XFreeStringList (cl); + } + else + paste ((char *)ct.value, ct.nitems); // paste raw + +bailout: + XFree (ct.value); if (selection_wait == Sel_normal) selection_wait = Sel_none; - - D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); - return (int)nread; } void @@ -2555,59 +2776,21 @@ { selection_wait = Sel_none; - rxvt_print_error ("data loss: timeout on INCR selection paste"); + incr_buf_size = 0; + free (incr_buf); + + rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); } -/* - * INCR support originally provided by Paul Sheer - */ void rxvt_term::selection_property (Window win, Atom prop) { - int reget_time = 0; - - if (prop == None) + if (prop == None || selection_wait != Sel_incr) return; - D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); - if (selection_wait == Sel_normal) - { - int a, afmt; - Atom atype; - unsigned long bytes_after, nitems; - unsigned char *s = NULL; - - a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, - xa[XA_INCR], &atype, &afmt, &nitems, - &bytes_after, &s); - if (s) - XFree (s); - if (a != Success) - return; -#ifndef __CYGWIN32__ - if (atype == xa[XA_INCR]) - { /* start an INCR transfer */ - D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); - XDeleteProperty (display->display, win, prop); - XFlush (display->display); - reget_time = 1; - selection_wait = Sel_incr; - } -#endif - } - else if (selection_wait == Sel_incr) - { - reget_time = 1; - if (selection_paste (win, prop, True) == -1) - { - D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); - selection_wait = Sel_none; - incr_ev.stop (); - } - } - if (reget_time) /* received more data so reget time */ - incr_ev.start (NOW + 10); + selection_paste (win, prop, true); } + /* ------------------------------------------------------------------------- */ /* * Request the current selection: @@ -2621,22 +2804,23 @@ void rxvt_term::selection_request (Time tm, int x, int y) { - D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); - if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) + if (x < 0 || x >= width || y < 0 || y >= height) return; /* outside window */ - if (selection.text != NULL) - { /* internal selection */ - D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); - paste (selection.text, selection.len); + if (selection.text) + { /* internal selection */ + char *str = rxvt_wcstombs (selection.text, selection.len); + paste (str, strlen (str)); + free (str); return; } else { - int i; + int i; selection_request_time = tm; selection_wait = Sel_normal; + for (i = Sel_Primary; i <= Sel_Clipboard; i++) { #if X_HAVE_UTF8_STRING @@ -2648,36 +2832,34 @@ if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) return; #endif - } } - selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ - D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); - selection_paste (display->root, XA_CUT_BUFFER0, False); + + selection_wait = Sel_none; /* don't loop in selection_paste () */ + selection_paste (display->root, XA_CUT_BUFFER0, false); } int rxvt_term::selection_request_other (Atom target, int selnum) { - Atom sel; -#ifdef DEBUG_SELECT - char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; -#endif + Atom sel; selection_type |= selnum; + if (selnum == Sel_Primary) sel = XA_PRIMARY; else if (selnum == Sel_Secondary) sel = XA_SECONDARY; else sel = xa[XA_CLIPBOARD]; + if (XGetSelectionOwner (display->display, sel) != None) { - D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], - TermWin.vt, selection_request_time); + vt, selection_request_time); return 1; } + return 0; } @@ -2689,14 +2871,14 @@ void rxvt_term::selection_clear () { - D_SELECT ((stderr, "rxvt_selection_clear ()")); - want_refresh = 1; - if (selection.text) - free (selection.text); + free (selection.text); selection.text = NULL; selection.len = 0; CLEAR_SELECTION (); + + if (display->selection_owner == this) + display->selection_owner = 0; } /* ------------------------------------------------------------------------- */ @@ -2707,15 +2889,10 @@ void rxvt_term::selection_make (Time tm) { - int i, col, end_col, row, end_row; - unsigned char *new_selection_text; - char *str; - text_t *t; -#ifdef ACS_ASCII - rend_t *re; -#endif + int i; + wchar_t *new_selection_text; + text_t *t; - D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); switch (selection.op) { case SELECTION_CONT: @@ -2729,100 +2906,139 @@ default: return; } + selection.op = SELECTION_DONE; if (selection.clicks == 4) return; /* nothing selected, go away */ - i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; - str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); + 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)); - new_selection_text = (unsigned char *)str; + int ofs = 0; + int extra = 0; - col = selection.beg.col; - MAX_IT (col, 0); - row = selection.beg.row + TermWin.saveLines; - end_row = selection.end.row + TermWin.saveLines; + int col = selection.beg.col; + int row = selection.beg.row; - for (; row <= end_row; row++, col = 0) + int end_col; + + for (; row <= selection.end.row; row++, col = 0) { - t = & (screen.text[row][col]); +#if ENABLE_FRILLS + if (selection.rect) + { + col = selection.beg.col; + end_col = ncol + 1; + } + else +#endif + end_col = ROW(row).l; - end_col = screen.tlen[row]; + col = max (col, 0); - if (end_col == -1) - end_col = TermWin.ncol; + if (row == selection.end.row +#if ENABLE_FRILLS + || selection.rect +#endif + ) + min_it (end_col, selection.end.col); - if (row == end_row) - MIN_IT (end_col, selection.end.col); + t = ROW(row).t + col; for (; col < end_col; col++) - if (*t == NOCHAR) - t++; - else - { - int len = wctomb (str, *t++); - if (len > 0) - str += len; - } + { + if (*t == NOCHAR) + t++; +#if ENABLE_COMBINING + else if (IS_COMPOSE (*t)) + { + int len = rxvt_composite.expand (*t, 0); - if (screen.tlen[row] != -1 && row != end_row) - *str++ = '\n'; - } + extra -= (len - 1); -#ifndef NO_OLD_SELECTION - if (selection_style == OLD_SELECT) - if (end_col == TermWin.ncol) - *str++ = '\n'; + if (extra < 0) + { + extra += i; + i += i; + new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); + } + + ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); + } #endif -#ifndef NO_NEW_SELECTION - if (selection_style != OLD_SELECT) - if (end_col != selection.end.col) - *str++ = '\n'; + else + new_selection_text[ofs++] = *t++; + } + +#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 - *str = '\0'; + if (!ROW(row).is_longer () && row != selection.end.row) + new_selection_text[ofs++] = C0_LF; + } + + if (end_col != selection.end.col) + new_selection_text[ofs++] = C0_LF; - i = str - (char *)new_selection_text; - if (i == 0) + new_selection_text[ofs] = 0; + + if (ofs == 0) { free (new_selection_text); return; } - // due to MB_MAX_CUR, selection wastage is usually high, so realloc - if (str - (char *)new_selection_text > 1024) - new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); + free (selection.text); - selection.len = i; + // we usually allocate much more than necessary, so realloc it smaller again + selection.len = ofs; + selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); - if (selection.text) - free (selection.text); + if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) + return; - selection.text = new_selection_text; + selection_grab (tm); +} - XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); - if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) - display->set_selection_owner (this); - else - rxvt_print_error ("can't get primary selection"); +bool +rxvt_term::selection_grab (Time tm) +{ + selection_time = tm; - { - XTextProperty ct; - char *cl = (char *)selection.text; + XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); + if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) + { + display->set_selection_owner (this); + return true; + } + else + { + selection_clear (); + return false; + } - if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) - { - XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, ct.value, ct.nitems); - XFree (ct.value); - } - else - XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, selection.text, (int)selection.len); - } +#if 0 + XTextProperty ct; - selection_time = tm; - D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); + if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) + { + set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); + XFree (ct.value); + } +#endif } /* ------------------------------------------------------------------------- */ @@ -2833,16 +3049,23 @@ void rxvt_term::selection_click (int clicks, int x, int y) { - D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); - 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 + TermWin.view_start, + selection.mark.row - view_start, 0, /* button 3 */ 1, /* button press */ 0); /* click change */ @@ -2856,18 +3079,23 @@ rxvt_term::selection_start_colrow (int col, int row) { want_refresh = 1; + + selection.mark.row = row + view_start; selection.mark.col = col; - selection.mark.row = row - TermWin.view_start; - MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); - MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); - MAX_IT (selection.mark.col, 0); - MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 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 + && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) + --selection.mark.col; + if (selection.op) { /* clear the old selection */ selection.beg.row = selection.end.row = selection.mark.row; selection.beg.col = selection.end.col = selection.mark.col; } + selection.op = SELECTION_INIT; selection.screen = current_screen; } @@ -2879,74 +3107,70 @@ */ /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ -#define DELIMIT_TEXT(x) \ - (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) +#define DELIMIT_TEXT(x) \ + (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) #define DELIMIT_REND(x) 1 void rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) { - int col, row, dirnadd, tcol, trow, w1, w2; - row_col_t bound; - text_t *stp; - rend_t *srp; + int col, row, dirnadd, tcol, trow, w1, w2; + row_col_t bound; + text_t *stp; + rend_t *srp; if (dirn == UP) { - bound.row = TermWin.saveLines - TermWin.nscrolled - 1; + bound.row = top_row - 1; bound.col = 0; dirnadd = -1; } else { - bound.row = TermWin.saveLines + TermWin.nrow; - bound.col = TermWin.ncol - 1; + bound.row = nrow; + bound.col = ncol - 1; dirnadd = 1; } - row = mark->row + TermWin.saveLines; - col = mark->col; - MAX_IT (col, 0); - /* find the edge of a word */ - stp = & (screen.text[row][col]); - w1 = DELIMIT_TEXT (*stp); - if (selection_style != NEW_SELECT) - { - if (w1 == 1) - { - stp += dirnadd; - if (DELIMIT_TEXT (*stp) == 1) - goto Old_Word_Selection_You_Die; - col += dirnadd; - } - w1 = 0; - } - srp = (&screen.rend[row][col]); - w2 = DELIMIT_REND (*srp); + row = mark->row; + col = max (mark->col, 0); + + /* find the edge of a word */ + stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp); + srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp); for (;;) { for (; col != bound.col; col += dirnadd) { stp += dirnadd; + srp += dirnadd; + + if (*stp == NOCHAR) + continue; + if (DELIMIT_TEXT (*stp) != w1) break; - srp += dirnadd; if (DELIMIT_REND (*srp) != w2) break; } + if ((col == bound.col) && (row != bound.row)) { - if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) + if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ()) { trow = row + dirnadd; - tcol = dirn == UP ? TermWin.ncol - 1 : 0; - if (screen.text[trow] == NULL) + tcol = dirn == UP ? ncol - 1 : 0; + + if (!ROW(trow).t) break; - stp = & (screen.text[trow][tcol]); - srp = & (screen.rend[trow][tcol]); + + stp = ROW(trow).t + tcol; + srp = ROW(trow).r + tcol; + if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) break; + row = trow; col = tcol; continue; @@ -2954,14 +3178,12 @@ } break; } -Old_Word_Selection_You_Die: - D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); if (dirn == DN) col++; /* put us on one past the end */ /* Poke the values back in */ - ret->row = row - TermWin.saveLines; + ret->row = row; ret->col = col; } @@ -2976,38 +3198,27 @@ void rxvt_term::selection_extend (int x, int y, int flag) { - int col, row; - - col = Pixel2Col (x); - row = Pixel2Row (y); - MAX_IT (row, 0); - MIN_IT (row, (int)TermWin.nrow - 1); - MAX_IT (col, 0); - MIN_IT (col, (int)TermWin.ncol); + int col = clamp (Pixel2Col (x), 0, ncol); + int row = clamp (Pixel2Row (y), 0, nrow - 1); -#ifndef NO_NEW_SELECTION /* * If we're selecting characters (single click) then we must check first * if we are at the same place as the original mark. If we are then * select nothing. Otherwise, if we're to the right of the mark, you have to * be _past_ a character for it to be selected. */ - if (selection_style != OLD_SELECT) - { - if (((selection.clicks % 3) == 1) && !flag - && (col == selection.mark.col - && (row == selection.mark.row + TermWin.view_start))) - { - /* select nothing */ - selection.beg.row = selection.end.row = 0; - selection.beg.col = selection.end.col = 0; - selection.clicks = 4; - want_refresh = 1; - D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); - return; - } + if (((selection.clicks % 3) == 1) && !flag + && (col == selection.mark.col + && (row == selection.mark.row - view_start))) + { + /* select nothing */ + selection.beg.row = selection.end.row = 0; + selection.beg.col = selection.end.col = 0; + selection.clicks = 4; + want_refresh = 1; + return; } -#endif + if (selection.clicks == 4) selection.clicks = 1; @@ -3023,17 +3234,13 @@ void rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) { - int16_t ncol = TermWin.ncol; - int end_col; - row_col_t pos; + row_col_t pos; enum { LEFT, RIGHT } closeto = RIGHT; - D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); - D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); - want_refresh = 1; + switch (selection.op) { case SELECTION_INIT: @@ -3056,6 +3263,7 @@ default: return; } + if (selection.beg.col == selection.end.col && selection.beg.col != selection.mark.col && selection.beg.row == selection.end.row @@ -3063,75 +3271,11 @@ { selection.beg.col = selection.end.col = selection.mark.col; selection.beg.row = selection.end.row = selection.mark.row; - D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); } pos.col = col; - pos.row = row; - - pos.row -= TermWin.view_start; /* adjust for scroll */ + pos.row = view_start + row; -#ifndef NO_OLD_SELECTION - /* - * This mimics some of the selection behaviour of version 2.20 and before. - * There are no ``selection modes'', button3 is always character extension. - * Note: button3 drag is always available, c.f. v2.20 - * Selection always terminates (left or right as appropriate) at the mark. - */ - if (selection_style == OLD_SELECT) - { - if (selection.clicks == 1 || button3) - { - if (hate_those_clicks) - { - hate_those_clicks = 0; - if (selection.clicks == 1) - { - selection.beg.row = selection.mark.row; - selection.beg.col = selection.mark.col; - } - else - { - selection.mark.row = selection.beg.row; - selection.mark.col = selection.beg.col; - } - } - if (ROWCOL_IS_BEFORE (pos, selection.mark)) - { - selection.end.row = selection.mark.row; - selection.end.col = selection.mark.col + 1; - selection.beg.row = pos.row; - selection.beg.col = pos.col; - } - else - { - selection.beg.row = selection.mark.row; - selection.beg.col = selection.mark.col; - selection.end.row = pos.row; - selection.end.col = pos.col + 1; - } - } - else if (selection.clicks == 2) - { - selection_delimit_word (UP, & (selection.mark), - & (selection.beg)); - selection_delimit_word (DN, & (selection.mark), - & (selection.end)); - hate_those_clicks = 1; - } - else if (selection.clicks == 3) - { - selection.beg.row = selection.end.row = selection.mark.row; - selection.beg.col = 0; - selection.end.col = ncol; - hate_those_clicks = 1; - } - D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); - return; - } -#endif /* ! NO_OLD_SELECTION */ -#ifndef NO_NEW_SELECTION - /* selection_style must not be OLD_SELECT to get here */ /* * This is mainly xterm style selection with a couple of differences, mainly * in the way button3 drag extension works. @@ -3146,7 +3290,7 @@ * time of the most recent button3 press */ if (button3 && buttonpress) - { /* button3 press */ + { /* button3 press */ /* * first determine which edge of the selection we are closest to */ @@ -3157,13 +3301,13 @@ < ((selection.end.col - pos.col) + ((selection.end.row - pos.row) * ncol))))) closeto = LEFT; + if (closeto == LEFT) { selection.beg.row = pos.row; selection.beg.col = pos.col; selection.mark.row = selection.end.row; - selection.mark.col = selection.end.col - - (selection.clicks == 2); + selection.mark.col = selection.end.col - (selection.clicks == 2); } else { @@ -3174,18 +3318,19 @@ } } else - { /* button1 drag or button3 drag */ + { /* button1 drag or button3 drag */ if (ROWCOL_IS_AFTER (selection.mark, pos)) { - if ((selection.mark.row == selection.end.row) - && (selection.mark.col == selection.end.col) - && clickchange && selection.clicks == 2) + if (selection.mark.row == selection.end.row + && selection.mark.col == selection.end.col + && clickchange + && selection.clicks == 2) selection.mark.col--; + selection.beg.row = pos.row; selection.beg.col = pos.col; selection.end.row = selection.mark.row; - selection.end.col = selection.mark.col - + (selection.clicks == 2); + selection.end.col = selection.mark.col + (selection.clicks == 2); } else { @@ -3198,52 +3343,44 @@ if (selection.clicks == 1) { - end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; - if (end_col != -1 && selection.beg.col > end_col) - { -#if 1 - selection.beg.col = ncol; -#else - if (selection.beg.row != selection.end.row) - selection.beg.col = ncol; - else - selection.beg.col = selection.mark.col; + if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN + && !ROW(selection.beg.row).is_longer () +#if ENABLE_FRILLS + && !selection.rect +#endif + ) + selection.beg.col = ncol; + + if ( + selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN + && !ROW(selection.end.row).is_longer () +#if ENABLE_FRILLS + && !selection.rect #endif - - } - end_col = screen.tlen[selection.end.row + TermWin.saveLines]; - if (end_col != -1 && selection.end.col > end_col) + ) selection.end.col = ncol; - } else if (selection.clicks == 2) { if (ROWCOL_IS_AFTER (selection.end, selection.beg)) selection.end.col--; - selection_delimit_word (UP, & (selection.beg), - & (selection.beg)); - selection_delimit_word (DN, & (selection.end), - & (selection.end)); + + selection_delimit_word (UP, &selection.beg, &selection.beg); + selection_delimit_word (DN, &selection.end, &selection.end); } else if (selection.clicks == 3) { -#ifndef NO_FRILLS - if ((Options & Opt_tripleclickwords)) +#if ENABLE_FRILLS + if (OPTION (Opt_tripleclickwords)) { - int end_row; + selection_delimit_word (UP, &selection.beg, &selection.beg); - selection_delimit_word (UP, & (selection.beg), - & (selection.beg)); - end_row = screen.tlen[selection.mark.row - + TermWin.saveLines]; - for (end_row = selection.mark.row; end_row < TermWin.nrow; - end_row++) + for (int end_row = selection.mark.row; end_row < nrow; end_row++) { - end_col = screen.tlen[end_row + TermWin.saveLines]; - if (end_col != -1) + if (!ROW(end_row).is_longer ()) { selection.end.row = end_row; - selection.end.col = end_col; + selection.end.col = ROW(end_row).l; selection_remove_trailing_spaces (); break; } @@ -3251,21 +3388,30 @@ } else #endif - { if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) selection.mark.col++; + selection.beg.col = 0; selection.end.col = ncol; + + // select a complete logical line + while (selection.beg.row > -saveLines + && ROW(selection.beg.row - 1).is_longer ()) + selection.beg.row--; + + while (selection.end.row < nrow + && ROW(selection.end.row).is_longer ()) + selection.end.row++; } } + if (button3 && buttonpress) - { /* mark may need to be changed */ + { /* mark may need to be changed */ if (closeto == LEFT) { selection.mark.row = selection.end.row; - selection.mark.col = selection.end.col - - (selection.clicks == 2); + selection.mark.col = selection.end.col - (selection.clicks == 2); } else { @@ -3273,37 +3419,46 @@ selection.mark.col = selection.beg.col; } } - D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); -#endif /* ! NO_NEW_SELECTION */ + +#if ENABLE_FRILLS + if (selection.rect && selection.beg.col > selection.end.col) + ::swap (selection.beg.col, selection.end.col); +#endif } -#ifndef NO_FRILLS +#if ENABLE_FRILLS void rxvt_term::selection_remove_trailing_spaces () { - int32_t end_col, end_row; - text_t *stp; + int32_t end_col, end_row; + text_t *stp; end_col = selection.end.col; end_row = selection.end.row; - for ( ; end_row >= selection.beg.row; ) + + for (; end_row >= selection.beg.row; ) { - stp = screen.text[end_row + TermWin.saveLines]; + stp = ROW(end_row).t; + while (--end_col >= 0) { - if (stp[end_col] != ' ' && stp[end_col] != '\t') + if (stp[end_col] != NOCHAR + && !unicode::is_space (stp[end_col])) break; } + if (end_col >= 0 - || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) + || !ROW(end_row - 1).is_longer ()) { selection.end.col = end_col + 1; selection.end.row = end_row; break; } + end_row--; - end_col = TermWin.ncol; + end_col = ncol; } + if (selection.mark.row > selection.end.row) { selection.mark.row = selection.end.row; @@ -3329,14 +3484,6 @@ /* ------------------------------------------------------------------------- */ /* - * On some systems, the Atom typedef is 64 bits wide. We need to have a type - * that is exactly 32 bits wide, because a format of 64 is not allowed by - * the X11 protocol. - */ -typedef CARD32 Atom32; - -/* ------------------------------------------------------------------------- */ -/* * Respond to a request for our current selection * EXT: SelectionRequest */ @@ -3344,9 +3491,7 @@ rxvt_term::selection_send (const XSelectionRequestEvent &rq) { XSelectionEvent ev; - XTextProperty ct; - XICCEncodingStyle style; - Atom target; + dDisp; ev.type = SelectionNotify; ev.property = None; @@ -3358,31 +3503,33 @@ if (rq.target == xa[XA_TARGETS]) { - Atom32 target_list[5]; - Atom32 *target = target_list; + Atom target_list[6]; + Atom *target = target_list; - *target++ = (Atom32) xa[XA_TARGETS]; - *target++ = (Atom32) XA_STRING; - *target++ = (Atom32) xa[XA_TEXT]; - *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; + *target++ = xa[XA_TARGETS]; + *target++ = xa[XA_TIMESTAMP]; + *target++ = XA_STRING; + *target++ = xa[XA_TEXT]; + *target++ = xa[XA_COMPOUND_TEXT]; #if X_HAVE_UTF8_STRING - *target++ = (Atom32) xa[XA_UTF8_STRING]; + *target++ = xa[XA_UTF8_STRING]; #endif - XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, - (8 * sizeof (target_list[0])), PropModeReplace, - (unsigned char *)target_list, - target - target_list); + + XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, + 32, PropModeReplace, + (unsigned char *)target_list, target - target_list); ev.property = rq.property; } +#if TODO // TODO else if (rq.target == xa[XA_MULTIPLE]) { /* TODO: Handle MULTIPLE */ } +#endif else if (rq.target == xa[XA_TIMESTAMP] && selection.text) { - XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, - (8 * sizeof (Time)), PropModeReplace, - (unsigned char *)&selection_time, 1); + XChangeProperty (disp, rq.requestor, rq.property, rq.target, + 32, PropModeReplace, (unsigned char *)&selection_time, 1); ev.property = rq.property; } else if (rq.target == XA_STRING @@ -3391,59 +3538,84 @@ || rq.target == xa[XA_UTF8_STRING] ) { + XTextProperty ct; + Atom target = rq.target; short freect = 0; int selectlen; - char *cl; - - target = rq.target; + wchar_t *cl; + enum { + enc_string = XStringStyle, + enc_text = XStdICCTextStyle, + enc_compound_text = XCompoundTextStyle, +#ifdef X_HAVE_UTF8_STRING + enc_utf8 = XUTF8StringStyle, +#else + enc_utf8 = -1, +#endif + } style; if (target == XA_STRING) // we actually don't do XA_STRING, but who cares, as i18n clients // will ask for another format anyways. - style = XStringStyle; + style = enc_string; else if (target == xa[XA_TEXT]) - style = XTextStyle; + style = enc_text; else if (target == xa[XA_COMPOUND_TEXT]) - style = XCompoundTextStyle; -#if X_HAVE_UTF8_STRING + style = enc_compound_text; +#if ENABLE_FRILLS else if (target == xa[XA_UTF8_STRING]) - style = XUTF8StringStyle; + style = enc_utf8; #endif else { target = xa[XA_COMPOUND_TEXT]; - style = XCompoundTextStyle; + style = enc_compound_text; } if (selection.text) { - cl = (char *)selection.text; + cl = selection.text; selectlen = selection.len; } else { - cl = ""; + cl = L""; selectlen = 0; } - if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) +#if ENABLE_FRILLS + // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it + // so recode it manually + if (style == enc_utf8) + { + freect = 1; + ct.encoding = target; + ct.format = 8; + ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); + ct.nitems = strlen ((char *)ct.value); + } + else +#endif + if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) freect = 1; else { /* if we failed to convert then send it raw */ ct.value = (unsigned char *)cl; ct.nitems = selectlen; + ct.encoding = target; } - XChangeProperty (display->display, rq.requestor, rq.property, - target, 8, PropModeReplace, + XChangeProperty (disp, rq.requestor, rq.property, + ct.encoding, 8, PropModeReplace, ct.value, (int)ct.nitems); ev.property = rq.property; if (freect) XFree (ct.value); } - XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); + + XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); } /* ------------------------------------------------------------------------- * @@ -3457,69 +3629,157 @@ rxvt_term::pixel_position (int *x, int *y) { *x = Pixel2Col (*x); - /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ + /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ *y = Pixel2Row (*y); - /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ + /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ } /* ------------------------------------------------------------------------- */ #ifdef USE_XIM void -rxvt_term::im_set_position (XPoint *pos) +rxvt_term::im_set_position (XPoint &pos) { XWindowAttributes xwa; - XGetWindowAttributes (display->display, TermWin.vt, &xwa); - pos->x = Col2Pixel (screen.cur.col) + xwa.x; - pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; -} + XGetWindowAttributes (display->display, vt, &xwa); + pos.x = xwa.x + Col2Pixel (screen.cur.col); + pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; +} #endif -/* ------------------------------------------------------------------------- */ - -/* ------------------------------------------------------------------------- * - * DEBUG ROUTINES * - * ------------------------------------------------------------------------- */ -#if 0 + +#if ENABLE_OVERLAY +void +rxvt_term::scr_overlay_new (int x, int y, int w, int h) +{ + if (nrow < 1 || ncol < 1) + return; + + want_refresh = 1; + + scr_overlay_off (); + + if (x < 0) x = ncol - w; + if (y < 0) y = nrow - h; + + // make space for border + w += 2; min_it (w, ncol); + h += 2; min_it (h, nrow); + + 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; + + ov_text = new text_t *[h]; + ov_rend = new rend_t *[h]; + + for (y = 0; y < h; y++) + { + text_t *tp = ov_text[y] = new text_t[w]; + rend_t *rp = ov_rend[y] = new rend_t[w]; + + text_t t0, t1, t2; + rend_t r = OVERLAY_RSTYLE; + + if (y == 0) + t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; + else if (y < h - 1) + t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; + else + t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; + + *tp++ = t0; + *rp++ = r; + + for (x = w - 2; x > 0; --x) + { + *tp++ = t1; + *rp++ = r; + } + + *tp = t2; + *rp = r; + } +} + void -rxvt_debug_colors (void) +rxvt_term::scr_overlay_off () { - int color; - const char *name[] = + if (!ov_text) + return; + + want_refresh = 1; + + for (int y = 0; y < ov_h; y++) { - "fg", "bg", - "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" - }; + delete [] ov_text[y]; + delete [] ov_rend[y]; + } + + delete [] ov_text; ov_text = 0; + delete [] ov_rend; ov_rend = 0; +} + +void +rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) +{ + if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) + return; + + x++, y++; + + ov_text[y][x] = text; + ov_rend[y][x] = rend; +} - fprintf (stderr, "Color ( "); - if (rstyle & RS_RVid) - fprintf (stderr, "rvid "); - if (rstyle & RS_Bold) - fprintf (stderr, "bold "); - if (rstyle & RS_Blink) - fprintf (stderr, "blink "); - if (rstyle & RS_Uline) - fprintf (stderr, "uline "); - fprintf (stderr, "): "); +void +rxvt_term::scr_overlay_set (int x, int y, const char *s) +{ + while (*s) + scr_overlay_set (x++, y, *s++); +} - color = GET_FGCOLOR (rstyle); -#ifndef NO_BRIGHTCOLOR - if (color >= minBrightCOLOR && color <= maxBrightCOLOR) +void +rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) +{ + while (*s) { - color -= (minBrightCOLOR - minCOLOR); - fprintf (stderr, "bright "); + text_t t = *s++; + int width = wcwidth (t); + + while (width--) + { + scr_overlay_set (x++, y, t); + t = NOCHAR; + } } -#endif - fprintf (stderr, "%s on ", name[color]); +} - color = GET_BGCOLOR (rstyle); -#ifndef NO_BRIGHTCOLOR - if (color >= minBrightCOLOR && color <= maxBrightCOLOR) +void +rxvt_term::scr_swap_overlay () +{ + if (!ov_text) + return; + + // swap screen mem with overlay + for (int y = ov_h; y--; ) { - color -= (minBrightCOLOR - minCOLOR); - fprintf (stderr, "bright "); + text_t *t1 = ov_text[y]; + rend_t *r1 = ov_rend[y]; + + 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--; ) + { + text_t t = *t1; *t1++ = *t2; *t2++ = t; + rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); + } } -#endif - fprintf (stderr, "%s\n", name[color]); } + #endif +/* ------------------------------------------------------------------------- */ +