--- rxvt-unicode/src/screen.C 2005/02/13 08:56:28 1.157 +++ rxvt-unicode/src/screen.C 2005/12/19 02:40:14 1.174 @@ -49,7 +49,7 @@ * ------------------------------------------------------------------------- */ #define ZERO_SCROLLBACK() \ if (options & Opt_scrollTtyOutput) \ - TermWin.view_start = 0 + view_start = 0 #define CLEAR_SELECTION() \ selection.beg.row = selection.beg.col \ = selection.end.row = selection.end.col = 0 @@ -90,24 +90,24 @@ * 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) \ + if (mapped) \ XClearArea (display->display, drawBuffer, 0, \ - Row2Pixel (row), (unsigned int)TermWin.width, \ + Row2Pixel (row), (unsigned int)width, \ (unsigned int)Height2Pixel (num), False) #define CLEAR_CHARS(x, y, num) \ - if (TermWin.mapped) \ + 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, \ + XFillRectangle (display->display, drawBuffer, gc, \ 0, Row2Pixel (row), \ - (unsigned int)TermWin.width, \ + (unsigned int)width, \ (unsigned int)Height2Pixel (num)) /* ------------------------------------------------------------------------- * @@ -116,11 +116,14 @@ /* 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) { efs &= ~RS_baseattrMask; efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); + text_t *et = l.t + col; + rend_t *er = l.r + col; + while (width--) { *et++ = ' '; @@ -131,18 +134,12 @@ /* ------------------------------------------------------------------------- */ /* 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 (); - } + if (!l.t) + lalloc (l); - scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); + scr_blank_line (l, 0, ncol, efs); } /* ------------------------------------------------------------------------- * @@ -151,82 +148,71 @@ void rxvt_term::scr_reset () { - unsigned int ncol, nrow, total_rows, prev_total_rows; unsigned int p, q; int k; - rend_t setrstyle; #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 (TermWin.nrow == 0) - TermWin.nrow = 24; + if (ncol == 0) + ncol = 80; - 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 + TermWin.saveLines < 2) + if (nrow + saveLines < 2) { - TermWin.saveLines++; + saveLines++; prev_nrow--; - TermWin.nscrolled++; + nscrolled++; } want_refresh = 1; - prev_total_rows = prev_nrow + TermWin.saveLines; - total_rows = nrow + TermWin.saveLines; + int prev_total_rows = prev_nrow + saveLines; + int total_rows = nrow + saveLines; screen.tscroll = 0; screen.bscroll = nrow - 1; - if (!talloc) - { - talloc = new rxvt_salloc (ncol * sizeof (text_t)); - ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - } - - if (!screen.text) + if (!save) { /* * 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); + nscrolled = 0; /* no saved lines */ + term_start = 0; + nsaved = 0; + + talloc = new rxvt_salloc (ncol * sizeof (text_t)); + ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); + + save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); + buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); + drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); + swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); + + screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *)); + + scr_update_term (); + + for (p = nrow; p--; ) + { + scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); + scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); + scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); } memset (charsets, 'B', sizeof (charsets)); - TermWin.nscrolled = 0; /* no saved lines */ rstyle = DEFAULT_RSTYLE; screen.flags = Screen_DefaultFlags; screen.cur.row = screen.cur.col = 0; @@ -256,41 +242,22 @@ /* * add or delete rows as appropriate */ - setrstyle = DEFAULT_RSTYLE; + + rxvt_salloc *old_ta; + rxvt_salloc *old_ra; if (nrow < prev_nrow) { /* delete rows */ - k = min (TermWin.nscrolled, prev_nrow - nrow); + k = min (nscrolled, prev_nrow - nrow); + // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO scr_scroll_text (0, (int)prev_nrow - 1, k, 1); for (p = nrow; p < prev_nrow; p++) { - 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 (save[p + saveLines]); + lfree (swap_save[p]); + lfree (drawn[p]); } /* we have fewer rows so fix up cursor position */ @@ -303,29 +270,23 @@ /* add rows */ scr_reset_realloc (); /* realloc _first_ */ - TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this + int ocol = ncol; + ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this - k = min (TermWin.nscrolled, nrow - prev_nrow); + k = min (nscrolled, nrow - prev_nrow); for (p = prev_total_rows; p < total_rows; p++) - { - screen.tlen[p] = 0; - screen.text[p] = NULL; - screen.rend[p] = NULL; - } + save[p].clear (); for (p = prev_total_rows; p < total_rows - k; p++) - scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); + scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); + + scr_update_term (); 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); + swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); + drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); } if (k > 0) @@ -333,70 +294,133 @@ scr_scroll_text (0, (int)nrow - 1, -k, 1); screen.cur.row += k; screen.s_cur.row += k; - TermWin.nscrolled -= k; + nscrolled -= k; } #ifdef DEBUG_STRICT - assert (screen.cur.row < TermWin.nrow); + assert (screen.cur.row < nrow); #else /* drive with your eyes closed */ MIN_IT (screen.cur.row, nrow - 1); #endif - TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this + ncol = ocol; // save b/c scr_blank_screen_mem uses this } /* resize columns */ if (ncol != prev_ncol) { - rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); - rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); + old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); + old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); + + for (p = total_rows; p--; ) + lresize (save[p]); - for (p = 0; p < total_rows; p++) + for (p = nrow; p--; ) { - if (screen.text[p]) - { - screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); - screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); + lresize (drawn[p]); + lresize (swap_save[p]); + } - MIN_IT (screen.tlen[p], (int16_t)ncol); + MIN_IT (screen.cur.col, (int16_t)ncol - 1); - if (ncol > prev_ncol) - scr_blank_line (&screen.text[p][prev_ncol], - &screen.rend[p][prev_ncol], - ncol - prev_ncol, setrstyle); - } - } + delete old_ta; + delete old_ra; + } + +#if 0 + // re-wrap lines, this is rather ugly, possibly because I am too dumb + // to come up with a lean and mean algorithm. + rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); + rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); + + text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); + rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); + tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t)); + + for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D + + p = prev_total_rows; + q = total_rows; - for (p = 0; p < nrow; p++) + while (p > 0 && q > 0) + { + --p; + + printf ("pq %d:%d\n", p, q); + if (save[p].t) { - drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); - drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); + int llen = save[p].l; - if (ncol > prev_ncol) - scr_blank_line (&drawn_text[p][prev_ncol], - &drawn_rend[p][prev_ncol], - ncol - prev_ncol, setrstyle); + assert (llen >= 0); - if (swap.text[p]) + while (p && save[p - 1].l < 0) { - swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); - swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); + --p; + llen += prev_ncol; + } - MIN_IT (swap.tlen[p], (int16_t)ncol); + int qlines = llen / ncol + 1; + int lofs = 0; - if (ncol > prev_ncol) - scr_blank_line (&swap.text[p][prev_ncol], - &swap.rend[p][prev_ncol], - ncol - prev_ncol, setrstyle); - } + q -= qlines; - } + int qrow = q; - MIN_IT (screen.cur.col, (int16_t)ncol - 1); + printf ("QL %d llen %d\n", qlines, llen);//D + for (; qlines--; qrow++) + { + if (qrow >= 0) + { + tp [qrow] = (text_t *)ta->alloc (); + rp [qrow] = (rend_t *)ra->alloc (); + tl [qrow] = LINE_CONT1; + + int qcol = 0; + + for (;;) + { + int prow = lofs / prev_ncol + p; + int pcol = lofs % prev_ncol; + + int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); + + printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); + + if (len <= 0) + { + tl [qrow] = qcol; + + TODO + scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, + ncol - qcol, DEFAULT_RSTYLE); + + break; + } + + assert (lofs < 1000); - delete talloc; talloc = ta; - delete ralloc; ralloc = ra; + memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); + memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); + + lofs += len; + qcol += len; + + if (qcol == ncol) + break; + } + } + else + lofs += ncol; + } + } } + free (screen.text); screen.text = tp; + free (screen.rend); screen.rend = rp; + free (screen.tlen); screen.tlen = tl; + + for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D +#endif + if (tabs) free (tabs); } @@ -415,24 +439,13 @@ void rxvt_term::scr_reset_realloc () { - unsigned int total_rows, nrow; + unsigned int total_rows = nrow + saveLines; - 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* */ + screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *)); + swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); + drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); + save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); + buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t)); } /* ------------------------------------------------------------------------- */ @@ -443,32 +456,18 @@ rxvt_term::scr_release () { unsigned int total_rows; - int i; - total_rows = TermWin.nrow + TermWin.saveLines; + total_rows = nrow + saveLines; 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 (screen.line); + free (save); + free (swap_save); + free (drawn); + free (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; } /* ------------------------------------------------------------------------- */ @@ -529,8 +528,8 @@ } /* 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); @@ -556,7 +555,7 @@ want_refresh = 1; - TermWin.view_start = 0; + view_start = 0; if (current_screen == scrn) return scrn; @@ -576,14 +575,10 @@ if (options & Opt_secondaryScreen) { num_scr = 0; - offset = TermWin.saveLines; + offset = saveLines; for (i = prev_nrow; i--;) - { - 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.line[i]), swap_save[i], line_t); SWAP_IT (screen.charset, swap.charset, int16_t); SWAP_IT (screen.flags, swap.flags, int); @@ -611,7 +606,7 @@ if (screen.cur.row == screen.bscroll) scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); - else if (screen.cur.row < TermWin.nrow - 1) + else if (screen.cur.row < nrow - 1) screen.cur.row++; } @@ -646,6 +641,14 @@ rstyle &= ~style; } +// set screen.line pointers to the actual lines in the save buffer +void +rxvt_term::scr_update_term () +{ + for (int i = nrow; i--; ) + screen.line[i] = save + saveLines + i; +} + /* ------------------------------------------------------------------------- */ /* * Scroll text between and inclusive, by lines @@ -657,7 +660,6 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) { int i, j; - long nscrolled; if (count == 0 || (row1 > row2)) return 0; @@ -667,27 +669,26 @@ if (row1 == 0 && count > 0 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) { - nscrolled = (long)TermWin.nscrolled + (long)count; + nscrolled += count; - if (nscrolled > (long)TermWin.saveLines) - TermWin.nscrolled = TermWin.saveLines; - else - TermWin.nscrolled = (unsigned int)nscrolled; + if (nscrolled > saveLines) + nscrolled = saveLines; if ((options & Opt_scrollWithBuffer) - && TermWin.view_start != 0 - && TermWin.view_start != TermWin.saveLines) + && view_start != 0 + && view_start != saveLines) scr_page (UP, count); } else if (!spec) - row1 += TermWin.saveLines; + row1 += saveLines; - row2 += TermWin.saveLines; + row2 += saveLines; if (selection.op && current_screen == selection.screen) { - i = selection.beg.row + TermWin.saveLines; - j = selection.end.row + TermWin.saveLines; + i = selection.beg.row + saveLines; + j = selection.end.row + saveLines; + if ((i < row1 && j > row1) || (i < row2 && j > row2) || (i - count < row1 && i >= row1) @@ -701,13 +702,13 @@ else if (j >= row1 && j <= row2) { /* move selected region too */ - selection.beg.row -= count; - selection.end.row -= count; + selection.beg.row -= count; + selection.end.row -= count; selection.mark.row -= count; } } - selection_check (0); /* _after_ TermWin.nscrolled update */ + selection_check (0); /* _after_ nscrolled update */ num_scr += count; j = count; @@ -720,50 +721,41 @@ if (j > 0) { - /* A: scroll up */ + /* scroll up */ - /* A1: Copy lines that will get clobbered by the rotation */ - memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); - memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); + /* Copy lines that will get clobbered by the rotation */ + memcpy (buf, save + row1, count * sizeof (line_t)); - /* A2: Rotate lines */ + /* Rotate lines */ i = row2 - row1 - count + 1; - memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); - memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); - memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); + memmove (save + row1, save + row1 + count, i * sizeof (line_t)); j = row2 - count + 1, i = count; } else /* if (j < 0) */ { - /* B: scroll down */ + /* scroll down */ - /* B1: Copy lines that will get clobbered by the rotation */ + /* Copy lines that will get clobbered by the rotation */ for (i = 0, j = row2; i < count; i++, j--) - { - buf_text[i] = screen.text[j]; - buf_rend[i] = screen.rend[j]; - } + buf[i] = save[j]; - /* B2: Rotate lines */ + /* Rotate lines */ for (j = row2, i = j - count; i >= row1; i--, j--) - { - screen.tlen[j] = screen.tlen[i]; - screen.text[j] = screen.text[i]; - screen.rend[j] = screen.rend[i]; - } + save[j] = save[i]; j = row1, i = count; count = -count; } - /* C: Resurrect lines */ - memset (screen.tlen + j, 0, i * sizeof (int16_t)); - memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); - memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); - if (!spec) /* line length may not equal TermWin.ncol */ + /* Resurrect lines */ + memcpy (save + j, buf, i * sizeof (line_t)); + + scr_update_term (); + + if (!spec) /* line length may not equal ncol */ for (; i--; j++) - scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); + scr_blank_screen_mem (save[j], rstyle); return count; } @@ -775,25 +767,24 @@ void rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) { - unsigned char checksel; - unicode_t c; - int i, row, last_col; - text_t *stp; - rend_t *srp; - if (len <= 0) /* sanity */ return; + unsigned char checksel; + unicode_t c; + int row, last_col; + const unicode_t *strend = str + len; + want_refresh = 1; ZERO_SCROLLBACK (); - last_col = TermWin.ncol; + last_col = ncol; if (nlines > 0) { nlines += screen.cur.row - screen.bscroll; if ((nlines > 0) && (screen.tscroll == 0) - && (screen.bscroll == (TermWin.nrow - 1))) + && (screen.bscroll == (nrow - 1))) { /* _at least_ this many lines need to be scrolled */ scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); @@ -803,53 +794,52 @@ #ifdef DEBUG_STRICT assert (screen.cur.col < last_col); - assert ((screen.cur.row < TermWin.nrow) - && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); + assert ((screen.cur.row < nrow) + && (screen.cur.row >= - (int32_t)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); + MIN_IT (screen.cur.row, (int32_t)nrow - 1); + MAX_IT (screen.cur.row, - (int32_t)nscrolled); #endif - row = screen.cur.row + TermWin.saveLines; + row = screen.cur.row + saveLines; checksel = selection.op && current_screen == selection.screen ? 1 : 0; - stp = screen.text[row]; - srp = screen.rend[row]; + line_t *line = save + row; - while (len--) + while (str < strend) { c = *str++; if (c < 0x20) - switch (c) - { - case C0_HT: - scr_tab (1, true); - continue; - - case C0_LF: - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], 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; + if (c == C0_LF) + { + if (!line->is_longer ()) /* XXX: think about this */ + 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 < (nrow - 1)) + row = (++screen.cur.row) + saveLines; - stp = screen.text[row]; /* _must_ refresh */ - srp = screen.rend[row]; /* _must_ refresh */ - continue; - - case C0_CR: - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); + line = save + row; /* _must_ refresh */ + continue; + } + else if (c == C0_CR) + { + if (!line->is_longer ()) /* XXX: think about this */ + MAX_IT (line->l, screen.cur.col); - screen.flags &= ~Screen_WrapNext; - screen.cur.col = 0; - continue; + screen.flags &= ~Screen_WrapNext; + screen.cur.col = 0; + continue; + } + else if (c == C0_HT) + { + scr_tab (1, true); + continue; } if (checksel /* see if we're writing within selection */ @@ -867,17 +857,22 @@ if (screen.flags & Screen_WrapNext) { - screen.tlen[row] = -1; + line->set_is_longer (); - scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; - - stp = screen.text[row]; /* _must_ refresh */ - srp = screen.rend[row]; /* _must_ refresh */ + scr_do_wrap (); + + row = screen.cur.row + saveLines; + line = save + row; /* _must_ refresh */ } + // some utf-8 decoders "decode" surrogate characters: let's fix this. + if (IN_RANGE (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 says that line-drawing - // characters have width -1 (DOH!) on GNU/Linux sometimes. + // 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 @@ -885,21 +880,21 @@ // vt100 special graphics and line drawing // 5f-7e standard vt100 // 40-5e rxvt extension for extra curses acs chars - static uint16_t vt100_0[63] = { // 40 .. 7e - 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f + 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 >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) + if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) { - c = vt100_0[c - 0x40]; - width = 1; + c = vt100_0[c - 0x41]; + width = 1; // vt100 line drawing characters are always single-width } } @@ -908,10 +903,6 @@ if (width != 0) { - // some utf-8 decoders decode surrogate characters. - if (0xd800 <= c && c <= 0xdfff) - c = 0xfffd; - #if !UNICODE_3 // trim characters we can't store directly :( if (c >= 0x10000) @@ -923,38 +914,47 @@ #endif // nuke the character at this position, if required - if (stp[screen.cur.col] == NOCHAR - || (screen.cur.col < TermWin.ncol - 1 - && stp[screen.cur.col + 1] == NOCHAR)) + if (line->t[screen.cur.col] == NOCHAR + || (screen.cur.col < ncol - 1 + && line->t[screen.cur.col + 1] == NOCHAR)) { int col = screen.cur.col; // find begin - while (col > 0 && stp[col] == NOCHAR) + while (col > 0 && line->t[col] == NOCHAR) col--; - rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); + rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); // found begin, nuke do { - stp[col] = ' '; - srp[col] = rend; + line->t[col] = ' '; + line->r[col] = rend; col++; - } while (col < TermWin.ncol && stp[col] == NOCHAR); + } while (col < ncol && line->t[col] == NOCHAR); } rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); + // if the character doesn't fit into the remaining columns... + if (screen.cur.col > last_col - width && last_col >= width) + { + // ...output spaces + c = ' '; + // and try the same character next loop iteration + --str; + } + do { - stp[screen.cur.col] = c; - srp[screen.cur.col] = rend; + line->t[screen.cur.col] = c; + line->r[screen.cur.col] = rend; if (screen.cur.col < last_col - 1) screen.cur.col++; else { - screen.tlen[row] = last_col; + line->l = last_col; if (screen.flags & Screen_Autowrap) screen.flags |= Screen_WrapNext; break; @@ -966,40 +966,39 @@ // pad with spaces when overwriting wide character with smaller one if (!width) - for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) + for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) { - stp[c] = ' '; - srp[c] = rend; + line->t[c] = ' '; + line->r[c] = rend; } } - else if (width == 0) + 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. - text_t *tp; rend_t *rp; if (screen.cur.col > 0) { - tp = stp + screen.cur.col - 1; - rp = srp + screen.cur.col - 1; + tp = line->t + screen.cur.col - 1; + rp = line->r + screen.cur.col - 1; - while (*tp == NOCHAR && tp > stp) + while (*tp == NOCHAR && tp > line->t) tp--, rp--; } else if (screen.cur.row > 0 - && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) + && save [screen.cur.row - 1 + saveLines].is_longer ()) { - int line = screen.cur.row - 1 + TermWin.saveLines; + line_t *line = save + (screen.cur.row - 1 + saveLines); - tp = screen.text[line] + last_col - 1; - rp = screen.rend[line] + last_col - 1; + tp = line->t + last_col - 1; + rp = line->r + last_col - 1; - while (*tp == NOCHAR && tp > screen.text[line]) + while (*tp == NOCHAR && tp > line->t) tp--, rp--; } else @@ -1016,8 +1015,8 @@ } } - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); + if (!line->is_longer ()) /* XXX: think about this */ + MAX_IT (line->l, screen.cur.col); #ifdef DEBUG_STRICT assert (screen.cur.row >= 0); @@ -1041,7 +1040,7 @@ 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 @@ -1071,13 +1070,13 @@ return; else if (count > 0) { - int row = TermWin.saveLines + screen.cur.row; - text_t *tp = screen.text[row]; - rend_t *rp = screen.rend[row]; - rend_t base_rend = rp[i]; - ht &= tp[i] == ' '; + int row = saveLines + screen.cur.row; + + line_t &l = save[row]; + rend_t base_rend = l.r[i]; + ht &= l.t[i] == ' '; - for (; ++i < TermWin.ncol; ) + for (; ++i < ncol; ) if (tabs[i]) { x = i; @@ -1085,11 +1084,11 @@ break; } else - ht &= tp[i] == ' ' - && RS_SAME (rp[i], base_rend); + 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. @@ -1097,18 +1096,18 @@ { base_rend = SET_FONT (base_rend, 0); - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], x); + if (!l.is_longer ()) /* XXX: think about this */ + MAX_IT (l.l, x); i = screen.cur.col; - tp[i] = '\t'; - rp[i] = base_rend; + l.t[i] = '\t'; + l.r[i] = base_rend; while (++i < x) { - tp[i] = NOCHAR; - rp[i] = base_rend; + l.t[i] = NOCHAR; + l.r[i] = base_rend; } } } @@ -1145,7 +1144,7 @@ scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); else { - if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) + if (!save[screen.cur.row + saveLines].l) return; /* um, yeah? */ scr_insdel_chars (1, INSERT); @@ -1163,22 +1162,23 @@ void rxvt_term::scr_forwardindex () { - int row; + 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; + row = screen.cur.row + saveLines; - if (screen.tlen[row] == 0) + if (!save[row].l) return; /* um, yeah? */ - else if (screen.tlen[row] == -1) - screen.tlen[row] = TermWin.ncol; + + if (save[row].is_longer ()) //TODO//FIXME//LEN + save[row].l = ncol; 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 @@ -1195,7 +1195,7 @@ 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); + MIN_IT (screen.cur.col, (int32_t)ncol - 1); screen.flags &= ~Screen_WrapNext; @@ -1230,7 +1230,7 @@ } MAX_IT (screen.cur.row, 0); - MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); + MIN_IT (screen.cur.row, (int32_t)nrow - 1); } /* ------------------------------------------------------------------------- */ @@ -1256,7 +1256,7 @@ screen.cur.row += dirn; MAX_IT (screen.cur.row, 0); - MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); + MIN_IT (screen.cur.row, (int32_t)nrow - 1); selection_check (0); } @@ -1277,13 +1277,14 @@ selection_check (1); - row = TermWin.saveLines + screen.cur.row; + row = 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 (save[row].l, (int16_t)col); if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) CLEAR_SELECTION (); @@ -1297,8 +1298,8 @@ break; case 2: /* erase whole line */ col = 0; - num = TermWin.ncol; - screen.tlen[row] = 0; + num = ncol; + save[row].l = 0; if (selection.beg.row <= screen.cur.row && selection.end.row >= screen.cur.row) CLEAR_SELECTION (); @@ -1307,10 +1308,10 @@ return; } - if (screen.text[row]) - scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); + if (save[row].t) + scr_blank_line (save[row], col, num, rstyle); else - scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); + scr_blank_screen_mem (save[row], rstyle); } /* ------------------------------------------------------------------------- */ @@ -1331,7 +1332,7 @@ want_refresh = 1; ZERO_SCROLLBACK (); - row_offset = (int32_t)TermWin.saveLines; + row_offset = (int32_t)saveLines; switch (mode) { @@ -1339,7 +1340,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); @@ -1350,7 +1351,7 @@ case 2: /* erase whole screen */ selection_check (3); row = 0; - num = TermWin.nrow; + num = nrow; break; default: return; @@ -1362,10 +1363,10 @@ && 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; @@ -1378,20 +1379,31 @@ { ren = rstyle & (RS_fgMask | RS_bgMask); gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; - XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); + XChangeGC (display->display, gc, GCForeground, &gcvalue); ERASE_ROWS (row, num); gcvalue.foreground = pix_colors[Color_fg]; - XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); + 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 (save[row + row_offset], rstyle); + save[row + row_offset].l = 0; + scr_blank_line (drawn[row], 0, ncol, ren); } } +#if ENABLE_FRILLS +void +rxvt_term::scr_erase_savelines () +{ + want_refresh = 1; + ZERO_SCROLLBACK (); + + nscrolled = 0; +} +#endif + /* ------------------------------------------------------------------------- */ /* * Fill the screen with `E's @@ -1400,8 +1412,8 @@ void rxvt_term::scr_E () { - int i, j, k; - rend_t *r1, fs; + int i, j, k; + rend_t *r1, fs; want_refresh = 1; ZERO_SCROLLBACK (); @@ -1410,12 +1422,16 @@ selection_check (3); fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); - for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) + for (k = saveLines, i = nrow; i--; k++) { - 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 = save[k]; + + fill_text (line.t, 'E', ncol); + + for (r1 = line.r, j = ncol; j--; ) *r1++ = fs; + + line.l = ncol; /* make the `E's selectable */ } } @@ -1458,9 +1474,6 @@ { int col, row; rend_t tr; - text_t *stp; - rend_t *srp; - int16_t *slp; want_refresh = 1; ZERO_SCROLLBACK (); @@ -1471,34 +1484,32 @@ 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; + row = screen.cur.row + saveLines; - stp = screen.text[row]; - srp = screen.rend[row]; - slp = &screen.tlen[row]; + line_t *line = save + row; switch (insdel) { case INSERT: - for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) + for (col = ncol - 1; (col - count) >= screen.cur.col; 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]; } - if (*slp != -1) + if (!line->is_longer ()) { - *slp += count; - MIN_IT (*slp, TermWin.ncol); + line->l += count; + MIN_IT (line->l, 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 */ @@ -1508,42 +1519,39 @@ } } - scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], - (unsigned int)count, rstyle); + scr_blank_line (save[row], 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); + scr_blank_line (save[row], screen.cur.col, count, rstyle); break; case DELETE: - tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); + tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); - for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) + 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); + scr_blank_line (*line, ncol - count, count, tr); - if (*slp == -1) /* break line continuation */ - *slp = TermWin.ncol; + if (line->is_longer ()) /* break line continuation */ + line->l = ncol; - *slp -= count; - MAX_IT (*slp, 0); + line->l -= count; + MAX_IT (line->l, 0); 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 { @@ -1567,7 +1575,7 @@ rxvt_term::scr_scroll_region (int top, int bot) { MAX_IT (top, 0); - MIN_IT (bot, (int)TermWin.nrow - 1); + MIN_IT (bot, (int)nrow - 1); if (top > bot) return; @@ -1656,8 +1664,8 @@ rxvt_term::scr_set_tab (int mode) { if (mode < 0) - memset (tabs, 0, TermWin.ncol * sizeof (char)); - else if (screen.cur.col < TermWin.ncol) + memset (tabs, 0, ncol * sizeof (char)); + else if (screen.cur.col < ncol) tabs[screen.cur.col] = (mode ? 1 : 0); } @@ -1682,12 +1690,12 @@ #if TRANSPARENT if (! (options & Opt_transparent) || am_transparent == 0) #endif - XSetWindowBackground (display->display, TermWin.vt, + XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; - XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, + XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); scr_clear (); scr_touch (true); @@ -1778,12 +1786,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[i].r; - for (; col < TermWin.ncol; col++, drp++) + for (; col < ncol; col++, drp++) if ((*drp & mask) == value) { found = true; @@ -1804,45 +1812,45 @@ }; 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) /* sanity check */ return; #ifndef NO_SLOW_LINK_SUPPORT if (refresh_type == FAST_REFRESH && !display->is_local) { y = 0; - height = TermWin.height; + eheight = height; } #endif #ifdef DEBUG_STRICT x = max (x, 0); - x = min (x, (int)TermWin.width); + x = min (x, (int)width); y = max (y, 0); - y = min (y, (int)TermWin.height); + y = min (y, (int)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); } 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[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); if (refresh) scr_refresh (SLOW_REFRESH); @@ -1855,7 +1863,7 @@ void rxvt_term::scr_touch (bool refresh) { - scr_expose (0, 0, TermWin.width, TermWin.height, refresh); + scr_expose (0, 0, width, height, refresh); } /* ------------------------------------------------------------------------- */ @@ -1869,16 +1877,16 @@ long p = 0; unsigned int oldviewstart; - oldviewstart = TermWin.view_start; + oldviewstart = view_start; if (y < len) { - p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; - p -= (long) (TermWin.nrow - 1); + p = (nrow + nscrolled) * (len - y) / len; + p -= (long) (nrow - 1); p = max (p, 0); } - TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); + view_start = (unsigned int)min (p, nscrolled); return scr_changeview (oldviewstart); } @@ -1894,33 +1902,32 @@ int n; unsigned int oldviewstart; -#ifdef DEBUG_STRICT - assert ((nlines >= 0) && (nlines <= TermWin.nrow)); -#endif - oldviewstart = TermWin.view_start; + oldviewstart = view_start; + if (direction == UP) { - n = TermWin.view_start + nlines; - TermWin.view_start = min (n, TermWin.nscrolled); + n = view_start + nlines; + view_start = min (n, nscrolled); } else { - n = TermWin.view_start - nlines; - TermWin.view_start = max (n, 0); + n = view_start - nlines; + view_start = max (n, 0); } + return scr_changeview (oldviewstart); } int rxvt_term::scr_changeview (unsigned int oldviewstart) { - if (TermWin.view_start != oldviewstart) + if (view_start != oldviewstart) { want_refresh = 1; - num_scr -= (TermWin.view_start - oldviewstart); + num_scr -= (view_start - oldviewstart); } - return (int) (TermWin.view_start - oldviewstart); + return (int) (view_start - oldviewstart); } /* ------------------------------------------------------------------------- */ @@ -1928,19 +1935,23 @@ rxvt_term::scr_bell () { #ifndef NO_BELL + # ifndef NO_MAPALERT # ifdef MAPALERT_OPTION if (options & Opt_mapAlert) # endif - XMapWindow (display->display, TermWin.parent[0]); + XMapWindow (display->display, parent[0]); # endif + if (options & Opt_visualBell) { scr_rvideo_mode (!rvideo); /* refresh also done */ + rxvt_usleep (VISUAL_BELL_DURATION); scr_rvideo_mode (!rvideo); /* refresh also done */ } else XBell (display->display, 0); + #endif } @@ -1956,25 +1967,25 @@ if ((fd = popen_printer ()) == NULL) return; - nrows = TermWin.nrow; - row_offset = TermWin.saveLines; + nrows = nrow; + row_offset = saveLines; if (!fullhist) - row_offset -= TermWin.view_start; + row_offset -= view_start; else { - nrows += TermWin.nscrolled; - row_offset -= TermWin.nscrolled; + nrows += nscrolled; + row_offset -= nscrolled; } wctomb (0, 0); for (r1 = 0; r1 < nrows; r1++) { - text_t *tp = screen.text[r1 + row_offset]; - int len = screen.tlen[r1 + row_offset]; + text_t *tp = save[r1 + row_offset].t; + int len = save[r1 + row_offset].l; - for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) + for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN { char mb[MB_LEN_MAX]; text_t t = *tp++; @@ -2005,16 +2016,6 @@ * 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) { @@ -2031,7 +2032,7 @@ want_refresh = 0; /* screen is current */ - if (refresh_type == NO_REFRESH || !TermWin.mapped) + if (refresh_type == NO_REFRESH || !mapped) return; /* @@ -2040,13 +2041,13 @@ must_clear = 0; refresh_count = 0; - row_offset = TermWin.saveLines - TermWin.view_start; + row_offset = saveLines - view_start; #if XPM_BACKGROUND - must_clear |= (bgPixmap.pixmap != None); + must_clear |= bgPixmap.pixmap != None; #endif #if TRANSPARENT - must_clear |= ((options & Opt_transparent) && am_transparent); + must_clear |= (options & Opt_transparent) && am_transparent; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -2073,35 +2074,41 @@ { int col = screen.cur.col; - while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) + while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) col--; - crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; + crp = &screen.line[screen.cur.row]->r[col]; - if (showcursor && TermWin.focus) + if (showcursor && focus) { - *crp ^= RS_RVid; -#ifndef NO_CURSORCOLOR - cc1 = *crp & (RS_fgMask | RS_bgMask); - if (ISSET_PIXCOLOR (Color_cursor)) - ccol1 = Color_cursor; + if (options & 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 = GET_FGCOLOR (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 = GET_BGCOLOR (rstyle); #else - ccol2 = Color_bg; + ccol2 = Color_bg; #endif - *crp = SET_FGCOLOR (*crp, ccol1); - *crp = SET_BGCOLOR (*crp, ccol2); + *crp = SET_FGCOLOR (*crp, ccol1); + *crp = SET_BGCOLOR (*crp, ccol2); #endif + } } } @@ -2109,29 +2116,29 @@ 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 (ocrow < nrow + && oldcursor.col < ncol) + drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); - if (TermWin.focus || !showcursor) + 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; } } @@ -2141,9 +2148,6 @@ scr_swap_overlay (); #endif - rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ - text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ - #ifndef NO_SLOW_LINK_SUPPORT /* * D: CopyArea pass - very useful for slower links @@ -2152,38 +2156,35 @@ i = num_scr; if (!display->is_local && refresh_type == FAST_REFRESH && num_scr_allow && i - && abs (i) < TermWin.nrow && !must_clear) + && abs (i) < 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) { - text_t *stp = screen.text[row + row_offset]; - rend_t *srp = screen.rend[row + row_offset]; - text_t *dtp = drawn_text[row]; - text_t *dtp2 = drawn_text[row + i]; - rend_t *drp = drawn_rend[row]; - rend_t *drp2 = drawn_rend[row + i]; + line_t s = save[row + row_offset]; + line_t d = drawn[row]; + line_t d2 = drawn[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) @@ -2200,8 +2201,8 @@ if (wlen < len) SWAP_IT (wlen, len, int); - XCopyArea (display->display, TermWin.vt, TermWin.vt, - TermWin.gc, 0, Row2Pixel (len + i), + XCopyArea (display->display, vt, vt, + gc, 0, Row2Pixel (len + i), (unsigned int)TermWin_TotalWidth (), (unsigned int)Height2Pixel (wlen - len + 1), 0, Row2Pixel (len)); @@ -2214,19 +2215,19 @@ /* * E: main pass across every character */ - for (row = 0; row < TermWin.nrow; row++) + for (row = 0; row < nrow; row++) { - text_t *stp = screen.text[row + row_offset]; - rend_t *srp = screen.rend[row + row_offset]; - text_t *dtp = drawn_text[row]; - rend_t *drp = drawn_rend[row]; + text_t *stp = save[row + row_offset].t; + rend_t *srp = save[row + row_offset].r; + text_t *dtp = drawn[row].t; + rend_t *drp = drawn[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 */ if (stp[col] == dtp[col] /* Must match characters to skip. */ @@ -2250,7 +2251,7 @@ int xpixel = Col2Pixel (col); - for (i = 0; ++col < TermWin.ncol; ) + for (i = 0; ++col < ncol; ) { if (stp[col] == NOCHAR) { @@ -2288,27 +2289,27 @@ while (i && text[count] == NOCHAR) count++, i--; -#if ENABLE_STYLES - // force redraw after "careful" characters to avoid pixel droppings - if (srp[col] & RS_Careful && col < TermWin.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 -= TermWin.fwidth; -#endif - /* * Determine the attributes for the string */ int fore = GET_FGCOLOR (rend); // desired foreground int back = GET_BGCOLOR (rend); // desired background - // only do special processing if ana attributes are set, which is rare - if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) + // only do special processing if any attributes are set, which is rare + if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) { +#if ENABLE_STYLES + // force redraw after "careful" characters to avoid pixel droppings + if (srp[col] & RS_Careful && col < ncol - 1 && 0) + drp[col + 1] = ~srp[col + 1]; + + // 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 @@ -2345,6 +2346,12 @@ #ifndef NO_BOLD_UNDERLINE_REVERSE if (ISSET_PIXCOLOR (Color_RV)) back = Color_RV; + + if (fore == back) + { + fore = Color_bg; + back = Color_fg; + } #endif } @@ -2365,11 +2372,11 @@ /* * Actually do the drawing of the string here */ - rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; + rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; if (back == fore) - font->clear_rect (*TermWin.drawable, xpixel, ypixel, - TermWin.fwidth * count, TermWin.fheight, + font->clear_rect (*drawable, xpixel, ypixel, + fwidth * count, fheight, back); else if (back == Color_bg) { @@ -2380,26 +2387,26 @@ for (i = 0; i < count; i++) /* don't draw empty strings */ if (text[i] != ' ') { - font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); + font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); break; } } else - font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); + font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); } else - font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); + font->draw (*drawable, xpixel, ypixel, text, count, fore, back); if (rend & RS_Uline && font->descent > 1 && fore != back) { #if ENABLE_FRILLS if (ISSET_PIXCOLOR (Color_underline)) - XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); + XSetForeground (display->display, gc, pix_colors[Color_underline]); else #endif - XSetForeground (display->display, TermWin.gc, pix_colors[fore]); + XSetForeground (display->display, gc, pix_colors[fore]); - XDrawLine (display->display, drawBuffer, TermWin.gc, + XDrawLine (display->display, drawBuffer, gc, xpixel, ypixel + font->ascent + 1, xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); } @@ -2415,29 +2422,40 @@ */ if (showcursor) { - if (TermWin.focus) + if (focus) { - *crp ^= RS_RVid; + if (options & Opt_cursorUnderline) + *crp ^= RS_Uline; + else + { + *crp ^= RS_RVid; #ifndef NO_CURSORCOLOR - *crp = (*crp & ~ (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 && save[screen.cur.row + saveLines].t[col] == NOCHAR) + col--; + + while (col + cursorwidth < ncol + && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) + cursorwidth++; + #ifndef NO_CURSORCOLOR if (ISSET_PIXCOLOR (Color_cursor)) - XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); + XSetForeground (display->display, gc, pix_colors[Color_cursor]); #endif - int cursorwidth = 1; - while (oldcursor.col + cursorwidth < TermWin.ncol - && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) - cursorwidth++; - XDrawRectangle (display->display, drawBuffer, TermWin.gc, - Col2Pixel (oldcursor.col), + XDrawRectangle (display->display, drawBuffer, gc, + Col2Pixel (col), Row2Pixel (oldcursor.row), (unsigned int) (Width2Pixel (cursorwidth) - 1), - (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); + (unsigned int) (Height2Pixel (1) - lineSpace - 1)); } } @@ -2454,25 +2472,25 @@ } void -rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) +rxvt_term::scr_remap_chars (const line_t &l) { - if (!rp || !tp) + if (!l.t) return; - for (int i = TermWin.ncol; i; i--, rp++, tp++) - *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); + 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 = nrow + saveLines; i--; ) + scr_remap_chars (save[i]); - for (int i = TermWin.nrow; i--; ) + for (int i = nrow; i--; ) { - scr_remap_chars (drawn_text[i], drawn_rend[i]); - scr_remap_chars (swap.text[i], swap.rend[i]); + scr_remap_chars (drawn[i]); + scr_remap_chars (swap_save[i]); } } @@ -2488,9 +2506,9 @@ #endif ) { - XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); - XClearWindow (display->display, TermWin.parent[0]); - XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); + 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) { @@ -2510,30 +2528,14 @@ void rxvt_term::scr_clear (bool really) { - if (!TermWin.mapped) + if (!mapped) return; num_scr_allow = 0; want_refresh = 1; -#if TRANSPARENT - if ((options & Opt_transparent) && (am_pixmap_trans == 0)) - { - int i; - - if (!(options & Opt_transparent_all)) - i = 0; - else - i = (int) (sizeof (TermWin.parent) / sizeof (Window)); - - while (i--) - if (TermWin.parent[i] != None) - XClearWindow (display->display, TermWin.parent[i]); - } -#endif - if (really) - XClearWindow (display->display, TermWin.vt); + XClearWindow (display->display, vt); } /* ------------------------------------------------------------------------- */ @@ -2542,18 +2544,18 @@ { if (selection.op && current_screen == selection.screen) { - int end_row = TermWin.saveLines - TermWin.view_start; - int i = selection.beg.row + TermWin.saveLines; - int col, row = selection.end.row + TermWin.saveLines; + int end_row = saveLines - view_start; + int i = selection.beg.row + saveLines; + int col, row = selection.end.row + saveLines; rend_t *srp; #if ENABLE_FRILLS if (selection.rect) { - end_row += TermWin.nrow; + end_row += nrow; for (; i <= row && i <= end_row; i++) - for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) + for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) srp[col] ^= RS_RVid; } else @@ -2567,14 +2569,14 @@ i = end_row; } - end_row += TermWin.nrow; + end_row += nrow; for (; i < row && i < end_row; i++, col = 0) - for (srp = screen.rend[i]; col < TermWin.ncol; col++) + for (srp = save[i].r; col < ncol; col++) srp[col] ^= RS_RVid; if (i == row && i < end_row) - for (srp = screen.rend[i]; col < selection.end.col; col++) + for (srp = save[i].r; col < selection.end.col; col++) srp[col] ^= RS_RVid; } } @@ -2593,19 +2595,19 @@ unsigned int width, towrite; char r1[] = "\n"; - for (row = TermWin.saveLines - TermWin.nscrolled; - row < TermWin.saveLines + TermWin.nrow - 1; row++) + for (row = saveLines - nscrolled; + row < saveLines + nrow - 1; row++) { - width = screen.tlen[row] >= 0 ? screen.tlen[row] - : TermWin.ncol; + width = save[row].l >= 0 ? save[row].l + : ncol; for (towrite = width; towrite; towrite -= wrote) { - wrote = write (fd, & (screen.text[row][width - towrite]), + wrote = write (fd, & (save[row].t[width - towrite]), towrite); if (wrote < 0) return; /* XXX: death, no report */ } - if (screen.tlen[row] >= 0) + if (save[row].l >= 0) if (write (fd, r1, 1) <= 0) return; /* XXX: death, no report */ } @@ -2617,7 +2619,7 @@ * ------------------------------------------------------------------------- */ /* - * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 + * -nscrolled <= (selection row) <= nrow - 1 */ void rxvt_term::selection_check (int check_more) @@ -2628,12 +2630,12 @@ 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 ((selection.beg.row < - (int32_t)nscrolled) + || (selection.beg.row >= nrow) + || (selection.mark.row < - (int32_t)nscrolled) + || (selection.mark.row >= nrow) + || (selection.end.row < - (int32_t)nscrolled) + || (selection.end.row >= nrow) || (check_more == 1 && current_screen == selection.screen && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) @@ -2645,7 +2647,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 (); } @@ -2864,7 +2866,7 @@ void rxvt_term::selection_request (Time tm, int x, int 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) @@ -2903,9 +2905,6 @@ rxvt_term::selection_request_other (Atom target, int selnum) { Atom sel; -#ifdef DEBUG_SELECT - char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; -#endif selection_type |= selnum; @@ -2919,7 +2918,7 @@ if (XGetSelectionOwner (display->display, sel) != None) { XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], - TermWin.vt, selection_request_time); + vt, selection_request_time); return 1; } @@ -2975,36 +2974,33 @@ if (selection.clicks == 4) return; /* nothing selected, go away */ - i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); + i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); col = selection.beg.col; - row = selection.beg.row + TermWin.saveLines; - end_row = selection.end.row + TermWin.saveLines; + row = selection.beg.row + saveLines; + end_row = selection.end.row + saveLines; int ofs = 0; int extra = 0; for (; row <= end_row; row++, col = 0) { - end_col = screen.tlen[row]; - #if ENABLE_FRILLS if (selection.rect) { col = selection.beg.col; - end_col = TermWin.ncol + 1; + end_col = ncol + 1; } + else #endif + end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN MAX_IT (col, 0); - if (end_col == -1) - end_col = TermWin.ncol; - if (row == end_row || selection.rect) MIN_IT (end_col, selection.end.col); - t = &screen.text[row][col]; + t = save[row].t + col; for (; col < end_col; col++) { if (*t == NOCHAR) @@ -3030,7 +3026,7 @@ new_selection_text[ofs++] = *t++; } - if (screen.tlen[row] != -1 && row != end_row) + if (!save[row].is_longer () && row != end_row) new_selection_text[ofs++] = C0_LF; } @@ -3051,8 +3047,8 @@ selection.len = ofs; selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); - XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); - if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) + XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); + if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) display->set_selection_owner (this); else rxvt_warn ("can't get primary selection, ignoring.\n"); @@ -3085,7 +3081,7 @@ 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 */ @@ -3100,15 +3096,15 @@ { want_refresh = 1; selection.mark.col = col; - selection.mark.row = row - TermWin.view_start; + selection.mark.row = row - 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.row, - (int32_t)nscrolled); + MIN_IT (selection.mark.row, (int32_t)nrow - 1); MAX_IT (selection.mark.col, 0); - MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); + MIN_IT (selection.mark.col, (int32_t)ncol - 1); while (selection.mark.col > 0 - && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) + && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) --selection.mark.col; if (selection.op) @@ -3142,26 +3138,23 @@ if (dirn == UP) { - bound.row = TermWin.saveLines - TermWin.nscrolled - 1; + bound.row = saveLines - nscrolled - 1; bound.col = 0; dirnadd = -1; } else { - bound.row = TermWin.saveLines + TermWin.nrow; - bound.col = TermWin.ncol - 1; + bound.row = saveLines + nrow; + bound.col = ncol - 1; dirnadd = 1; } - row = mark->row + TermWin.saveLines; + row = mark->row + saveLines; col = mark->col; MAX_IT (col, 0); /* find the edge of a word */ - stp = &screen.text[row][col]; - w1 = DELIMIT_TEXT (*stp); - - srp = &screen.rend[row][col]; - w2 = DELIMIT_REND (*srp); + stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); + srp = save[row].r + col; w2 = DELIMIT_REND (*srp); for (;;) { @@ -3181,16 +3174,16 @@ if ((col == bound.col) && (row != bound.row)) { - if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) + if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) { trow = row + dirnadd; - tcol = dirn == UP ? TermWin.ncol - 1 : 0; + tcol = dirn == UP ? ncol - 1 : 0; - if (screen.text[trow] == NULL) + if (!save[trow].t) break; - stp = & (screen.text[trow][tcol]); - srp = & (screen.rend[trow][tcol]); + stp = save[trow].t + tcol; + srp = save[trow].r + tcol; if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) break; @@ -3208,7 +3201,7 @@ col++; /* put us on one past the end */ /* Poke the values back in */ - ret->row = row - TermWin.saveLines; + ret->row = row - saveLines; ret->col = col; } @@ -3228,9 +3221,9 @@ col = Pixel2Col (x); row = Pixel2Row (y); MAX_IT (row, 0); - MIN_IT (row, (int)TermWin.nrow - 1); + MIN_IT (row, (int)nrow - 1); MAX_IT (col, 0); - MIN_IT (col, (int)TermWin.ncol); + MIN_IT (col, (int)ncol); /* * If we're selecting characters (single click) then we must check first @@ -3240,7 +3233,7 @@ */ if (((selection.clicks % 3) == 1) && !flag && (col == selection.mark.col - && (row == selection.mark.row + TermWin.view_start))) + && (row == selection.mark.row + view_start))) { /* select nothing */ selection.beg.row = selection.end.row = 0; @@ -3265,8 +3258,6 @@ 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; enum { LEFT, RIGHT @@ -3309,7 +3300,7 @@ pos.col = col; pos.row = row; - pos.row -= TermWin.view_start; /* adjust for scroll */ + pos.row -= view_start; /* adjust for scroll */ /* * This is mainly xterm style selection with a couple of differences, mainly @@ -3378,21 +3369,17 @@ if (selection.clicks == 1) { - end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; - - if (selection.beg.col > end_col - && end_col != -1 + if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN + && !save[selection.beg.row + saveLines].is_longer () #if ENABLE_FRILLS && !selection.rect #endif ) selection.beg.col = ncol; - end_col = screen.tlen[selection.end.row + TermWin.saveLines]; - if ( - selection.end.col > end_col - && end_col != -1 + selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN + && !save[selection.end.row + saveLines].is_longer () #if ENABLE_FRILLS && !selection.rect #endif @@ -3412,19 +3399,14 @@ #if ENABLE_FRILLS if (options & Opt_tripleclickwords) { - int end_row; - 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 (!save[end_row + saveLines].is_longer ()) { selection.end.row = end_row; - selection.end.col = end_col; + selection.end.col = save[end_row + saveLines].l; selection_remove_trailing_spaces (); break; } @@ -3440,12 +3422,12 @@ selection.end.col = ncol; // select a complete logical line - while (selection.beg.row > -TermWin.saveLines - && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) + while (selection.beg.row > -saveLines + && save[selection.beg.row - 1 + saveLines].is_longer ()) selection.beg.row--; - while (selection.end.row < TermWin.nrow - && screen.tlen[selection.end.row + TermWin.saveLines] == -1) + while (selection.end.row < nrow + && save[selection.end.row + saveLines].is_longer ()) selection.end.row++; } } @@ -3482,7 +3464,7 @@ for ( ; end_row >= selection.beg.row; ) { - stp = screen.text[end_row + TermWin.saveLines]; + stp = save[end_row + saveLines].t; while (--end_col >= 0) { @@ -3493,7 +3475,7 @@ } if (end_col >= 0 - || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) + || !save[end_row - 1 + saveLines].is_longer ()) { selection.end.col = end_col + 1; selection.end.row = end_row; @@ -3501,7 +3483,7 @@ } end_row--; - end_col = TermWin.ncol; + end_col = ncol; } if (selection.mark.row > selection.end.row) @@ -3674,9 +3656,9 @@ 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); */ } /* ------------------------------------------------------------------------- */ @@ -3686,10 +3668,10 @@ { XWindowAttributes xwa; - XGetWindowAttributes (display->display, TermWin.vt, &xwa); + XGetWindowAttributes (display->display, vt, &xwa); pos.x = xwa.x + Col2Pixel (screen.cur.col); - pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; + pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; } #endif @@ -3697,25 +3679,25 @@ void rxvt_term::scr_overlay_new (int x, int y, int w, int h) { - if (TermWin.nrow < 3 || TermWin.ncol < 3) + if (nrow < 3 || ncol < 3) return; want_refresh = 1; scr_overlay_off (); - if (x < 0) x = TermWin.ncol - w; - if (y < 0) y = TermWin.nrow - h; + if (x < 0) x = ncol - w; + if (y < 0) y = nrow - h; // make space for border - w += 2; MIN_IT (w, TermWin.ncol); - h += 2; MIN_IT (h, TermWin.nrow); + w += 2; MIN_IT (w, ncol); + h += 2; MIN_IT (h, nrow); x -= 1; MAX_IT (x, 0); y -= 1; MAX_IT (y, 0); - MIN_IT (x, TermWin.ncol - w); - MIN_IT (y, TermWin.nrow - h); + MIN_IT (x, ncol - w); + MIN_IT (y, nrow - h); ov_x = x; ov_y = y; ov_w = w; ov_h = h; @@ -3790,12 +3772,28 @@ } void +rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) +{ + while (*s) + { + text_t t = *s++; + int width = wcwidth (t); + + while (width--) + { + scr_overlay_set (x++, y, t); + t = NOCHAR; + } + } +} + +void rxvt_term::scr_swap_overlay () { if (!ov_text) return; - int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; + int row_offset = ov_y + saveLines - view_start; // swap screen mem with overlay for (int y = ov_h; y--; ) @@ -3803,8 +3801,8 @@ text_t *t1 = ov_text[y]; rend_t *r1 = ov_rend[y]; - text_t *t2 = screen.text[y + row_offset] + ov_x; - rend_t *r2 = screen.rend[y + row_offset] + ov_x; + text_t *t2 = save[y + row_offset].t + ov_x; + rend_t *r2 = save[y + row_offset].r + ov_x; for (int x = ov_w; x--; ) {