--- rxvt-unicode/src/screen.C 2003/11/25 11:52:42 1.3 +++ rxvt-unicode/src/screen.C 2003/12/17 09:00:35 1.8 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*--------------------------------------* - * File: screen.c + * File: screen.c *---------------------------------------------------------------------------* - * $Id: screen.C,v 1.3 2003/11/25 11:52:42 pcg Exp $ + * $Id: screen.C,v 1.8 2003/12/17 09:00:35 pcg Exp $ * * Copyright (c) 1997-2001 Geoff Wing * @@ -23,69 +23,67 @@ * We handle _all_ screen updates and selections */ -#include "../config.h" /* NECESSARY */ +#include "../config.h" /* NECESSARY */ #define INTERN_SCREEN -#include "rxvt.h" /* NECESSARY */ -#include "screen.intpro" /* PROTOS for internal routines */ +#include "rxvt.h" /* NECESSARY */ +#include "screen.intpro" /* PROTOS for internal routines */ -#include /* get the typedef for CARD32 */ +#include /* get the typedef for CARD32 */ #include #include +#include "salloc.C" // HACK!! + inline void fill_text (text_t *start, text_t value, int len) { while (len--) *start++ = value; } -#define RESET_CHSTAT(H) \ - if ((H)->chstat == WBYTE) \ - (H)->chstat = SBYTE, (H)->lost_multi = 1 - /* ------------------------------------------------------------------------- */ -#define PROP_SIZE 16384 -#define TABSIZE 8 /* default tab size */ +#define PROP_SIZE 16384 +#define TABSIZE 8 /* default tab size */ /* ------------------------------------------------------------------------- * * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * * ------------------------------------------------------------------------- */ -#define ZERO_SCROLLBACK(R) \ - if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ - (R)->TermWin.view_start = 0 -#define CLEAR_SELECTION(R) \ - (R)->selection.beg.row = (R)->selection.beg.col \ - = (R)->selection.end.row = (R)->selection.end.col = 0 -#define CLEAR_ALL_SELECTION(R) \ - (R)->selection.beg.row = (R)->selection.beg.col \ - = (R)->selection.mark.row = (R)->selection.mark.col \ - = (R)->selection.end.row = (R)->selection.end.col = 0 +#define ZERO_SCROLLBACK(R) \ + if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ + (R)->TermWin.view_start = 0 +#define CLEAR_SELECTION(R) \ + (R)->selection.beg.row = (R)->selection.beg.col \ + = (R)->selection.end.row = (R)->selection.end.col = 0 +#define CLEAR_ALL_SELECTION(R) \ + (R)->selection.beg.row = (R)->selection.beg.col \ + = (R)->selection.mark.row = (R)->selection.mark.col \ + = (R)->selection.end.row = (R)->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) /* @@ -93,351 +91,386 @@ * CLEAR_CHARS: clear chars starting from pixel position * ERASE_ROWS : set rows starting from row to the foreground colour */ -#define drawBuffer (R->TermWin.vt) +#define drawBuffer (R->TermWin.vt) -#define CLEAR_ROWS(row, num) \ - if (R->TermWin.mapped) \ - XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ - Row2Pixel(row), (unsigned int)R->TermWin.width, \ - (unsigned int)Height2Pixel(num), False) - -#define CLEAR_CHARS(x, y, num) \ - if (R->TermWin.mapped) \ - XClearArea(R->Xdisplay, drawBuffer, x, y, \ - (unsigned int)Width2Pixel(num), \ - (unsigned int)Height2Pixel(1), False) - -#define ERASE_ROWS(row, num) \ - XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ - R->TermWin.int_bwidth, Row2Pixel(row), \ - (unsigned int)R->TermWin.width, \ - (unsigned int)Height2Pixel(num)) +#define CLEAR_ROWS(row, num) \ + if (R->TermWin.mapped) \ + XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ + Row2Pixel(row), (unsigned int)R->TermWin.width, \ + (unsigned int)Height2Pixel(num), False) + +#define CLEAR_CHARS(x, y, num) \ + if (R->TermWin.mapped) \ + XClearArea(R->Xdisplay, drawBuffer, x, y, \ + (unsigned int)Width2Pixel(num), \ + (unsigned int)Height2Pixel(1), False) + +#define ERASE_ROWS(row, num) \ + XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ + R->TermWin.int_bwidth, Row2Pixel(row), \ + (unsigned int)R->TermWin.width, \ + (unsigned int)Height2Pixel(num)) /* ------------------------------------------------------------------------- * * SCREEN `COMMON' ROUTINES * * ------------------------------------------------------------------------- */ /* Fill part/all of a line with blanks. */ -/* INTPROTO */ void -rxvt_blank_line(pR_ text_t *et, rend_t *er, unsigned int width, rend_t efs) +rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) { - efs &= ~RS_baseattrMask; - efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); + efs &= ~RS_baseattrMask; + efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); - while (width--) - { - *et++ = ' '; - *er++ = efs; - } + while (width--) + { + *et++ = ' '; + *er++ = efs; + } } /* ------------------------------------------------------------------------- */ /* Fill a full line with blanks - make sure it is allocated first */ -/* INTPROTO */ void -rxvt_blank_screen_mem(pR_ text_t **tp, rend_t **rp, unsigned int row, rend_t efs) +rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) { - int width = R->TermWin.ncol; - rend_t *er; - #ifdef DEBUG_STRICT - assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); + assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); #endif - if (tp[row] == NULL) { - tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width); - rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width); + if (tp[row] == NULL) + { + tp[row] = (text_t *)talloc->alloc (); + rp[row] = (rend_t *)ralloc->alloc (); } - rxvt_blank_line (aR_ tp[row], rp[row], width, efs); + + scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); } /* ------------------------------------------------------------------------- * * SCREEN INITIALISATION * * ------------------------------------------------------------------------- */ -/* EXTPROTO */ void -rxvt_scr_reset(pR) +rxvt_term::scr_reset () { - unsigned int ncol, nrow, prev_ncol, prev_nrow, - total_rows, prev_total_rows; - unsigned int p, q; - int k; - rend_t setrstyle; + unsigned int ncol, nrow, total_rows, prev_total_rows; + unsigned int p, q; + int k; + rend_t setrstyle; - D_SCREEN((stderr, "rxvt_scr_reset()")); + D_SCREEN((stderr, "rxvt_scr_reset()")); - R->TermWin.view_start = 0; - RESET_CHSTAT(R); - R->num_scr = 0; + TermWin.view_start = 0; + num_scr = 0; - prev_ncol = R->prev_ncol; - prev_nrow = R->prev_nrow; - if (R->TermWin.ncol == 0) - R->TermWin.ncol = 80; - if (R->TermWin.nrow == 0) - R->TermWin.nrow = 24; - ncol = R->TermWin.ncol; - nrow = R->TermWin.nrow; - if (ncol == prev_ncol && nrow == prev_nrow) - return; + if (TermWin.ncol == 0) + TermWin.ncol = 80; - R->want_refresh = 1; + if (TermWin.nrow == 0) + TermWin.nrow = 24; - total_rows = nrow + R->TermWin.saveLines; - prev_total_rows = prev_nrow + R->TermWin.saveLines; + ncol = TermWin.ncol; + nrow = TermWin.nrow; - R->screen.tscroll = 0; - R->screen.bscroll = nrow - 1; + if (ncol == prev_ncol && nrow == prev_nrow) + return; - if (prev_nrow == 0) { -/* - * A: 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 - */ - R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); - R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); - R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); - R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); - - R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); - R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); - - R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); - R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); - R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); - R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); - - for (p = 0; p < nrow; p++) { - q = p + R->TermWin.saveLines; - rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, - q, DEFAULT_RSTYLE); - rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, - p, DEFAULT_RSTYLE); - R->screen.tlen[q] = R->swap.tlen[p] = 0; - rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, - p, DEFAULT_RSTYLE); - } - MEMSET(R->charsets, 'B', sizeof(R->charsets)); - R->TermWin.nscrolled = 0; /* no saved lines */ - R->rstyle = DEFAULT_RSTYLE; - R->screen.flags = Screen_DefaultFlags; - R->screen.cur.row = R->screen.cur.col = 0; - R->screen.charset = 0; - R->current_screen = PRIMARY; - rxvt_scr_cursor(aR_ SAVE); -#if NSCREENS - R->swap.flags = Screen_DefaultFlags; - R->swap.cur.row = R->swap.cur.col = 0; - R->swap.charset = 0; - R->current_screen = SECONDARY; - rxvt_scr_cursor(aR_ SAVE); - R->current_screen = PRIMARY; -#endif - R->selection.text = NULL; - R->selection.len = 0; - R->selection.op = SELECTION_CLEAR; - R->selection.screen = PRIMARY; - R->selection.clicks = 0; - CLEAR_ALL_SELECTION(R); - R->rvideo = 0; + want_refresh = 1; - } else { -/* - * B1: add or delete rows as appropriate - */ - setrstyle = DEFAULT_RSTYLE; + total_rows = nrow + TermWin.saveLines; + prev_total_rows = prev_nrow + TermWin.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 (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); + } + + 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; + screen.charset = 0; + current_screen = PRIMARY; + rxvt_scr_cursor (this, SAVE); + +#if NSCREENS + swap.flags = Screen_DefaultFlags; + swap.cur.row = swap.cur.col = 0; + swap.charset = 0; + current_screen = SECONDARY; + rxvt_scr_cursor(aR_ SAVE); + current_screen = PRIMARY; +#endif + + selection.text = NULL; + selection.len = 0; + selection.op = SELECTION_CLEAR; + selection.screen = PRIMARY; + selection.clicks = 0; + CLEAR_ALL_SELECTION (this); + rvideo = 0; + } + else + { + /* + * add or delete rows as appropriate + */ + setrstyle = DEFAULT_RSTYLE; + + if (nrow < prev_nrow) + { + /* delete rows */ + k = min (TermWin.nscrolled, prev_nrow - nrow); + scr_scroll_text (0, (int)prev_nrow - 1, k, 1); - if (nrow < prev_nrow) { - /* delete rows */ - k = min(R->TermWin.nscrolled, prev_nrow - nrow); - rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); - for (p = nrow; p < prev_nrow; p++) { - q = p + R->TermWin.saveLines; - if (R->screen.text[q]) { + for (p = nrow; p < prev_nrow; p++) + { + q = p + TermWin.saveLines; + if (screen.text[q]) + { #ifdef DEBUG_STRICT - assert(R->screen.rend[q]); + assert (screen.rend[q]); #endif - free(R->screen.text[q]); - free(R->screen.rend[q]); - } - if (R->swap.text[p]) { + talloc->free (screen.text[q]); + ralloc->free (screen.rend[q]); + } + if (swap.text[p]) + { #ifdef DEBUG_STRICT - assert(R->swap.rend[p]); + assert (swap.rend[p]); #endif - free(R->swap.text[p]); - free(R->swap.rend[p]); - } + talloc->free (swap.text[p]); + ralloc->free (swap.rend[p]); + } #ifdef DEBUG_STRICT - assert(R->drawn_text[p] && R->drawn_rend[p]); + assert (drawn_text[p] && drawn_rend[p]); #endif - free(R->drawn_text[p]); - free(R->drawn_rend[p]); - } - /* we have fewer rows so fix up cursor position */ - MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); - MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); - - rxvt_scr_reset_realloc(aR); /* realloc _last_ */ - - } else if (nrow > prev_nrow) { - /* add rows */ - rxvt_scr_reset_realloc(aR); /* realloc _first_ */ - - k = min(R->TermWin.nscrolled, nrow - prev_nrow); - for (p = prev_total_rows; p < total_rows; p++) { - R->screen.tlen[p] = 0; - R->screen.text[p] = NULL; - R->screen.rend[p] = NULL; - } - for (p = prev_total_rows; p < total_rows - k; p++) - rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, - p, setrstyle); - for (p = prev_nrow; p < nrow; p++) { - R->swap.tlen[p] = 0; - R->swap.text[p] = NULL; - R->swap.rend[p] = NULL; - R->drawn_text[p] = NULL; - R->drawn_rend[p] = NULL; - rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, - p, setrstyle); - rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, - p, setrstyle); - } - if (k > 0) { - rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); - R->screen.cur.row += k; - R->screen.s_cur.row += k; - R->TermWin.nscrolled -= k; - } + talloc->free (drawn_text[p]); + ralloc->free (drawn_rend[p]); + } + + /* 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); + + scr_reset_realloc (); /* realloc _last_ */ + } + else if (nrow > prev_nrow) + { + /* add rows */ + scr_reset_realloc (); /* realloc _first_ */ + + TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this + + k = min (TermWin.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; + } + + for (p = prev_total_rows; p < total_rows - k; p++) + scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); + + 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); + } + + 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(R->screen.cur.row < R->TermWin.nrow); - assert(R->swap.cur.row < R->TermWin.nrow); -#else /* drive with your eyes closed */ - MIN_IT(R->screen.cur.row, nrow - 1); - MIN_IT(R->swap.cur.row, nrow - 1); -#endif - } -/* B2: resize columns */ - if (ncol != prev_ncol) { - for (p = 0; p < total_rows; p++) { - if (R->screen.text[p]) { - R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); - R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); - MIN_IT(R->screen.tlen[p], (int16_t)ncol); - if (ncol > prev_ncol) - rxvt_blank_line(aR_ - &(R->screen.text[p][prev_ncol]), - &(R->screen.rend[p][prev_ncol]), - ncol - prev_ncol, - setrstyle); - } - } - for (p = 0; p < nrow; p++) { - R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t)); - R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t)); - if (R->swap.text[p]) { - R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t)); - R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t)); - MIN_IT(R->swap.tlen[p], (int16_t)ncol); - if (ncol > prev_ncol) - rxvt_blank_line(aR_ - &(R->swap.text[p][prev_ncol]), - &(R->swap.rend[p][prev_ncol]), - ncol - prev_ncol, setrstyle); - } - if (ncol > prev_ncol) - rxvt_blank_line(aR_ - &(R->drawn_text[p][prev_ncol]), - &(R->drawn_rend[p][prev_ncol]), - ncol - prev_ncol, setrstyle); - } - MIN_IT(R->screen.cur.col, (int16_t)ncol - 1); - MIN_IT(R->swap.cur.col, (int16_t)ncol - 1); - } - if (R->tabs) - free(R->tabs); - } - - R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); + assert(screen.cur.row < TermWin.nrow); + assert(swap.cur.row < TermWin.nrow); +#else /* drive with your eyes closed */ + + 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 + } + + /* 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)); + + for (p = 0; p < total_rows; p++) + { + if (screen.text[p]) + { + 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; + + MIN_IT(screen.tlen[p], (int16_t)ncol); + + if (ncol > prev_ncol) + scr_blank_line (&(screen.text[p][prev_ncol]), + &(screen.rend[p][prev_ncol]), + ncol - prev_ncol, + setrstyle); + } + } + + 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; - for (p = 0; p < ncol; p++) - R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; + if (ncol > prev_ncol) + scr_blank_line (&(drawn_text[p][prev_ncol]), + &(drawn_rend[p][prev_ncol]), + ncol - prev_ncol, setrstyle); + + 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; + + MIN_IT(swap.tlen[p], (int16_t)ncol); + + if (ncol > prev_ncol) + scr_blank_line (&(swap.text[p][prev_ncol]), + &(swap.rend[p][prev_ncol]), + ncol - prev_ncol, setrstyle); + } - R->prev_nrow = nrow; - R->prev_ncol = ncol; + } + + MIN_IT (screen.cur.col, (int16_t)ncol - 1); + MIN_IT (swap.cur.col, (int16_t)ncol - 1); + + delete talloc; talloc = ta; + delete ralloc; ralloc = ra; + } + + if (tabs) + free(tabs); + } + + prev_nrow = nrow; + prev_ncol = ncol; - rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid); + tabs = (char *)rxvt_malloc (ncol * sizeof(char)); + + for (p = 0; p < ncol; p++) + tabs[p] = (p % TABSIZE == 0) ? 1 : 0; + + tt_winch (); } -/* INTPROTO */ void -rxvt_scr_reset_realloc(pR) +rxvt_term::scr_reset_realloc() { - uint16_t total_rows, nrow; + uint16_t total_rows, nrow; - nrow = R->TermWin.nrow; - total_rows = nrow + R->TermWin.saveLines; -/* *INDENT-OFF* */ - R->screen.text = (text_t **)rxvt_realloc(R->screen.text, total_rows * sizeof(text_t *)); - R->buf_text = (text_t **)rxvt_realloc(R->buf_text , total_rows * sizeof(text_t *)); - R->drawn_text = (text_t **)rxvt_realloc(R->drawn_text , nrow * sizeof(text_t *)); - R->swap.text = (text_t **)rxvt_realloc(R->swap.text , nrow * sizeof(text_t *)); - - R->screen.tlen = (int16_t *)rxvt_realloc(R->screen.tlen, total_rows * sizeof(int16_t)); - R->swap.tlen = (int16_t *)rxvt_realloc(R->swap.tlen , total_rows * sizeof(int16_t)); - - R->screen.rend = (rend_t **)rxvt_realloc(R->screen.rend, total_rows * sizeof(rend_t *)); - R->buf_rend = (rend_t **)rxvt_realloc(R->buf_rend , total_rows * sizeof(rend_t *)); - R->drawn_rend = (rend_t **)rxvt_realloc(R->drawn_rend , nrow * sizeof(rend_t *)); - R->swap.rend = (rend_t **)rxvt_realloc(R->swap.rend , nrow * sizeof(rend_t *)); -/* *INDENT-ON* */ + 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* */ } /* ------------------------------------------------------------------------- */ /* * Free everything. That way malloc debugging can find leakage. */ -/* EXTPROTO */ void -rxvt_scr_release(pR) +rxvt_term::scr_release() { - uint16_t total_rows; - int i; + uint16_t total_rows; + int i; + + total_rows = TermWin.nrow + TermWin.saveLines; - total_rows = R->TermWin.nrow + R->TermWin.saveLines; - for (i = 0; i < total_rows; i++) { - if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ - free(R->screen.text[i]); #ifdef DEBUG_STRICT - assert(R->screen.rend[i]); -#endif - free(R->screen.rend[i]); - } + for (i = 0; i < total_rows; i++) + { + if (screen.text[i]) + /* then so is screen.rend[i] */ + assert(screen.rend[i]); } - for (i = 0; i < R->TermWin.nrow; i++) { - free(R->drawn_text[i]); - free(R->drawn_rend[i]); - free(R->swap.text[i]); - free(R->swap.rend[i]); - } - free(R->screen.text); - free(R->screen.tlen); - free(R->screen.rend); - free(R->drawn_text); - free(R->drawn_rend); - free(R->swap.text); - free(R->swap.tlen); - free(R->swap.rend); - free(R->buf_text); - free(R->buf_rend); - free(R->tabs); - -/* NULL these so if anything tries to use them, we'll know about it */ - R->screen.text = R->drawn_text = R->swap.text = NULL; - R->screen.rend = R->drawn_rend = R->swap.rend = NULL; - R->screen.tlen = R->swap.tlen = NULL; - R->buf_text = NULL; - R->buf_rend = NULL; - R->tabs = NULL; +#endif + + delete talloc; + delete ralloc; + + 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 (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; } /* ------------------------------------------------------------------------- */ @@ -448,16 +481,16 @@ void rxvt_scr_poweron(pR) { - D_SCREEN((stderr, "rxvt_scr_poweron()")); + D_SCREEN((stderr, "rxvt_scr_poweron()")); - rxvt_scr_release(aR); - R->prev_nrow = R->prev_ncol = 0; - rxvt_scr_reset(aR); + R->scr_release (); + R->prev_nrow = R->prev_ncol = 0; + R->scr_reset (); - rxvt_scr_clear(aR); - rxvt_scr_refresh(aR_ SLOW_REFRESH); + rxvt_scr_clear (aR); + rxvt_scr_refresh (aR_ SLOW_REFRESH); #ifdef RXVT_GRAPHICS - rxvt_Gr_reset(aR); + rxvt_Gr_reset (aR); #endif } @@ -479,28 +512,28 @@ #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) if (R->current_screen == SECONDARY) - s = &(R->swap); + s = &(R->swap); else #endif - s = &(R->screen); + s = &(R->screen); switch (mode) { case SAVE: - s->s_cur.row = s->cur.row; - s->s_cur.col = s->cur.col; - s->s_rstyle = R->rstyle; - s->s_charset = s->charset; - s->s_charset_char = R->charsets[s->charset]; - break; + s->s_cur.row = s->cur.row; + s->s_cur.col = s->cur.col; + s->s_rstyle = R->rstyle; + s->s_charset = s->charset; + s->s_charset_char = R->charsets[s->charset]; + break; case RESTORE: - R->want_refresh = 1; - s->cur.row = s->s_cur.row; - s->cur.col = s->s_cur.col; - s->flags &= ~Screen_WrapNext; - R->rstyle = s->s_rstyle; - s->charset = s->s_charset; - R->charsets[s->charset] = s->s_charset_char; - rxvt_set_font_style(aR); - break; + R->want_refresh = 1; + s->cur.row = s->s_cur.row; + s->cur.col = s->s_cur.col; + s->flags &= ~Screen_WrapNext; + R->rstyle = s->s_rstyle; + s->charset = s->s_charset; + R->charsets[s->charset] = s->s_charset_char; + rxvt_set_font_style(aR); + break; } /* boundary check in case screen size changed between SAVE and RESTORE */ MIN_IT(s->cur.row, R->TermWin.nrow - 1); @@ -508,7 +541,7 @@ #ifdef DEBUG_STRICT assert(s->cur.row >= 0); assert(s->cur.col >= 0); -#else /* drive with your eyes closed */ +#else /* drive with your eyes closed */ MAX_IT(s->cur.row, 0); MAX_IT(s->cur.col, 0); #endif @@ -534,28 +567,27 @@ D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); R->TermWin.view_start = 0; - RESET_CHSTAT(R); if (R->current_screen == scrn) - return R->current_screen; + return R->current_screen; - rxvt_selection_check(aR_ 2); /* check for boundary cross */ + rxvt_selection_check(aR_ 2); /* check for boundary cross */ SWAP_IT(R->current_screen, scrn, int); #if NSCREENS R->num_scr = 0; offset = R->TermWin.saveLines; for (i = R->prev_nrow; i--;) { - SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); - SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); - SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); + SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); + SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); + SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); } SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); # ifdef DEBUG_STRICT assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->prev_nrow)); assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->prev_ncol)); -# else /* drive with your eyes closed */ +# else /* drive with your eyes closed */ MAX_IT(R->screen.cur.row, 0); MIN_IT(R->screen.cur.row, (int32_t)R->prev_nrow - 1); MAX_IT(R->screen.cur.col, 0); @@ -569,22 +601,22 @@ # ifdef RXVT_GRAPHICS if (rxvt_Gr_Displayed(aR)) { - rxvt_Gr_scroll(aR_ 0); - rxvt_Gr_ChangeScreen(aR); + rxvt_Gr_scroll(aR_ 0); + rxvt_Gr_ChangeScreen(aR); } # endif #else # ifdef SCROLL_ON_NO_SECONDARY # ifdef RXVT_GRAPHICS if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_ClearScreen(aR); + rxvt_Gr_ClearScreen(aR); # endif if (R->current_screen == PRIMARY # ifdef RXVT_GRAPHICS && !rxvt_Gr_Displayed(aR) # endif ) - rxvt_scroll_text(aR_ 0, (R->prev_nrow - 1), R->prev_nrow, 0); + R->scr_scroll_text(0, (R->prev_nrow - 1), R->prev_nrow, 0); # endif #endif return scrn; @@ -600,9 +632,9 @@ { color &= RS_fgMask; if (fgbg == Color_fg) - R->rstyle = SET_FGCOLOR(R->rstyle, color); + R->rstyle = SET_FGCOLOR(R->rstyle, color); else - R->rstyle = SET_BGCOLOR(R->rstyle, color); + R->rstyle = SET_BGCOLOR(R->rstyle, color); } /* ------------------------------------------------------------------------- */ @@ -614,11 +646,11 @@ rxvt_scr_rendition(pR_ int set, int style) { if (set) - R->rstyle |= style; + R->rstyle |= style; else if (style == ~RS_None) - R->rstyle = DEFAULT_RSTYLE; + R->rstyle = DEFAULT_RSTYLE; else - R->rstyle &= ~style; + R->rstyle &= ~style; } /* ------------------------------------------------------------------------- */ @@ -628,108 +660,129 @@ * count negative ==> scroll down * spec == 0 for normal routines */ -/* EXTPROTO */ int -rxvt_scroll_text(pR_ int row1, int row2, int count, int spec) +rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) { - int i, j; - long nscrolled; + int i, j; + long nscrolled; - if (count == 0 || (row1 > row2)) - return 0; + if (count == 0 || (row1 > row2)) + return 0; - R->want_refresh = 1; - D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (R->current_screen == PRIMARY) ? "Primary" : "Secondary")); + want_refresh = 1; + D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); - if ((count > 0) && (row1 == 0) && (R->current_screen == PRIMARY)) { - nscrolled = (long)R->TermWin.nscrolled + (long)count;; - if (nscrolled > (long)R->TermWin.saveLines) - R->TermWin.nscrolled = R->TermWin.saveLines; - else - R->TermWin.nscrolled = (uint16_t)nscrolled; - if ((R->Options & Opt_scrollWithBuffer) - && R->TermWin.view_start != 0 - && R->TermWin.view_start != R->TermWin.saveLines) - rxvt_scr_page(aR_ UP, count); - } else if (!spec) - row1 += R->TermWin.saveLines; - row2 += R->TermWin.saveLines; + if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) + { + nscrolled = (long)TermWin.nscrolled + (long)count; - if (R->selection.op && R->current_screen == R->selection.screen) { - i = R->selection.beg.row + R->TermWin.saveLines; - j = R->selection.end.row + R->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(R); - R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ - } else if (j >= row1 && j <= row2) { - /* move selected region too */ - R->selection.beg.row -= count; - R->selection.end.row -= count; - R->selection.mark.row -= count; - } - } - rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ - - R->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++) { - R->buf_text[i] = R->screen.text[j]; - R->buf_rend[i] = R->screen.rend[j]; - } -/* A2: Rotate lines */ - for (j = row1, i = j + count; i <= row2; i++, j++) { - R->screen.tlen[j] = R->screen.tlen[i]; - R->screen.text[j] = R->screen.text[i]; - R->screen.rend[j] = R->screen.rend[i]; - } - j = row2 - count + 1, i = count; - } else /* if (j < 0) */ { -/* B: scroll down */ - -/* B1: Copy lines that will get clobbered by the rotation */ - for (i = 0, j = row2; i < count; i++, j--) { - R->buf_text[i] = R->screen.text[j]; - R->buf_rend[i] = R->screen.rend[j]; - } -/* B2: Rotate lines */ - for (j = row2, i = j - count; i >= row1; i--, j--) { - R->screen.tlen[j] = R->screen.tlen[i]; - R->screen.text[j] = R->screen.text[i]; - R->screen.rend[j] = R->screen.rend[i]; - } - j = row1, i = count; - count = -count; - } - -/* C: Resurrect lines */ - for (; i--; j++) { - R->screen.tlen[j] = 0; - R->screen.text[j] = R->buf_text[i]; - R->screen.rend[j] = R->buf_rend[i]; - if (!spec) /* line length may not equal TermWin.ncol */ - rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, - (unsigned int)j, R->rstyle); + if (nscrolled > (long)TermWin.saveLines) + TermWin.nscrolled = TermWin.saveLines; + else + TermWin.nscrolled = (uint16_t)nscrolled; + + if ((Options & Opt_scrollWithBuffer) + && TermWin.view_start != 0 + && TermWin.view_start != TermWin.saveLines) + rxvt_scr_page (this, UP, count); + } + else if (!spec) + row1 += TermWin.saveLines; + + row2 += TermWin.saveLines; + + 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 (this); + 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; + } + } + + rxvt_selection_check (this, 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++) + { + buf_text[i] = screen.text[j]; + buf_rend[i] = screen.rend[j]; + } + /* A2: Rotate lines */ + for (j = row1, i = j + count; i <= row2; i++, j++) + { + screen.tlen[j] = screen.tlen[i]; + screen.text[j] = screen.text[i]; + screen.rend[j] = screen.rend[i]; + } + j = row2 - count + 1, i = count; + } + else /* if (j < 0) */ + { + /* B: scroll down */ + + /* B1: 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]; + } + /* B2: 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]; + } + j = row1, i = count; + count = -count; + } + + /* C: Resurrect lines */ + for (; i--; j++) + { + screen.tlen[j] = 0; + screen.text[j] = buf_text[i]; + screen.rend[j] = buf_rend[i]; + + if (!spec) /* line length may not equal TermWin.ncol */ + scr_blank_screen_mem (screen.text, screen.rend, + (unsigned int)j, rstyle); } #ifdef RXVT_GRAPHICS - if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ count); + if (rxvt_Gr_Displayed (this)) + rxvt_Gr_scroll(this, count); #endif - return count; + + return count; } /* ------------------------------------------------------------------------- */ @@ -746,8 +799,8 @@ text_t *stp; rend_t *srp; - if (len <= 0) /* sanity */ - return; + if (len <= 0) /* sanity */ + return; R->want_refresh = 1; last_col = R->TermWin.ncol; @@ -755,21 +808,20 @@ D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); ZERO_SCROLLBACK(R); if (nlines > 0) { - nlines += (R->screen.cur.row - R->screen.bscroll); - if ((nlines > 0) - && (R->screen.tscroll == 0) - && (R->screen.bscroll == (R->TermWin.nrow - 1))) { - /* _at least_ this many lines need to be scrolled */ - rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, - 0); - R->screen.cur.row -= nlines; - } + nlines += (R->screen.cur.row - R->screen.bscroll); + if ((nlines > 0) + && (R->screen.tscroll == 0) + && (R->screen.bscroll == (R->TermWin.nrow - 1))) { + /* _at least_ this many lines need to be scrolled */ + R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, nlines, 0); + R->screen.cur.row -= nlines; + } } #ifdef DEBUG_STRICT assert(R->screen.cur.col < last_col); assert((R->screen.cur.row < R->TermWin.nrow) - && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); -#else /* drive with your eyes closed */ + && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); +#else /* drive with your eyes closed */ MIN_IT(R->screen.cur.col, last_col - 1); MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled); @@ -777,62 +829,60 @@ row = R->screen.cur.row + R->TermWin.saveLines; checksel = (R->selection.op - && R->current_screen == R->selection.screen) ? 1 : 0; + && R->current_screen == R->selection.screen) ? 1 : 0; clearsel = 0; stp = R->screen.text[row]; srp = R->screen.rend[row]; for (i = 0; i < len;) { - c = str[i++]; - switch (c) { - case '\t': - rxvt_scr_tab(aR_ 1); - continue; - case '\n': - if (R->screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT(R->screen.tlen[row], R->screen.cur.col); - R->screen.flags &= ~Screen_WrapNext; - if (R->screen.cur.row == R->screen.bscroll) - rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); - else if (R->screen.cur.row < (R->TermWin.nrow - 1)) - row = (++R->screen.cur.row) + R->TermWin.saveLines; - stp = R->screen.text[row]; /* _must_ refresh */ - srp = R->screen.rend[row]; /* _must_ refresh */ - RESET_CHSTAT(R); - continue; - case '\r': - if (R->screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT(R->screen.tlen[row], R->screen.cur.col); - R->screen.flags &= ~Screen_WrapNext; - R->screen.cur.col = 0; - RESET_CHSTAT(R); - continue; - default: - if (c == 127) - continue; /* yummmm..... */ - break; - } - - if (checksel /* see if we're writing within selection */ - && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) - && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { - checksel = 0; - clearsel = 1; - } - if (R->screen.flags & Screen_WrapNext) { - R->screen.tlen[row] = -1; - if (R->screen.cur.row == R->screen.bscroll) - rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0); - else if (R->screen.cur.row < (R->TermWin.nrow - 1)) - row = (++R->screen.cur.row) + R->TermWin.saveLines; - stp = R->screen.text[row]; /* _must_ refresh */ - srp = R->screen.rend[row]; /* _must_ refresh */ - R->screen.cur.col = 0; - R->screen.flags &= ~Screen_WrapNext; - } - if (R->screen.flags & Screen_Insert) - rxvt_scr_insdel_chars(aR_ 1, INSERT); + c = str[i++]; + switch (c) { + case '\t': + rxvt_scr_tab (aR_ 1); + continue; + case '\n': + if (R->screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT(R->screen.tlen[row], R->screen.cur.col); + R->screen.flags &= ~Screen_WrapNext; + if (R->screen.cur.row == R->screen.bscroll) + R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, 1, 0); + else if (R->screen.cur.row < (R->TermWin.nrow - 1)) + row = (++R->screen.cur.row) + R->TermWin.saveLines; + stp = R->screen.text[row]; /* _must_ refresh */ + srp = R->screen.rend[row]; /* _must_ refresh */ + continue; + case '\r': + if (R->screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT(R->screen.tlen[row], R->screen.cur.col); + R->screen.flags &= ~Screen_WrapNext; + R->screen.cur.col = 0; + continue; + default: + if (c == 127) + continue; /* yummmm..... */ + break; + } + + if (checksel /* see if we're writing within selection */ + && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) + && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { + checksel = 0; + clearsel = 1; + } + if (R->screen.flags & Screen_WrapNext) { + R->screen.tlen[row] = -1; + if (R->screen.cur.row == R->screen.bscroll) + R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, 1, 0); + else if (R->screen.cur.row < (R->TermWin.nrow - 1)) + row = (++R->screen.cur.row) + R->TermWin.saveLines; + stp = R->screen.text[row]; /* _must_ refresh */ + srp = R->screen.rend[row]; /* _must_ refresh */ + R->screen.cur.col = 0; + R->screen.flags &= ~Screen_WrapNext; + } + if (R->screen.flags & Screen_Insert) + rxvt_scr_insdel_chars(aR_ 1, INSERT); if (R->charsets[R->screen.charset] == '0') // DEC SPECIAL switch (c) @@ -852,8 +902,8 @@ rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); - stp[R->screen.cur.col] = c; - srp[R->screen.cur.col] = rend; + stp[R->screen.cur.col] = c; + srp[R->screen.cur.col] = rend; if (c > 255) { @@ -874,16 +924,16 @@ } } - if (R->screen.cur.col < last_col - 1) - R->screen.cur.col++; - else { - R->screen.tlen[row] = last_col; - if (R->screen.flags & Screen_Autowrap) - R->screen.flags |= Screen_WrapNext; - } + if (R->screen.cur.col < last_col - 1) + R->screen.cur.col++; + else { + R->screen.tlen[row] = last_col; + if (R->screen.flags & Screen_Autowrap) + R->screen.flags |= Screen_WrapNext; + } } - if (R->screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT(R->screen.tlen[row], R->screen.cur.col); + if (R->screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT(R->screen.tlen[row], R->screen.cur.col); /* * If we wrote anywhere in the selected area, kill the selection @@ -891,11 +941,11 @@ * should be a similar check. */ if (clearsel) - CLEAR_SELECTION(R); + CLEAR_SELECTION(R); #ifdef DEBUG_STRICT assert(R->screen.cur.row >= 0); -#else /* drive with your eyes closed */ +#else /* drive with your eyes closed */ MAX_IT(R->screen.cur.row, 0); #endif } @@ -909,18 +959,17 @@ void rxvt_scr_backspace(pR) { - RESET_CHSTAT(R); R->want_refresh = 1; if (R->screen.cur.col == 0) { - if (R->screen.cur.row > 0) { + if (R->screen.cur.row > 0) { #ifdef TERMCAP_HAS_BW - R->screen.cur.col = R->TermWin.ncol - 1; - R->screen.cur.row--; - return; + R->screen.cur.col = R->TermWin.ncol - 1; + R->screen.cur.row--; + return; #endif - } + } } else if ((R->screen.flags & Screen_WrapNext) == 0) - rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); + rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); R->screen.flags &= ~Screen_WrapNext; } @@ -938,31 +987,30 @@ D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); R->want_refresh = 1; - RESET_CHSTAT(R); i = x = R->screen.cur.col; if (count == 0) - return; + return; else if (count > 0) { - for (; ++i < R->TermWin.ncol; ) - if (R->tabs[i]) { - x = i; - if (!--count) - break; - } - if (count) - x = R->TermWin.ncol - 1; + for (; ++i < R->TermWin.ncol; ) + if (R->tabs[i]) { + x = i; + if (!--count) + break; + } + if (count) + x = R->TermWin.ncol - 1; } else /* if (count < 0) */ { - for (; --i >= 0; ) - if (R->tabs[i]) { - x = i; - if (!++count) - break; - } - if (count) - x = 0; + for (; --i >= 0; ) + if (R->tabs[i]) { + x = i; + if (!++count) + break; + } + if (count) + x = 0; } if (x != R->screen.cur.col) - rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); + rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); } /* ------------------------------------------------------------------------- */ @@ -978,11 +1026,11 @@ rxvt_scr_backindex(pR) { if (R->screen.cur.col > 0) - rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); + rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); else { - if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) - return; /* um, yeah? */ - rxvt_scr_insdel_chars(aR_ 1, INSERT); + if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) + return; /* um, yeah? */ + rxvt_scr_insdel_chars(aR_ 1, INSERT); } } #endif @@ -1001,16 +1049,16 @@ int row; if (R->screen.cur.col < R->TermWin.ncol - 1) - rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); + rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); else { - row = R->screen.cur.row + R->TermWin.saveLines; - if (R->screen.tlen[row] == 0) - return; /* um, yeah? */ - else if (R->screen.tlen[row] == -1) - R->screen.tlen[row] = R->TermWin.ncol; - rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); - rxvt_scr_insdel_chars(aR_ 1, DELETE); - rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); + row = R->screen.cur.row + R->TermWin.saveLines; + if (R->screen.tlen[row] == 0) + return; /* um, yeah? */ + else if (R->screen.tlen[row] == -1) + R->screen.tlen[row] = R->TermWin.ncol; + rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); + rxvt_scr_insdel_chars(aR_ 1, DELETE); + rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); } } #endif @@ -1025,40 +1073,39 @@ { R->want_refresh = 1; ZERO_SCROLLBACK(R); - RESET_CHSTAT(R); #ifdef RXVT_GRAPHICS if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ 0); + rxvt_Gr_scroll(aR_ 0); #endif 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, R->screen.cur.row, R->screen.cur.col)); R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) - : col); + : col); MAX_IT(R->screen.cur.col, 0); MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); R->screen.flags &= ~Screen_WrapNext; if (relative & R_RELATIVE) { - if (row > 0) { - if (R->screen.cur.row <= R->screen.bscroll - && (R->screen.cur.row + row) > R->screen.bscroll) - R->screen.cur.row = R->screen.bscroll; - else - R->screen.cur.row += row; - } else if (row < 0) { - if (R->screen.cur.row >= R->screen.tscroll - && (R->screen.cur.row + row) < R->screen.tscroll) - R->screen.cur.row = R->screen.tscroll; - else - R->screen.cur.row += row; - } + if (row > 0) { + if (R->screen.cur.row <= R->screen.bscroll + && (R->screen.cur.row + row) > R->screen.bscroll) + R->screen.cur.row = R->screen.bscroll; + else + R->screen.cur.row += row; + } else if (row < 0) { + if (R->screen.cur.row >= R->screen.tscroll + && (R->screen.cur.row + row) < R->screen.tscroll) + R->screen.cur.row = R->screen.tscroll; + else + R->screen.cur.row += row; + } } else { - if (R->screen.flags & Screen_Relative) { /* relative origin mode */ - R->screen.cur.row = row + R->screen.tscroll; - MIN_IT(R->screen.cur.row, R->screen.bscroll); - } else - R->screen.cur.row = row; + if (R->screen.flags & Screen_Relative) { /* relative origin mode */ + R->screen.cur.row = row + R->screen.tscroll; + MIN_IT(R->screen.cur.row, R->screen.bscroll); + } else + R->screen.cur.row = row; } MAX_IT(R->screen.cur.row, 0); MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); @@ -1079,19 +1126,18 @@ D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); ZERO_SCROLLBACK(R); - RESET_CHSTAT(R); #ifdef RXVT_GRAPHICS if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ 0); + rxvt_Gr_scroll(aR_ 0); #endif R->screen.flags &= ~Screen_WrapNext; if ((R->screen.cur.row == R->screen.bscroll && direction == UP) - || (R->screen.cur.row == R->screen.tscroll && direction == DN)) - rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); + || (R->screen.cur.row == R->screen.tscroll && direction == DN)) + R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, dirn, 0); else - R->screen.cur.row += dirn; + R->screen.cur.row += dirn; MAX_IT(R->screen.cur.row, 0); MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); rxvt_selection_check(aR_ 0); @@ -1108,57 +1154,56 @@ void rxvt_scr_erase_line(pR_ int mode) { - unsigned int row, col, num; + unsigned int row, col, num; - R->want_refresh = 1; - D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); - ZERO_SCROLLBACK(R); - RESET_CHSTAT(R); + R->want_refresh = 1; + D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); + ZERO_SCROLLBACK (R); #ifdef RXVT_GRAPHICS - if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ 0); + if (rxvt_Gr_Displayed (aR)) + rxvt_Gr_scroll (aR_ 0); #endif - rxvt_selection_check(aR_ 1); + rxvt_selection_check (aR_ 1); - R->screen.flags &= ~Screen_WrapNext; + R->screen.flags &= ~Screen_WrapNext; - row = R->TermWin.saveLines + R->screen.cur.row; - switch (mode) { - case 0: /* erase to end of line */ - col = R->screen.cur.col; - num = R->TermWin.ncol - col; - MIN_IT(R->screen.tlen[row], (int16_t)col); - if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) - || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) - CLEAR_SELECTION(R); - break; - case 1: /* erase to beginning of line */ - col = 0; - num = R->screen.cur.col + 1; - if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) - || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) - CLEAR_SELECTION(R); - break; - case 2: /* erase whole line */ - col = 0; - num = R->TermWin.ncol; - R->screen.tlen[row] = 0; - if (R->selection.beg.row <= R->screen.cur.row - && R->selection.end.row >= R->screen.cur.row) - CLEAR_SELECTION(R); - break; - default: - return; - } - if (R->screen.text[row]) - rxvt_blank_line(aR_ - &(R->screen.text[row][col]), - &(R->screen.rend[row][col]), num, R->rstyle); - else - rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, - R->rstyle); + row = R->TermWin.saveLines + R->screen.cur.row; + switch (mode) + { + case 0: /* erase to end of line */ + col = R->screen.cur.col; + num = R->TermWin.ncol - col; + MIN_IT(R->screen.tlen[row], (int16_t)col); + if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) + || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) + CLEAR_SELECTION(R); + break; + case 1: /* erase to beginning of line */ + col = 0; + num = R->screen.cur.col + 1; + if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) + || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) + CLEAR_SELECTION(R); + break; + case 2: /* erase whole line */ + col = 0; + num = R->TermWin.ncol; + R->screen.tlen[row] = 0; + if (R->selection.beg.row <= R->screen.cur.row + && R->selection.end.row >= R->screen.cur.row) + CLEAR_SELECTION(R); + break; + default: + return; + } + + if (R->screen.text[row]) + R->scr_blank_line (&(R->screen.text[row][col]), + &(R->screen.rend[row][col]), num, R->rstyle); + else + R->scr_blank_screen_mem (R->screen.text, R->screen.rend, row, R->rstyle); } /* ------------------------------------------------------------------------- */ @@ -1180,62 +1225,60 @@ R->want_refresh = 1; D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row)); ZERO_SCROLLBACK(R); - RESET_CHSTAT(R); row_offset = (int32_t)R->TermWin.saveLines; switch (mode) { - case 0: /* erase to end of screen */ - rxvt_selection_check(aR_ 1); - rxvt_scr_erase_line(aR_ 0); - row = R->screen.cur.row + 1; /* possible OOB */ - num = R->TermWin.nrow - row; - break; - case 1: /* erase to beginning of screen */ - rxvt_selection_check(aR_ 3); - rxvt_scr_erase_line(aR_ 1); - row = 0; - num = R->screen.cur.row; - break; - case 2: /* erase whole screen */ - rxvt_selection_check(aR_ 3); + case 0: /* erase to end of screen */ + rxvt_selection_check(aR_ 1); + rxvt_scr_erase_line(aR_ 0); + row = R->screen.cur.row + 1; /* possible OOB */ + num = R->TermWin.nrow - row; + break; + case 1: /* erase to beginning of screen */ + rxvt_selection_check(aR_ 3); + rxvt_scr_erase_line(aR_ 1); + row = 0; + num = R->screen.cur.row; + break; + case 2: /* erase whole screen */ + rxvt_selection_check(aR_ 3); #ifdef RXVT_GRAPHICS - rxvt_Gr_ClearScreen(aR); + rxvt_Gr_ClearScreen(aR); #endif - row = 0; - num = R->TermWin.nrow; - break; + row = 0; + num = R->TermWin.nrow; + break; default: - return; + return; } R->refresh_type |= REFRESH_BOUNDS; if (R->selection.op && R->current_screen == R->selection.screen - && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) - || (R->selection.end.row >= row - && R->selection.end.row <= row + num))) - CLEAR_SELECTION(R); - if (row >= R->TermWin.nrow) /* Out Of Bounds */ - return; + && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) + || (R->selection.end.row >= row + && R->selection.end.row <= row + num))) + CLEAR_SELECTION(R); + if (row >= R->TermWin.nrow) /* Out Of Bounds */ + return; MIN_IT(num, (R->TermWin.nrow - row)); if (R->rstyle & (RS_RVid | RS_Uline)) - ren = (rend_t) ~RS_None; + ren = (rend_t) ~RS_None; else if (GET_BASEBG(R->rstyle) == Color_bg) { - ren = DEFAULT_RSTYLE; - CLEAR_ROWS(row, num); + ren = DEFAULT_RSTYLE; + CLEAR_ROWS(row, num); } else { - ren = (R->rstyle & (RS_fgMask | RS_bgMask)); - gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; - XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); - ERASE_ROWS(row, num); - gcvalue.foreground = R->PixColors[Color_fg]; - XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); + ren = (R->rstyle & (RS_fgMask | RS_bgMask)); + gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; + XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); + ERASE_ROWS(row, num); + gcvalue.foreground = R->PixColors[Color_fg]; + XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); } for (; num--; row++) { - rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, - (unsigned int)(row + row_offset), R->rstyle); - R->screen.tlen[row + row_offset] = 0; - rxvt_blank_line(aR_ - R->drawn_text[row], R->drawn_rend[row], - (unsigned int)R->TermWin.ncol, ren); + R->scr_blank_screen_mem (R->screen.text, R->screen.rend, + (unsigned int)(row + row_offset), R->rstyle); + R->screen.tlen[row + row_offset] = 0; + R->scr_blank_line (R->drawn_text[row], R->drawn_rend[row], + (unsigned int)R->TermWin.ncol, ren); } } @@ -1254,15 +1297,14 @@ R->want_refresh = 1; R->num_scr_allow = 0; ZERO_SCROLLBACK(R); - RESET_CHSTAT(R); rxvt_selection_check(aR_ 3); fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { - R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ - fill_text (R->screen.text[k], 'E', R->TermWin.ncol); - for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) - *r1++ = fs; + R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ + fill_text (R->screen.text[k], 'E', R->TermWin.ncol); + for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) + *r1++ = fs; } } @@ -1277,29 +1319,27 @@ int end; ZERO_SCROLLBACK(R); - RESET_CHSTAT(R); #ifdef RXVT_GRAPHICS if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ 0); + rxvt_Gr_scroll(aR_ 0); #endif rxvt_selection_check(aR_ 1); if (R->screen.cur.row > R->screen.bscroll) - return; + return; end = R->screen.bscroll - R->screen.cur.row + 1; if (count > end) { - if (insdel == DELETE) - return; - else if (insdel == INSERT) - count = end; + if (insdel == DELETE) + return; + else if (insdel == INSERT) + count = end; } R->screen.flags &= ~Screen_WrapNext; - rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, - 0); + R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0); } /* ------------------------------------------------------------------------- */ @@ -1318,17 +1358,14 @@ R->want_refresh = 1; ZERO_SCROLLBACK(R); -#if 0 - RESET_CHSTAT(R); -#endif #ifdef RXVT_GRAPHICS if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ 0); + rxvt_Gr_scroll(aR_ 0); #endif if (count <= 0) - return; + return; rxvt_selection_check(aR_ 1); MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); @@ -1341,65 +1378,64 @@ slp = &(R->screen.tlen[row]); switch (insdel) { case INSERT: - for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; - col--) { - stp[col] = stp[col - count]; - srp[col] = srp[col - count]; - } - if (*slp != -1) { - *slp += count; - MIN_IT(*slp, R->TermWin.ncol); - } - if (R->selection.op && R->current_screen == R->selection.screen - && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { - if (R->selection.end.row != R->screen.cur.row - || (R->selection.end.col + count >= R->TermWin.ncol)) - CLEAR_SELECTION(R); - else { /* shift selection */ - R->selection.beg.col += count; - R->selection.mark.col += count; /* XXX: yes? */ - R->selection.end.col += count; - } - } - rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), - (unsigned int)count, R->rstyle); - break; + for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; + col--) { + stp[col] = stp[col - count]; + srp[col] = srp[col - count]; + } + if (*slp != -1) { + *slp += count; + MIN_IT(*slp, R->TermWin.ncol); + } + if (R->selection.op && R->current_screen == R->selection.screen + && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { + if (R->selection.end.row != R->screen.cur.row + || (R->selection.end.col + count >= R->TermWin.ncol)) + CLEAR_SELECTION(R); + else { /* shift selection */ + R->selection.beg.col += count; + R->selection.mark.col += count; /* XXX: yes? */ + R->selection.end.col += count; + } + } + R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), + (unsigned int)count, R->rstyle); + break; case ERASE: - R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ - rxvt_selection_check(aR_ 1); - R->screen.cur.col -= count; - rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), - (unsigned int)count, R->rstyle); - break; + R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ + rxvt_selection_check(aR_ 1); + R->screen.cur.col -= count; + R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), + (unsigned int)count, R->rstyle); + break; case DELETE: - tr = srp[R->TermWin.ncol - 1] - & (RS_fgMask | RS_bgMask | RS_baseattrMask); - for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { - stp[col] = stp[col + count]; - srp[col] = srp[col + count]; - } - rxvt_blank_line(aR_ - &(stp[R->TermWin.ncol - count]), - &(srp[R->TermWin.ncol - count]), - (unsigned int)count, tr); - if (*slp == -1) /* break line continuation */ - *slp = R->TermWin.ncol; - *slp -= count; - MAX_IT(*slp, 0); - if (R->selection.op && R->current_screen == R->selection.screen - && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { - if (R->selection.end.row != R->screen.cur.row - || (R->screen.cur.col >= R->selection.beg.col - count) - || R->selection.end.col >= R->TermWin.ncol) - CLEAR_SELECTION(R); - else { - /* shift selection */ - R->selection.beg.col -= count; - R->selection.mark.col -= count; /* XXX: yes? */ - R->selection.end.col -= count; - } - } - break; + tr = srp[R->TermWin.ncol - 1] + & (RS_fgMask | RS_bgMask | RS_baseattrMask); + for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { + stp[col] = stp[col + count]; + srp[col] = srp[col + count]; + } + R->scr_blank_line (&(stp[R->TermWin.ncol - count]), + &(srp[R->TermWin.ncol - count]), + (unsigned int)count, tr); + if (*slp == -1) /* break line continuation */ + *slp = R->TermWin.ncol; + *slp -= count; + MAX_IT(*slp, 0); + if (R->selection.op && R->current_screen == R->selection.screen + && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { + if (R->selection.end.row != R->screen.cur.row + || (R->screen.cur.col >= R->selection.beg.col - count) + || R->selection.end.col >= R->TermWin.ncol) + CLEAR_SELECTION(R); + else { + /* shift selection */ + R->selection.beg.col -= count; + R->selection.mark.col -= count; /* XXX: yes? */ + R->selection.end.col -= count; + } + } + break; } } @@ -1415,7 +1451,7 @@ MAX_IT(top, 0); MIN_IT(bot, (int)R->TermWin.nrow - 1); if (top > bot) - return; + return; R->screen.tscroll = top; R->screen.bscroll = bot; rxvt_scr_gotorc(aR_ 0, 0, 0); @@ -1433,9 +1469,9 @@ { R->want_refresh = 1; if (mode) - R->screen.flags |= Screen_VisibleCursor; + R->screen.flags |= Screen_VisibleCursor; else - R->screen.flags &= ~Screen_VisibleCursor; + R->screen.flags &= ~Screen_VisibleCursor; } /* ------------------------------------------------------------------------- */ @@ -1449,9 +1485,9 @@ rxvt_scr_autowrap(pR_ int mode) { if (mode) - R->screen.flags |= Screen_Autowrap; + R->screen.flags |= Screen_Autowrap; else - R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); + R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); } /* ------------------------------------------------------------------------- */ @@ -1469,9 +1505,9 @@ rxvt_scr_relative_origin(pR_ int mode) { if (mode) - R->screen.flags |= Screen_Relative; + R->screen.flags |= Screen_Relative; else - R->screen.flags &= ~Screen_Relative; + R->screen.flags &= ~Screen_Relative; rxvt_scr_gotorc(aR_ 0, 0, 0); } @@ -1486,9 +1522,9 @@ rxvt_scr_insert_mode(pR_ int mode) { if (mode) - R->screen.flags |= Screen_Insert; + R->screen.flags |= Screen_Insert; else - R->screen.flags &= ~Screen_Insert; + R->screen.flags &= ~Screen_Insert; } /* ------------------------------------------------------------------------- */ @@ -1503,9 +1539,9 @@ rxvt_scr_set_tab(pR_ int mode) { if (mode < 0) - MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); + MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); else if (R->screen.cur.col < R->TermWin.ncol) - R->tabs[R->screen.cur.col] = (mode ? 1 : 0); + R->tabs[R->screen.cur.col] = (mode ? 1 : 0); } /* ------------------------------------------------------------------------- */ @@ -1521,23 +1557,23 @@ XGCValues gcvalue; if (R->rvideo != mode) { - R->rvideo = mode; - SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); + R->rvideo = mode; + SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); #if defined(XPM_BACKGROUND) - if (R->bgPixmap.pixmap == None) + if (R->bgPixmap.pixmap == None) #endif #if defined(TRANSPARENT) - if (!(R->Options & Opt_transparent) || R->am_transparent == 0) + if (!(R->Options & Opt_transparent) || R->am_transparent == 0) #endif - XSetWindowBackground(R->Xdisplay, R->TermWin.vt, - R->PixColors[Color_bg]); + XSetWindowBackground(R->Xdisplay, R->TermWin.vt, + R->PixColors[Color_bg]); - gcvalue.foreground = R->PixColors[Color_fg]; - gcvalue.background = R->PixColors[Color_bg]; - XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, - &gcvalue); - rxvt_scr_clear(aR); - rxvt_scr_touch(aR_ True); + gcvalue.foreground = R->PixColors[Color_fg]; + gcvalue.background = R->PixColors[Color_bg]; + XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, + &gcvalue); + rxvt_scr_clear(aR); + rxvt_scr_touch(aR_ True); } } @@ -1550,8 +1586,7 @@ void rxvt_scr_report_position(pR) { - rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, - R->screen.cur.col + 1); + R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); } /* ------------------------------------------------------------------------- * @@ -1566,20 +1601,20 @@ rxvt_set_font_style(pR) { switch (R->charsets[R->screen.charset]) { - case '0': /* DEC Special Character & Line Drawing Set */ - break; - case 'A': /* United Kingdom (UK) */ - break; - case 'B': /* United States (USASCII) */ - break; - case '<': /* Multinational character set */ - break; - case '5': /* Finnish character set */ - break; - case 'C': /* Finnish character set */ - break; - case 'K': /* German character set */ - break; + case '0': /* DEC Special Character & Line Drawing Set */ + break; + case 'A': /* United Kingdom (UK) */ + break; + case 'B': /* United States (USASCII) */ + break; + case '<': /* Multinational character set */ + break; + case '5': /* Finnish character set */ + break; + case 'C': /* Finnish character set */ + break; + case 'K': /* German character set */ + break; } } @@ -1658,8 +1693,8 @@ int i; row_col_t rc[RC_COUNT]; - if (R->drawn_text == NULL) /* sanity check */ - return; + if (R->drawn_text == NULL) /* sanity check */ + return; #ifdef DEBUG_STRICT x = max(x, (int)R->TermWin.int_bwidth); @@ -1677,18 +1712,18 @@ /* sanity checks */ for (i = PART_BEG; i < RC_COUNT; i++) { - MIN_IT(rc[i].col, R->TermWin.ncol - 1); - MIN_IT(rc[i].row, R->TermWin.nrow - 1); + MIN_IT(rc[i].col, R->TermWin.ncol - 1); + MIN_IT(rc[i].row, R->TermWin.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 (&(R->drawn_text[i][rc[PART_BEG].col]), 0, - (rc[PART_END].col - rc[PART_BEG].col + 1)); + fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, + (rc[PART_END].col - rc[PART_BEG].col + 1)); if (refresh) - rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); + rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); } /* ------------------------------------------------------------------------- */ @@ -1716,9 +1751,9 @@ oldviewstart = R->TermWin.view_start; if (y < len) { - p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; - p -= (long)(R->TermWin.nrow - 1); - p = max(p, 0); + p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; + p -= (long)(R->TermWin.nrow - 1); + p = max(p, 0); } R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start)); @@ -1744,11 +1779,11 @@ #endif oldviewstart = R->TermWin.view_start; if (direction == UP) { - n = R->TermWin.view_start + nlines; - R->TermWin.view_start = min(n, R->TermWin.nscrolled); + n = R->TermWin.view_start + nlines; + R->TermWin.view_start = min(n, R->TermWin.nscrolled); } else { - n = R->TermWin.view_start - nlines; - R->TermWin.view_start = max(n, 0); + n = R->TermWin.view_start - nlines; + R->TermWin.view_start = max(n, 0); } return rxvt_scr_changeview(aR_ oldviewstart); } @@ -1758,12 +1793,12 @@ rxvt_scr_changeview(pR_ uint16_t oldviewstart) { if (R->TermWin.view_start != oldviewstart) { - R->want_refresh = 1; + R->want_refresh = 1; #ifdef RXVT_GRAPHICS - if (rxvt_Gr_Displayed(aR)) - rxvt_Gr_scroll(aR_ 0); + if (rxvt_Gr_Displayed(aR)) + rxvt_Gr_scroll(aR_ 0); #endif - R->num_scr -= (R->TermWin.view_start - oldviewstart); + R->num_scr -= (R->TermWin.view_start - oldviewstart); } return (int)(R->TermWin.view_start - oldviewstart); } @@ -1778,13 +1813,13 @@ # ifdef MAPALERT_OPTION if (R->Options & Opt_mapAlert) # endif - XMapWindow(R->Xdisplay, R->TermWin.parent[0]); + XMapWindow(R->Xdisplay, R->TermWin.parent[0]); # endif if (R->Options & Opt_visualBell) { - rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ - rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ + rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ + rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ } else - XBell(R->Xdisplay, 0); + XBell(R->Xdisplay, 0); #endif } @@ -1800,22 +1835,22 @@ FILE *fd; if ((fd = rxvt_popen_printer(aR)) == NULL) - return; + return; nrows = R->TermWin.nrow; row_offset = R->TermWin.saveLines; if (!fullhist) - row_offset -= R->TermWin.view_start; + row_offset -= R->TermWin.view_start; else { - nrows += R->TermWin.nscrolled; - row_offset -= R->TermWin.nscrolled; + nrows += R->TermWin.nscrolled; + row_offset -= R->TermWin.nscrolled; } for (r1 = 0; r1 < nrows; r1++) { - t = R->screen.text[r1 + row_offset]; - for (i = R->TermWin.ncol - 1; i >= 0; i--) - if (!isspace(t[i])) - break; - fprintf(fd, "%.*s\n", (i + 1), t); + t = R->screen.text[r1 + row_offset]; + for (i = R->TermWin.ncol - 1; i >= 0; i--) + if (!isspace(t[i])) + break; + fprintf(fd, "%.*s\n", (i + 1), t); } rxvt_pclose_printer(fd); #endif @@ -1829,75 +1864,79 @@ */ #if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) -# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) -# define MONO_BOLD_FG(x, fg) MONO_BOLD(x) +# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) +# define MONO_BOLD_FG(x, fg) MONO_BOLD(x) #else -# define MONO_BOLD(x) \ +# define MONO_BOLD(x) \ (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg)) -# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) +# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) #endif -#define FONT_WIDTH(X, Y) \ +#define FONT_WIDTH(X, Y) \ (X)->per_char[(Y) - (X)->min_char_or_byte2].width -#define FONT_RBEAR(X, Y) \ +#define FONT_RBEAR(X, Y) \ (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing -#define FONT_LBEAR(X, Y) \ +#define FONT_LBEAR(X, Y) \ (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing -#define IS_FONT_CHAR(X, Y) \ +#define IS_FONT_CHAR(X, Y) \ ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) /* EXTPROTO */ void rxvt_scr_refresh(pR_ 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 */ + unsigned char clearfirst, /* first character writes before cell */ + clearlast, /* last character writes beyond cell */ + must_clear, /* use draw_string not draw_image_string */ #ifndef NO_BOLDFONT - bfont, /* we've changed font to bold font */ + bfont, /* we've changed font to bold font */ #endif - rvid, /* reverse video this position */ - wbyte, /* we're in multibyte */ - showcursor; /* show the cursor */ - int fore, back; /* desired foreground/background */ - int16_t col, row, /* column/row we're processing */ - ocrow; /* old cursor row */ + rvid, /* reverse video this position */ + wbyte, /* we're in multibyte */ + showcursor; /* show the cursor */ + int fore, back; /* desired foreground/background */ + 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 */ + int i, /* tmp */ + row_offset; /* basic offset in screen structure */ #ifndef NO_CURSORCOLOR - rend_t cc1; /* store colours at cursor position(s) */ - rend_t cc2; /* store colours at cursor position(s) */ + rend_t cc1; /* store colours at cursor position(s) */ + rend_t cc2; /* 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 */ - char *buffer; /* local copy of R->buffer */ + rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ + text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ + char *buffer; /* local copy of R->buffer */ if (refresh_type == NO_REFRESH || !R->TermWin.mapped) - return; + return; -/* - * A: set up vars - */ + /* + * A: set up vars + */ clearfirst = clearlast = must_clear = wbyte = 0; #ifndef NO_BOLDFONT bfont = 0; #endif - if (R->currmaxcol < R->TermWin.ncol) { - R->currmaxcol = R->TermWin.ncol; - R->buffer = (char *)rxvt_realloc (R->buffer, + if (R->currmaxcol < R->TermWin.ncol) + { + R->currmaxcol = R->TermWin.ncol; + R->buffer = (char *)rxvt_realloc (R->buffer, sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX); - } + } + buffer = R->buffer; R->refresh_count = 0; row_offset = R->TermWin.saveLines - R->TermWin.view_start; - if ((refresh_type & REFRESH_BOUNDS)) { - clearfirst = clearlast = 1; - R->refresh_type &= ~REFRESH_BOUNDS; - } + if ((refresh_type & REFRESH_BOUNDS)) + { + clearfirst = clearlast = 1; + R->refresh_type &= ~REFRESH_BOUNDS; + } + #if defined(XPM_BACKGROUND) must_clear |= (R->bgPixmap.pixmap != None); #endif @@ -1915,80 +1954,80 @@ * 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 = (R->screen.flags & Screen_VisibleCursor); - cursorwidth = 0; + showcursor = (R->screen.flags & Screen_VisibleCursor); + cursorwidth = 0; #ifdef CURSOR_BLINK - if (R->hidden_cursor) - showcursor = 0; + if (R->hidden_cursor) + showcursor = 0; #endif - cursorwidth = 0; + cursorwidth = 0; - if (showcursor) - { - cursorwidth++; + if (showcursor) + { + cursorwidth++; - srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] - [R->screen.cur.col]); + srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] + [R->screen.cur.col]); - if (showcursor && R->TermWin.focus) - { - *srp ^= RS_RVid; + if (showcursor && R->TermWin.focus) + { + *srp ^= RS_RVid; #ifndef NO_CURSORCOLOR - cc1 = *srp & (RS_fgMask | RS_bgMask); - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) - ccol1 = Color_cursor; - else + cc1 = *srp & (RS_fgMask | RS_bgMask); + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) + ccol1 = Color_cursor; + else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol1 = GET_FGCOLOR(R->rstyle); + ccol1 = GET_FGCOLOR(R->rstyle); #else - ccol1 = Color_fg; + ccol1 = Color_fg; #endif - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) - ccol2 = Color_cursor2; - else + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) + ccol2 = Color_cursor2; + else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol2 = GET_BGCOLOR(R->rstyle); + ccol2 = GET_BGCOLOR(R->rstyle); #else - ccol2 = Color_bg; + ccol2 = Color_bg; #endif - *srp = SET_FGCOLOR(*srp, ccol1); - *srp = SET_BGCOLOR(*srp, ccol2); + *srp = SET_FGCOLOR(*srp, ccol1); + *srp = SET_BGCOLOR(*srp, ccol2); #endif - } + } - while (IS_WIDE (*srp)) - cursorwidth++, srp++; + while (IS_WIDE (*srp)) + cursorwidth++, srp++; + } + + /* make sure no outline cursor is left around */ + setoldcursor = 0; + if (ocrow != -1) { + if (R->screen.cur.row + R->TermWin.view_start != ocrow + || R->screen.cur.col != R->oldcursor.col) { + if (ocrow < R->TermWin.nrow + && R->oldcursor.col < R->TermWin.ncol) { + R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); + } + if (R->TermWin.focus || !showcursor) + R->oldcursor.row = -1; + else + setoldcursor = 1; } - - /* make sure no outline cursor is left around */ - setoldcursor = 0; - if (ocrow != -1) { - if (R->screen.cur.row + R->TermWin.view_start != ocrow - || R->screen.cur.col != R->oldcursor.col) { - if (ocrow < R->TermWin.nrow - && R->oldcursor.col < R->TermWin.ncol) { - R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); - } - if (R->TermWin.focus || !showcursor) - R->oldcursor.row = -1; - else - setoldcursor = 1; - } - } else if (!R->TermWin.focus) - setoldcursor = 1; - if (setoldcursor) { - if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) - R->oldcursor.row = -1; - else { - R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; - R->oldcursor.col = R->screen.cur.col; - } - } + } else if (!R->TermWin.focus) + setoldcursor = 1; + if (setoldcursor) { + if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) + R->oldcursor.row = -1; + else { + R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; + R->oldcursor.col = R->screen.cur.col; + } + } } #ifndef NO_SLOW_LINK_SUPPORT @@ -1998,53 +2037,64 @@ */ i = R->num_scr; if (refresh_type == FAST_REFRESH && R->num_scr_allow && i - && abs(i) < R->TermWin.nrow && !must_clear) { - int16_t nits; - int j; - rend_t *drp2; - text_t *dtp2; + && abs(i) < R->TermWin.nrow && !must_clear) + { + int16_t nits; + int j; + rend_t *drp2; + text_t *dtp2; int len, wlen; - j = R->TermWin.nrow; - wlen = len = -1; - row = i > 0 ? 0 : j - 1; - for (; j-- >= 0; row += (i > 0 ? 1 : -1)) { - if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) { - stp = R->screen.text[row + row_offset]; - srp = R->screen.rend[row + row_offset]; - dtp = R->drawn_text[row]; - dtp2 = R->drawn_text[row + i]; - drp = R->drawn_rend[row]; - drp2 = R->drawn_rend[row + i]; - for (nits = 0, col = R->TermWin.ncol; col--; ) - if (stp[col] != dtp2[col] || srp[col] != drp2[col]) - nits--; - else if (stp[col] != dtp[col] || srp[col] != drp[col]) - nits++; - if (nits > 8) { /* XXX: arbitrary choice */ - for (col = R->TermWin.ncol; col--; ) { - *dtp++ = *dtp2++; - *drp++ = *drp2++; - } - if (len == -1) - len = row; - wlen = row; - continue; - } - } - if (len != -1) { - /* also comes here at end if needed because of >= above */ - if (wlen < len) - SWAP_IT(wlen, len, int); - D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); - XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt, - R->TermWin.gc, 0, Row2Pixel(len + i), - (unsigned int)TermWin_TotalWidth(), - (unsigned int)Height2Pixel(wlen - len + 1), - 0, Row2Pixel(len)); - len = -1; - } - } + j = R->TermWin.nrow; + wlen = len = -1; + row = i > 0 ? 0 : j - 1; + for (; j-- >= 0; row += (i > 0 ? 1 : -1)) + { + if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) + { + stp = R->screen.text[row + row_offset]; + srp = R->screen.rend[row + row_offset]; + dtp = R->drawn_text[row]; + dtp2 = R->drawn_text[row + i]; + drp = R->drawn_rend[row]; + drp2 = R->drawn_rend[row + i]; + + for (nits = 0, col = R->TermWin.ncol; col--; ) + if (stp[col] != dtp2[col] || srp[col] != drp2[col]) + nits--; + else if (stp[col] != dtp[col] || srp[col] != drp[col]) + nits++; + + if (nits > 8) /* XXX: arbitrary choice */ + { + for (col = R->TermWin.ncol; col--; ) + { + *dtp++ = *dtp2++; + *drp++ = *drp2++; + } + + if (len == -1) + len = row; + + wlen = row; + continue; + } + } + + if (len != -1) + { + /* also comes here at end if needed because of >= above */ + if (wlen < len) + SWAP_IT(wlen, len, int); + D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); + XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt, + R->TermWin.gc, 0, Row2Pixel(len + i), + (unsigned int)TermWin_TotalWidth(), + (unsigned int)Height2Pixel(wlen - len + 1), + 0, Row2Pixel(len)); + len = -1; + } + } } #endif @@ -2061,30 +2111,31 @@ /* * E2: OK, now the real pass */ - int ypixel = (int)Row2Pixel(row); + int ypixel = (int)Row2Pixel(row); - for (col = 0; col < R->TermWin.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 */ - || (stp[col] == ' ' /* space w/ no background change */ - && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) - continue; + for (col = 0; col < R->TermWin.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 */ + || (stp[col] == ' ' /* space w/ no background change */ + && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) + continue; text_t *text = stp + col; int count = 1; - /* redraw one or more characters */ + /* redraw one or more characters */ dtp[col] = stp[col]; - drp[col] = rend; + drp[col] = rend; if (*text == NOCHAR) // never start redrawing at invisible characters. */ continue; - int xpixel = Col2Pixel(col); + int xpixel = Col2Pixel(col); // this loop looks very messy, it can probably be optimized // and cleaned a bit by you? @@ -2121,59 +2172,59 @@ break; } - col--; /* went one too far. move back */ - count -= i; /* dump any matching trailing chars */ + col--; /* went one too far. move back */ + count -= i; /* dump any matching trailing chars */ /* * Determine the attributes for the string */ int fid = GET_FONT(rend); - fore = GET_FGCOLOR(rend); - back = GET_BGCOLOR(rend); - rend = GET_ATTR(rend); + fore = GET_FGCOLOR(rend); + back = GET_BGCOLOR(rend); + rend = GET_ATTR(rend); - rvid = (rend & RS_RVid) ? 1 : 0; + rvid = (rend & RS_RVid) ? 1 : 0; #ifdef OPTION_HC - if (!rvid && (rend & RS_Blink)) + if (!rvid && (rend & RS_Blink)) { - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) - back = Color_HC; - else - rvid = !rvid; /* fall back */ + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) + back = Color_HC; + else + rvid = !rvid; /* fall back */ } #endif - if (rvid) + if (rvid) { - SWAP_IT(fore, back, int); + SWAP_IT(fore, back, int); #ifndef NO_BOLD_UNDERLINE_REVERSE - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) # ifndef NO_CURSORCOLOR - && !ISSET_PIXCOLOR(R, Color_cursor) + && !ISSET_PIXCOLOR(R, Color_cursor) # endif ) - back = Color_RV; + back = Color_RV; #endif - } + } #ifndef NO_BOLD_UNDERLINE_REVERSE - else if (rend & RS_Bold) + else if (rend & RS_Bold) { - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) { - fore = Color_BD; + fore = Color_BD; # ifndef VERYBOLD - rend &= ~RS_Bold; /* we've taken care of it */ + rend &= ~RS_Bold; /* we've taken care of it */ # endif } - } + } else if (rend & RS_Uline) { - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) { - fore = Color_UL; - rend &= ~RS_Uline; /* we've taken care of it */ + fore = Color_UL; + rend &= ~RS_Uline; /* we've taken care of it */ } - } + } #endif /* @@ -2183,53 +2234,56 @@ if (back == Color_bg) { - if (must_clear) + if (must_clear) { - for (i = 0; i < count; i++) /* don't draw empty strings */ - if (text[i] != ' ') { - font->draw (xpixel, ypixel, text, count, fore, -1); - goto nodraw; + for (i = 0; i < count; i++) /* don't draw empty strings */ + if (text[i] != ' ') + { + font->draw (xpixel, ypixel, text, count, fore, -1); + goto nodraw; } + CLEAR_CHARS(xpixel, ypixel, count); nodraw: ; } else font->draw (xpixel, ypixel, text, count, fore, Color_bg); - } else - font->draw (xpixel, ypixel, text, count, fore, back); + } + else + font->draw (xpixel, ypixel, text, count, fore, back); - if ((rend & RS_Uline) && (font->descent > 1)) - XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, - xpixel, ypixel + font->ascent + 1, - xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); - } /* for (col....) */ - } /* for (row....) */ + if ((rend & RS_Uline) && (font->descent > 1)) + XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, + xpixel, ypixel + font->ascent + 1, + xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); + } /* for (col....) */ + } /* for (row....) */ /* * G: cleanup cursor and display outline cursor if necessary */ if (showcursor) { - if (R->TermWin.focus) { - srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] - [R->screen.cur.col]); - *srp ^= RS_RVid; + if (R->TermWin.focus) { + srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] + [R->screen.cur.col]); + *srp ^= RS_RVid; #ifndef NO_CURSORCOLOR - *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; + *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; #endif - } else if (R->oldcursor.row >= 0) { + } else if (R->oldcursor.row >= 0) { #ifndef NO_CURSORCOLOR - unsigned long gcmask; /* Graphics Context mask */ + unsigned long gcmask; /* Graphics Context mask */ - if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { + if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); - } + } #endif - XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, - Col2Pixel(R->oldcursor.col), - Row2Pixel(R->oldcursor.row), - (unsigned int)(Width2Pixel(cursorwidth) - 1), - (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); - } + XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, + Col2Pixel(R->oldcursor.col), + Row2Pixel(R->oldcursor.row), + (unsigned int)(Width2Pixel(cursorwidth) - 1), + (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); + } } /* * H: cleanup selection @@ -2240,28 +2294,28 @@ * I: other general cleanup */ if (clearfirst && R->TermWin.int_bwidth) - /* - * clear the whole screen height, note that width == 0 is treated - * specially by XClearArea - */ - XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, - (unsigned int)R->TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight(), False); + /* + * clear the whole screen height, note that width == 0 is treated + * specially by XClearArea + */ + XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, + (unsigned int)R->TermWin.int_bwidth, + (unsigned int)TermWin_TotalHeight(), False); if (clearlast && R->TermWin.int_bwidth) - /* - * clear the whole screen height, note that width == 0 is treated - * specially by XClearArea - */ - XClearArea(R->Xdisplay, R->TermWin.vt, - R->TermWin.width + R->TermWin.int_bwidth, 0, - (unsigned int)R->TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight(), False); + /* + * clear the whole screen height, note that width == 0 is treated + * specially by XClearArea + */ + XClearArea(R->Xdisplay, R->TermWin.vt, + R->TermWin.width + R->TermWin.int_bwidth, 0, + (unsigned int)R->TermWin.int_bwidth, + (unsigned int)TermWin_TotalHeight(), False); if (refresh_type & SMOOTH_REFRESH) - XSync(R->Xdisplay, False); + XSync(R->Xdisplay, False); R->num_scr = 0; R->num_scr_allow = 1; - R->want_refresh = 0; /* screen is current */ + R->want_refresh = 0; /* screen is current */ } /* ------------------------------------------------------------------------- */ @@ -2270,20 +2324,20 @@ rxvt_scr_clear(pR) { if (!R->TermWin.mapped) - return; + return; R->num_scr_allow = 0; R->want_refresh = 1; #ifdef TRANSPARENT if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { - int i; + int i; - if (!(R->Options & Opt_transparent_all)) - i = 0; - else - i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); - for (; i--;) - if (R->TermWin.parent[i] != None) - XClearWindow(R->Xdisplay, R->TermWin.parent[i]); + if (!(R->Options & Opt_transparent_all)) + i = 0; + else + i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); + for (; i--;) + if (R->TermWin.parent[i] != None) + XClearWindow(R->Xdisplay, R->TermWin.parent[i]); } #endif XClearWindow(R->Xdisplay, R->TermWin.vt); @@ -2298,29 +2352,29 @@ rend_t *srp; if (R->selection.op && R->current_screen == R->selection.screen) { - end_row = R->TermWin.saveLines - R->TermWin.view_start; - i = R->selection.beg.row + R->TermWin.saveLines; - row = R->selection.end.row + R->TermWin.saveLines; - if (i >= end_row) - col = R->selection.beg.col; - else { - col = 0; - i = end_row; - } - end_row += R->TermWin.nrow; - for (; i < row && i < end_row; i++, col = 0) - for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) + end_row = R->TermWin.saveLines - R->TermWin.view_start; + i = R->selection.beg.row + R->TermWin.saveLines; + row = R->selection.end.row + R->TermWin.saveLines; + if (i >= end_row) + col = R->selection.beg.col; + else { + col = 0; + i = end_row; + } + end_row += R->TermWin.nrow; + for (; i < row && i < end_row; i++, col = 0) + for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) #ifndef OPTION_HC - srp[col] ^= RS_RVid; + srp[col] ^= RS_RVid; #else - srp[col] ^= RS_Blink; + srp[col] ^= RS_Blink; #endif - if (i == row && i < end_row) - for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) + if (i == row && i < end_row) + for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) #ifndef OPTION_HC - srp[col] ^= RS_RVid; + srp[col] ^= RS_RVid; #else - srp[col] ^= RS_Blink; + srp[col] ^= RS_Blink; #endif } } @@ -2340,18 +2394,18 @@ char r1[] = "\n"; for (row = R->TermWin.saveLines - R->TermWin.nscrolled; - row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { - width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] - : R->TermWin.ncol; - for (towrite = width; towrite; towrite -= wrote) { - wrote = write(fd, &(R->screen.text[row][width - towrite]), - towrite); - if (wrote < 0) - return; /* XXX: death, no report */ - } - if (R->screen.tlen[row] >= 0) - if (write(fd, r1, 1) <= 0) - return; /* XXX: death, no report */ + row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { + width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] + : R->TermWin.ncol; + for (towrite = width; towrite; towrite -= wrote) { + wrote = write(fd, &(R->screen.text[row][width - towrite]), + towrite); + if (wrote < 0) + return; /* XXX: death, no report */ + } + if (R->screen.tlen[row] >= 0) + if (write(fd, r1, 1) <= 0) + return; /* XXX: death, no report */ } } #endif @@ -2370,51 +2424,54 @@ row_col_t pos; if (!R->selection.op) - return; + return; pos.row = pos.col = 0; if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) - || (R->selection.beg.row >= R->TermWin.nrow) - || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) - || (R->selection.mark.row >= R->TermWin.nrow) - || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) - || (R->selection.end.row >= R->TermWin.nrow) + || (R->selection.beg.row >= R->TermWin.nrow) + || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) + || (R->selection.mark.row >= R->TermWin.nrow) + || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) + || (R->selection.end.row >= R->TermWin.nrow) || (check_more == 1 - && R->current_screen == R->selection.screen - && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) - && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) - || (check_more == 2 - && ROWCOL_IS_BEFORE(R->selection.beg, pos) - && ROWCOL_IS_AFTER(R->selection.end, pos)) - || (check_more == 3 - && ROWCOL_IS_AFTER(R->selection.end, pos)) - || (check_more == 4 /* screen width change */ - && (R->selection.beg.row != R->selection.end.row - || R->selection.end.col > R->TermWin.ncol))) - CLEAR_SELECTION(R); + && R->current_screen == R->selection.screen + && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) + && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) + || (check_more == 2 + && ROWCOL_IS_BEFORE(R->selection.beg, pos) + && ROWCOL_IS_AFTER(R->selection.end, pos)) + || (check_more == 3 + && ROWCOL_IS_AFTER(R->selection.end, pos)) + || (check_more == 4 /* screen width change */ + && (R->selection.beg.row != R->selection.end.row + || R->selection.end.col > R->TermWin.ncol))) + CLEAR_SELECTION(R); } /* ------------------------------------------------------------------------- */ /* * Paste a selection direct to the command fd */ -/* INTPROTO */ void -rxvt_PasteIt(pR_ const unsigned char *data, unsigned int nitems) +rxvt_term::paste (const unsigned char *data, unsigned int len) { - unsigned int i, j, n; - unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); - -/* convert normal newline chars into common keyboard Return key sequence */ - for (i = 0; i < nitems; i += PROP_SIZE) { - n = min(nitems - i, PROP_SIZE); - MEMCPY(ds, data + i, n); - for (j = 0; j < n; j++) - if (ds[j] == '\n') - ds[j] = '\r'; - rxvt_tt_write(aR_ ds, (int)n); + unsigned int i, j, n; + unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); + + /* 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); } - free(ds); + + free(ds); } /* ------------------------------------------------------------------------- */ @@ -2426,75 +2483,99 @@ int rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) { - long nread = 0; - unsigned long bytes_after; - XTextProperty ct; -#ifdef MULTICHAR_SET - int dummy_count; - char **cl; -#endif + long nread = 0; + unsigned long bytes_after; + XTextProperty ct; + int dummy_count; + char **cl; + + D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); - D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); + if (prop == None) /* check for failed XConvertSelection */ + { + if ((R->selection_type & Sel_CompoundText)) + { + int selnum = R->selection_type & Sel_whereMask; + + R->selection_type = 0; + if (selnum != Sel_direct) + rxvt_selection_request_other(aR_ XA_STRING, selnum); + } + + return 0; + } - if (prop == None) { /* check for failed XConvertSelection */ -#ifdef MULTICHAR_SET - if ((R->selection_type & Sel_CompoundText)) { - int selnum = R->selection_type & Sel_whereMask; + for (;;) + { + if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), + (long)(PROP_SIZE / 4), delete_prop, + AnyPropertyType, &ct.encoding, &ct.format, + &ct.nitems, &bytes_after, + &ct.value) != Success) + break; + + if (ct.encoding == 0) + { + D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); + break; + } + + if (ct.value == NULL) + { + D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); + continue; + } + + if (ct.nitems == 0) + { + D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); + if (R->selection_wait == Sel_normal && nread == 0) + { + /* + * 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")); + rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); + } - R->selection_type = 0; - if (selnum != Sel_direct) - rxvt_selection_request_other(aR_ XA_STRING, selnum); - } -#endif - return 0; + nread = -1; /* discount any previous stuff */ + break; + } + + nread += ct.nitems; + if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, + &dummy_count) == Success && cl) + { + R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); + XFreeStringList (cl); + } + else + R->paste (ct.value, ct.nitems); + + if (bytes_after == 0) + break; + + XFree (ct.value); } - for (;;) { - if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), - (long)(PROP_SIZE / 4), delete_prop, - AnyPropertyType, &ct.encoding, &ct.format, - &ct.nitems, &bytes_after, - &ct.value) != Success) - break; - if (ct.encoding == 0) { - D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); - break; - } - if (ct.value == NULL) { - D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); - continue; - } - if (ct.nitems == 0) { - D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); - if (R->selection_wait == Sel_normal && nread == 0) { - /* - * 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")); - rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); - } - nread = -1; /* discount any previous stuff */ - break; - } - nread += ct.nitems; -#ifdef MULTICHAR_SET - if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl, - &dummy_count) == Success && cl) { - rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0])); - XFreeStringList(cl); - } else -#endif - rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems); - if (bytes_after == 0) - break; - XFree(ct.value); - } - if (ct.value) - XFree(ct.value); - if (R->selection_wait == Sel_normal) - R->selection_wait = Sel_none; - D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); - return (int)nread; + + if (ct.value) + XFree (ct.value); + + if (R->selection_wait == Sel_normal) + R->selection_wait = Sel_none; + + D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); + return (int)nread; +} + +void +rxvt_term::incr_cb (time_watcher &w) +{ + w.stop (); + selection_wait = Sel_none; + + rxvt_print_error("data loss: timeout on INCR selection paste"); } /* @@ -2507,42 +2588,40 @@ int reget_time = 0; if (prop == None) - return; + return; D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); if (R->selection_wait == Sel_normal) { - int a, afmt; - Atom atype; - unsigned long bytes_after, nitems; - unsigned char *s = NULL; - - a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, - R->xa[XA_INCR], &atype, &afmt, &nitems, - &bytes_after, &s); - if (s) - XFree(s); - if (a != Success) - return; + int a, afmt; + Atom atype; + unsigned long bytes_after, nitems; + unsigned char *s = NULL; + + a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, + R->xa[XA_INCR], &atype, &afmt, &nitems, + &bytes_after, &s); + if (s) + XFree(s); + if (a != Success) + return; #ifndef __CYGWIN32__ - if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */ - D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); - XDeleteProperty(R->Xdisplay, win, prop); - XFlush(R->Xdisplay); - reget_time = 1; - R->selection_wait = Sel_incr; - } + if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */ + D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); + XDeleteProperty(R->Xdisplay, win, prop); + XFlush(R->Xdisplay); + reget_time = 1; + R->selection_wait = Sel_incr; + } #endif } else if (R->selection_wait == Sel_incr) { - reget_time = 1; - if (rxvt_selection_paste(aR_ win, prop, True) == -1) { - D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); - R->selection_wait = Sel_none; - R->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ - } - } - if (reget_time) { /* received more data so reget time */ - (void)gettimeofday(&(R->timeout[TIMEOUT_INCR]), NULL); - R->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */ + reget_time = 1; + if (rxvt_selection_paste(aR_ win, prop, True) == -1) { + D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); + R->selection_wait = Sel_none; + R->incr_ev.stop (); + } } + if (reget_time) /* received more data so reget time */ + R->incr_ev.start (NOW + 10); } /* ------------------------------------------------------------------------- */ /* @@ -2560,34 +2639,24 @@ { D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) - return; /* outside window */ + return; /* outside window */ - if (R->selection.text != NULL) { /* internal selection */ - D_SELECT((stderr, "rxvt_selection_request: pasting internal")); - rxvt_PasteIt(aR_ R->selection.text, R->selection.len); - return; + if (R->selection.text != NULL) { /* internal selection */ + D_SELECT((stderr, "rxvt_selection_request: pasting internal")); + R->paste (R->selection.text, R->selection.len); + return; } else { - int i; + int i; - R->selection_request_time = tm; - R->selection_wait = Sel_normal; - for (i = Sel_Primary; i <= Sel_Clipboard; i++) { -#ifdef MULTICHAR_SET - R->selection_type = Sel_CompoundText; -#else - R->selection_type = 0; -#endif - if (rxvt_selection_request_other(aR_ -#ifdef MULTICHAR_SET - R->xa[XA_COMPOUND_TEXT], -#else - XA_STRING, -#endif - i)) - return; - } + R->selection_request_time = tm; + R->selection_wait = Sel_normal; + for (i = Sel_Primary; i <= Sel_Clipboard; i++) { + R->selection_type = Sel_CompoundText; + if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) + return; + } } - R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ + R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); } @@ -2603,16 +2672,16 @@ R->selection_type |= selnum; if (selnum == Sel_Primary) - sel = XA_PRIMARY; + sel = XA_PRIMARY; else if (selnum == Sel_Secondary) - sel = XA_SECONDARY; + sel = XA_SECONDARY; else - sel = R->xa[XA_CLIPBOARD]; + sel = R->xa[XA_CLIPBOARD]; if (XGetSelectionOwner(R->Xdisplay, sel) != None) { - D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); - XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], - R->TermWin.vt, R->selection_request_time); - return 1; + D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); + XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], + R->TermWin.vt, R->selection_request_time); + return 1; } return 0; } @@ -2630,7 +2699,7 @@ R->want_refresh = 1; if (R->selection.text) - free(R->selection.text); + free(R->selection.text); R->selection.text = NULL; R->selection.len = 0; CLEAR_SELECTION(R); @@ -2656,20 +2725,20 @@ D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); switch (R->selection.op) { case SELECTION_CONT: - break; + break; case SELECTION_INIT: - CLEAR_SELECTION(R); + CLEAR_SELECTION(R); /* FALLTHROUGH */ case SELECTION_BEGIN: - R->selection.op = SELECTION_DONE; + R->selection.op = SELECTION_DONE; /* FALLTHROUGH */ default: - return; + return; } R->selection.op = SELECTION_DONE; if (R->selection.clicks == 4) - return; /* nothing selected, go away */ + return; /* nothing selected, go away */ i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); @@ -2683,17 +2752,17 @@ for (; row <= end_row; row++, col = 0) { - t = &(R->screen.text[row][col]); + t = &(R->screen.text[row][col]); end_col = R->screen.tlen[row]; if (end_col == -1) - end_col = R->TermWin.ncol; + end_col = R->TermWin.ncol; if (row == end_row) MIN_IT (end_col, R->selection.end.col); - for (; col < end_col; col++) + for (; col < end_col; col++) if (*t == NOCHAR) t++; else @@ -2703,27 +2772,27 @@ str += len; } - if (R->screen.tlen[row] != -1 && row != end_row) - *str++ = '\n'; + if (R->screen.tlen[row] != -1 && row != end_row) + *str++ = '\n'; } #ifndef NO_OLD_SELECTION if (R->selection_style == OLD_SELECT) - if (end_col == R->TermWin.ncol) - *str++ = '\n'; + if (end_col == R->TermWin.ncol) + *str++ = '\n'; #endif #ifndef NO_NEW_SELECTION if (R->selection_style != OLD_SELECT) - if (end_col != R->selection.end.col) - *str++ = '\n'; + if (end_col != R->selection.end.col) + *str++ = '\n'; #endif *str = '\0'; i = str - (char *)new_selection_text; if (i == 0) { - free (new_selection_text); - return; + free (new_selection_text); + return; } // due to MB_MAX_CUR, selection wastage is usually high @@ -2732,15 +2801,15 @@ R->selection.len = i; if (R->selection.text) - free (R->selection.text); + free (R->selection.text); R->selection.text = new_selection_text; XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) - rxvt_print_error("can't get primary selection"); + rxvt_print_error("can't get primary selection"); XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, R->selection.text, (int)R->selection.len); + PropModeReplace, R->selection.text, (int)R->selection.len); R->selection_time = tm; D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); } @@ -2757,16 +2826,16 @@ D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); clicks = ((clicks - 1) % 3) + 1; - R->selection.clicks = clicks; /* save clicks so extend will work */ + R->selection.clicks = clicks; /* save clicks so extend will work */ rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); if (clicks == 2 || clicks == 3) - rxvt_selection_extend_colrow(aR_ R->selection.mark.col, - R->selection.mark.row - + R->TermWin.view_start, - 0, /* button 3 */ - 1, /* button press */ - 0); /* click change */ + rxvt_selection_extend_colrow(aR_ R->selection.mark.col, + R->selection.mark.row + + R->TermWin.view_start, + 0, /* button 3 */ + 1, /* button press */ + 0); /* click change */ } /* ------------------------------------------------------------------------- */ @@ -2785,9 +2854,9 @@ MAX_IT(R->selection.mark.col, 0); MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); - if (R->selection.op) { /* clear the old selection */ - R->selection.beg.row = R->selection.end.row = R->selection.mark.row; - R->selection.beg.col = R->selection.end.col = R->selection.mark.col; + if (R->selection.op) { /* clear the old selection */ + R->selection.beg.row = R->selection.end.row = R->selection.mark.row; + R->selection.beg.col = R->selection.end.col = R->selection.mark.col; } R->selection.op = SELECTION_INIT; R->selection.screen = R->current_screen; @@ -2802,11 +2871,7 @@ /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ #define DELIMIT_TEXT(x) \ (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) -#ifdef MULTICHAR_SET -# define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0) -#else -# define DELIMIT_REND(x) 1 -#endif +#define DELIMIT_REND(x) 1 /* INTPROTO */ void @@ -2818,13 +2883,13 @@ rend_t *srp; if (dirn == UP) { - bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; - bound.col = 0; - dirnadd = -1; + bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; + bound.col = 0; + dirnadd = -1; } else { - bound.row = R->TermWin.saveLines + R->TermWin.nrow; - bound.col = R->TermWin.ncol - 1; - dirnadd = 1; + bound.row = R->TermWin.saveLines + R->TermWin.nrow; + bound.col = R->TermWin.ncol - 1; + dirnadd = 1; } row = mark->row + R->TermWin.saveLines; col = mark->col; @@ -2834,48 +2899,48 @@ w1 = DELIMIT_TEXT(*stp); if (R->selection_style != NEW_SELECT) { - if (w1 == 1) { - stp += dirnadd; - if (DELIMIT_TEXT(*stp) == 1) - goto Old_Word_Selection_You_Die; - col += dirnadd; - } - w1 = 0; + if (w1 == 1) { + stp += dirnadd; + if (DELIMIT_TEXT(*stp) == 1) + goto Old_Word_Selection_You_Die; + col += dirnadd; + } + w1 = 0; } srp = (&R->screen.rend[row][col]); w2 = DELIMIT_REND(*srp); for (;;) { - for (; col != bound.col; col += dirnadd) { - stp += dirnadd; - if (DELIMIT_TEXT(*stp) != w1) - break; - srp += dirnadd; - if (DELIMIT_REND(*srp) != w2) - break; - } - if ((col == bound.col) && (row != bound.row)) { - if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { - trow = row + dirnadd; - tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; - if (R->screen.text[trow] == NULL) - break; - stp = &(R->screen.text[trow][tcol]); - srp = &(R->screen.rend[trow][tcol]); - if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) - break; - row = trow; - col = tcol; - continue; - } - } - break; + for (; col != bound.col; col += dirnadd) { + stp += dirnadd; + if (DELIMIT_TEXT(*stp) != w1) + break; + srp += dirnadd; + if (DELIMIT_REND(*srp) != w2) + break; + } + if ((col == bound.col) && (row != bound.row)) { + if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { + trow = row + dirnadd; + tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; + if (R->screen.text[trow] == NULL) + break; + stp = &(R->screen.text[trow][tcol]); + srp = &(R->screen.rend[trow][tcol]); + if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) + break; + row = trow; + col = tcol; + continue; + } + } + 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 - R->TermWin.saveLines, col)); + 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 - R->TermWin.saveLines, col)); if (dirn == DN) - col++; /* put us on one past the end */ + col++; /* put us on one past the end */ /* Poke the values back in */ ret->row = row - R->TermWin.saveLines; @@ -2910,24 +2975,24 @@ * be _past_ a character for it to be selected. */ if (R->selection_style != OLD_SELECT) { - if (((R->selection.clicks % 3) == 1) && !flag - && (col == R->selection.mark.col - && (row == R->selection.mark.row + R->TermWin.view_start))) { - /* select nothing */ - R->selection.beg.row = R->selection.end.row = 0; - R->selection.beg.col = R->selection.end.col = 0; - R->selection.clicks = 4; - R->want_refresh = 1; - D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); - return; - } + if (((R->selection.clicks % 3) == 1) && !flag + && (col == R->selection.mark.col + && (row == R->selection.mark.row + R->TermWin.view_start))) { + /* select nothing */ + R->selection.beg.row = R->selection.end.row = 0; + R->selection.beg.col = R->selection.end.col = 0; + R->selection.clicks = 4; + R->want_refresh = 1; + D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); + return; + } } #endif if (R->selection.clicks == 4) - R->selection.clicks = 1; - rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ - flag == 1 ? 1 : 0, /* ? button press */ - 0); /* no click change */ + R->selection.clicks = 1; + rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ + flag == 1 ? 1 : 0, /* ? button press */ + 0); /* no click change */ } /* ------------------------------------------------------------------------- */ @@ -2942,7 +3007,7 @@ int end_col; row_col_t pos; enum { - LEFT, RIGHT + 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, R->selection.clicks, R->selection.op)); @@ -2951,38 +3016,38 @@ R->want_refresh = 1; switch (R->selection.op) { case SELECTION_INIT: - CLEAR_SELECTION(R); - R->selection.op = SELECTION_BEGIN; + CLEAR_SELECTION(R); + R->selection.op = SELECTION_BEGIN; /* FALLTHROUGH */ case SELECTION_BEGIN: - if (row != R->selection.mark.row || col != R->selection.mark.col - || (!button3 && buttonpress)) - R->selection.op = SELECTION_CONT; - break; + if (row != R->selection.mark.row || col != R->selection.mark.col + || (!button3 && buttonpress)) + R->selection.op = SELECTION_CONT; + break; case SELECTION_DONE: - R->selection.op = SELECTION_CONT; + R->selection.op = SELECTION_CONT; /* FALLTHROUGH */ case SELECTION_CONT: - break; + break; case SELECTION_CLEAR: - rxvt_selection_start_colrow(aR_ col, row); + rxvt_selection_start_colrow(aR_ col, row); /* FALLTHROUGH */ default: - return; + return; } if (R->selection.beg.col == R->selection.end.col - && R->selection.beg.col != R->selection.mark.col - && R->selection.beg.row == R->selection.end.row - && R->selection.beg.row != R->selection.mark.row) { - R->selection.beg.col = R->selection.end.col = R->selection.mark.col; - R->selection.beg.row = R->selection.end.row = R->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)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); + && R->selection.beg.col != R->selection.mark.col + && R->selection.beg.row == R->selection.end.row + && R->selection.beg.row != R->selection.mark.row) { + R->selection.beg.col = R->selection.end.col = R->selection.mark.col; + R->selection.beg.row = R->selection.end.row = R->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)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); } pos.col = col; pos.row = row; - pos.row -= R->TermWin.view_start; /* adjust for scroll */ + pos.row -= R->TermWin.view_start; /* adjust for scroll */ #ifndef NO_OLD_SELECTION /* @@ -2992,44 +3057,44 @@ * Selection always terminates (left or right as appropriate) at the mark. */ if (R->selection_style == OLD_SELECT) { - if (R->selection.clicks == 1 || button3) { - if (R->hate_those_clicks) { - R->hate_those_clicks = 0; - if (R->selection.clicks == 1) { - R->selection.beg.row = R->selection.mark.row; - R->selection.beg.col = R->selection.mark.col; - } else { - R->selection.mark.row = R->selection.beg.row; - R->selection.mark.col = R->selection.beg.col; - } - } - if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) { - R->selection.end.row = R->selection.mark.row; - R->selection.end.col = R->selection.mark.col + 1; - R->selection.beg.row = pos.row; - R->selection.beg.col = pos.col; - } else { - R->selection.beg.row = R->selection.mark.row; - R->selection.beg.col = R->selection.mark.col; - R->selection.end.row = pos.row; - R->selection.end.col = pos.col + 1; - } - } else if (R->selection.clicks == 2) { - rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), - &(R->selection.beg)); - rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), - &(R->selection.end)); - R->hate_those_clicks = 1; - } else if (R->selection.clicks == 3) { - R->selection.beg.row = R->selection.end.row = R->selection.mark.row; - R->selection.beg.col = 0; - R->selection.end.col = ncol; - R->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)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); - return; + if (R->selection.clicks == 1 || button3) { + if (R->hate_those_clicks) { + R->hate_those_clicks = 0; + if (R->selection.clicks == 1) { + R->selection.beg.row = R->selection.mark.row; + R->selection.beg.col = R->selection.mark.col; + } else { + R->selection.mark.row = R->selection.beg.row; + R->selection.mark.col = R->selection.beg.col; + } + } + if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) { + R->selection.end.row = R->selection.mark.row; + R->selection.end.col = R->selection.mark.col + 1; + R->selection.beg.row = pos.row; + R->selection.beg.col = pos.col; + } else { + R->selection.beg.row = R->selection.mark.row; + R->selection.beg.col = R->selection.mark.col; + R->selection.end.row = pos.row; + R->selection.end.col = pos.col + 1; + } + } else if (R->selection.clicks == 2) { + rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), + &(R->selection.beg)); + rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), + &(R->selection.end)); + R->hate_those_clicks = 1; + } else if (R->selection.clicks == 3) { + R->selection.beg.row = R->selection.end.row = R->selection.mark.row; + R->selection.beg.col = 0; + R->selection.end.col = ncol; + R->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)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); + return; } -#endif /* ! NO_OLD_SELECTION */ +#endif /* ! NO_OLD_SELECTION */ #ifndef NO_NEW_SELECTION /* selection_style must not be OLD_SELECT to get here */ /* @@ -3045,111 +3110,111 @@ * and it was decided by whichever point/word/line was `fixed' at the * time of the most recent button3 press */ - if (button3 && buttonpress) { /* button3 press */ - /* - * first determine which edge of the selection we are closest to - */ - if (ROWCOL_IS_BEFORE(pos, R->selection.beg) - || (!ROWCOL_IS_AFTER(pos, R->selection.end) - && (((pos.col - R->selection.beg.col) - + ((pos.row - R->selection.beg.row) * ncol)) - < ((R->selection.end.col - pos.col) - + ((R->selection.end.row - pos.row) * ncol))))) - closeto = LEFT; - if (closeto == LEFT) { - R->selection.beg.row = pos.row; - R->selection.beg.col = pos.col; - R->selection.mark.row = R->selection.end.row; - R->selection.mark.col = R->selection.end.col - - (R->selection.clicks == 2); - } else { - R->selection.end.row = pos.row; - R->selection.end.col = pos.col; - R->selection.mark.row = R->selection.beg.row; - R->selection.mark.col = R->selection.beg.col; - } - } else { /* button1 drag or button3 drag */ - if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { - if ((R->selection.mark.row == R->selection.end.row) - && (R->selection.mark.col == R->selection.end.col) - && clickchange && R->selection.clicks == 2) - R->selection.mark.col--; - R->selection.beg.row = pos.row; - R->selection.beg.col = pos.col; - R->selection.end.row = R->selection.mark.row; - R->selection.end.col = R->selection.mark.col - + (R->selection.clicks == 2); - } else { - R->selection.beg.row = R->selection.mark.row; - R->selection.beg.col = R->selection.mark.col; - R->selection.end.row = pos.row; - R->selection.end.col = pos.col; - } + if (button3 && buttonpress) { /* button3 press */ + /* + * first determine which edge of the selection we are closest to + */ + if (ROWCOL_IS_BEFORE(pos, R->selection.beg) + || (!ROWCOL_IS_AFTER(pos, R->selection.end) + && (((pos.col - R->selection.beg.col) + + ((pos.row - R->selection.beg.row) * ncol)) + < ((R->selection.end.col - pos.col) + + ((R->selection.end.row - pos.row) * ncol))))) + closeto = LEFT; + if (closeto == LEFT) { + R->selection.beg.row = pos.row; + R->selection.beg.col = pos.col; + R->selection.mark.row = R->selection.end.row; + R->selection.mark.col = R->selection.end.col + - (R->selection.clicks == 2); + } else { + R->selection.end.row = pos.row; + R->selection.end.col = pos.col; + R->selection.mark.row = R->selection.beg.row; + R->selection.mark.col = R->selection.beg.col; + } + } else { /* button1 drag or button3 drag */ + if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { + if ((R->selection.mark.row == R->selection.end.row) + && (R->selection.mark.col == R->selection.end.col) + && clickchange && R->selection.clicks == 2) + R->selection.mark.col--; + R->selection.beg.row = pos.row; + R->selection.beg.col = pos.col; + R->selection.end.row = R->selection.mark.row; + R->selection.end.col = R->selection.mark.col + + (R->selection.clicks == 2); + } else { + R->selection.beg.row = R->selection.mark.row; + R->selection.beg.col = R->selection.mark.col; + R->selection.end.row = pos.row; + R->selection.end.col = pos.col; + } } if (R->selection.clicks == 1) { - end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; - if (end_col != -1 && R->selection.beg.col > end_col) { + end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; + if (end_col != -1 && R->selection.beg.col > end_col) { #if 1 - R->selection.beg.col = ncol; + R->selection.beg.col = ncol; #else - if (R->selection.beg.row != R->selection.end.row) - R->selection.beg.col = ncol; - else - R->selection.beg.col = R->selection.mark.col; -#endif - } - end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; - if (end_col != -1 && R->selection.end.col > end_col) - R->selection.end.col = ncol; + if (R->selection.beg.row != R->selection.end.row) + R->selection.beg.col = ncol; + else + R->selection.beg.col = R->selection.mark.col; +#endif + } + end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; + if (end_col != -1 && R->selection.end.col > end_col) + R->selection.end.col = ncol; } else if (R->selection.clicks == 2) { - if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) - R->selection.end.col--; - rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), - &(R->selection.beg)); - rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), - &(R->selection.end)); + if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) + R->selection.end.col--; + rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), + &(R->selection.beg)); + rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), + &(R->selection.end)); } else if (R->selection.clicks == 3) { #ifndef NO_FRILLS - if ((R->Options & Opt_tripleclickwords)) { - int end_row; + if ((R->Options & Opt_tripleclickwords)) { + int end_row; - rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), - &(R->selection.beg)); - end_row = R->screen.tlen[R->selection.mark.row - + R->TermWin.saveLines]; - for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; - end_row++) { - end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; - if (end_col != -1) { - R->selection.end.row = end_row; - R->selection.end.col = end_col; - rxvt_selection_remove_trailing_spaces(aR); - break; - } - } - } else -#endif - { - if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) - R->selection.mark.col++; - R->selection.beg.col = 0; - R->selection.end.col = ncol; - } - } - if (button3 && buttonpress) { /* mark may need to be changed */ - if (closeto == LEFT) { - R->selection.mark.row = R->selection.end.row; - R->selection.mark.col = R->selection.end.col - - (R->selection.clicks == 2); - } else { - R->selection.mark.row = R->selection.beg.row; - R->selection.mark.col = R->selection.beg.col; - } + rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), + &(R->selection.beg)); + end_row = R->screen.tlen[R->selection.mark.row + + R->TermWin.saveLines]; + for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; + end_row++) { + end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; + if (end_col != -1) { + R->selection.end.row = end_row; + R->selection.end.col = end_col; + rxvt_selection_remove_trailing_spaces(aR); + break; + } + } + } else +#endif + { + if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) + R->selection.mark.col++; + R->selection.beg.col = 0; + R->selection.end.col = ncol; + } + } + if (button3 && buttonpress) { /* mark may need to be changed */ + if (closeto == LEFT) { + R->selection.mark.row = R->selection.end.row; + R->selection.mark.col = R->selection.end.col + - (R->selection.clicks == 2); + } else { + R->selection.mark.row = R->selection.beg.row; + R->selection.mark.col = R->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)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); -#endif /* ! NO_NEW_SELECTION */ +#endif /* ! NO_NEW_SELECTION */ } #ifndef NO_FRILLS @@ -3163,26 +3228,26 @@ end_col = R->selection.end.col; end_row = R->selection.end.row; for ( ; end_row >= R->selection.beg.row; ) { - stp = R->screen.text[end_row + R->TermWin.saveLines]; - while (--end_col >= 0) { - if (stp[end_col] != ' ' && stp[end_col] != '\t') - break; - } - if (end_col >= 0 - || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { - R->selection.end.col = end_col + 1; - R->selection.end.row = end_row; - break; - } - end_row--; - end_col = R->TermWin.ncol; + stp = R->screen.text[end_row + R->TermWin.saveLines]; + while (--end_col >= 0) { + if (stp[end_col] != ' ' && stp[end_col] != '\t') + break; + } + if (end_col >= 0 + || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { + R->selection.end.col = end_col + 1; + R->selection.end.row = end_row; + break; + } + end_row--; + end_col = R->TermWin.ncol; } if (R->selection.mark.row > R->selection.end.row) { - R->selection.mark.row = R->selection.end.row; - R->selection.mark.col = R->selection.end.col; + R->selection.mark.row = R->selection.end.row; + R->selection.mark.col = R->selection.end.col; } else if (R->selection.mark.row == R->selection.end.row - && R->selection.mark.col > R->selection.end.col) - R->selection.mark.col = R->selection.end.col; + && R->selection.mark.col > R->selection.end.col) + R->selection.mark.col = R->selection.end.col; } #endif @@ -3236,68 +3301,68 @@ ev.time = rq->time; if (rq->target == R->xa[XA_TARGETS]) { - target_list[0] = (Atom32) R->xa[XA_TARGETS]; - target_list[1] = (Atom32) XA_STRING; - target_list[2] = (Atom32) R->xa[XA_TEXT]; + target_list[0] = (Atom32) R->xa[XA_TARGETS]; + target_list[1] = (Atom32) XA_STRING; + target_list[2] = (Atom32) R->xa[XA_TEXT]; #ifdef USE_XIM - target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; + target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; #endif - XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, - (8 * sizeof(target_list[0])), PropModeReplace, - (unsigned char *)target_list, - (sizeof(target_list) / sizeof(target_list[0]))); - ev.property = rq->property; + XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, + (8 * sizeof(target_list[0])), PropModeReplace, + (unsigned char *)target_list, + (sizeof(target_list) / sizeof(target_list[0]))); + ev.property = rq->property; } else if (rq->target == R->xa[XA_MULTIPLE]) { - /* TODO: Handle MULTIPLE */ + /* TODO: Handle MULTIPLE */ } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { - XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, - (8 * sizeof(Time)), PropModeReplace, - (unsigned char *)&R->selection_time, 1); - ev.property = rq->property; + XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, + (8 * sizeof(Time)), PropModeReplace, + (unsigned char *)&R->selection_time, 1); + ev.property = rq->property; } else if (rq->target == XA_STRING - || rq->target == R->xa[XA_COMPOUND_TEXT] - || rq->target == R->xa[XA_TEXT]) { + || rq->target == R->xa[XA_COMPOUND_TEXT] + || rq->target == R->xa[XA_TEXT]) { #ifdef USE_XIM - short freect = 0; + short freect = 0; #endif - int selectlen; + int selectlen; #ifdef USE_XIM - if (rq->target != XA_STRING) { - target = R->xa[XA_COMPOUND_TEXT]; - style = (rq->target == R->xa[XA_COMPOUND_TEXT]) - ? XCompoundTextStyle : XStdICCTextStyle; - } else -#endif - { - target = XA_STRING; - style = XStringStyle; - } - if (R->selection.text) { - cl[0] = (char *)R->selection.text; - selectlen = R->selection.len; - } else { - cl[0] = dummy; - *dummy = '\0'; - selectlen = 0; - } + if (rq->target != XA_STRING) { + target = R->xa[XA_COMPOUND_TEXT]; + style = (rq->target == R->xa[XA_COMPOUND_TEXT]) + ? XCompoundTextStyle : XStdICCTextStyle; + } else +#endif + { + target = XA_STRING; + style = XStringStyle; + } + if (R->selection.text) { + cl[0] = (char *)R->selection.text; + selectlen = R->selection.len; + } else { + cl[0] = dummy; + *dummy = '\0'; + selectlen = 0; + } #ifdef USE_XIM - if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) - == Success) /* if we failed to convert then send it raw */ - freect = 1; - else -#endif - { - ct.value = (unsigned char *)cl[0]; - ct.nitems = selectlen; - } - XChangeProperty(R->Xdisplay, rq->requestor, rq->property, - target, 8, PropModeReplace, - ct.value, (int)ct.nitems); - ev.property = rq->property; + if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) + == Success) /* if we failed to convert then send it raw */ + freect = 1; + else +#endif + { + ct.value = (unsigned char *)cl[0]; + ct.nitems = selectlen; + } + XChangeProperty(R->Xdisplay, rq->requestor, rq->property, + target, 8, PropModeReplace, + ct.value, (int)ct.nitems); + ev.property = rq->property; #ifdef USE_XIM - if (freect) - XFree(ct.value); + if (freect) + XFree(ct.value); #endif } XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); @@ -3330,7 +3395,7 @@ XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y - - R->TermWin.lineSpace; + - R->TermWin.lineSpace; } #endif /* ------------------------------------------------------------------------- */ @@ -3345,26 +3410,26 @@ { int color; const char *name[] = { - "fg", "bg", - "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" + "fg", "bg", + "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" }; fprintf(stderr, "Color ( "); if (R->rstyle & RS_RVid) - fprintf(stderr, "rvid "); + fprintf(stderr, "rvid "); if (R->rstyle & RS_Bold) - fprintf(stderr, "bold "); + fprintf(stderr, "bold "); if (R->rstyle & RS_Blink) - fprintf(stderr, "blink "); + fprintf(stderr, "blink "); if (R->rstyle & RS_Uline) - fprintf(stderr, "uline "); + fprintf(stderr, "uline "); fprintf(stderr, "): "); color = GET_FGCOLOR(R->rstyle); #ifndef NO_BRIGHTCOLOR if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { - color -= (minBrightCOLOR - minCOLOR); - fprintf(stderr, "bright "); + color -= (minBrightCOLOR - minCOLOR); + fprintf(stderr, "bright "); } #endif fprintf(stderr, "%s on ", name[color]); @@ -3372,8 +3437,8 @@ color = GET_BGCOLOR(R->rstyle); #ifndef NO_BRIGHTCOLOR if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { - color -= (minBrightCOLOR - minCOLOR); - fprintf(stderr, "bright "); + color -= (minBrightCOLOR - minCOLOR); + fprintf(stderr, "bright "); } #endif fprintf(stderr, "%s\n", name[color]);