--- rxvt-unicode/src/screen.C 2004/02/22 08:09:38 1.31 +++ rxvt-unicode/src/screen.C 2004/07/26 14:57:12 1.77 @@ -1,8 +1,9 @@ /*--------------------------------*-C-*--------------------------------------* - * File: screen.c + * File: screen.C *---------------------------------------------------------------------------* * * Copyright (c) 1997-2001 Geoff Wing + * Copyright (c) 2003-2004 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *--------------------------------------------------------------------------*/ + /* - * We handle _all_ screen updates and selections + * This file handles _all_ screen updates and selections */ #include "../config.h" /* NECESSARY */ @@ -32,7 +34,7 @@ #include #include -#include "salloc.C" // HACK!! +#include "salloc.C" // HACK, should be a seperate compile! inline void fill_text (text_t *start, text_t value, int len) { @@ -48,41 +50,41 @@ * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * * ------------------------------------------------------------------------- */ #define ZERO_SCROLLBACK() \ - if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ + if (Options & Opt_scrollTtyOutput) \ TermWin.view_start = 0 #define CLEAR_SELECTION() \ - selection.beg.row = selection.beg.col \ + selection.beg.row = selection.beg.col \ = selection.end.row = selection.end.col = 0 #define CLEAR_ALL_SELECTION() \ - selection.beg.row = selection.beg.col \ - = selection.mark.row = selection.mark.col \ + selection.beg.row = selection.beg.col \ + = selection.mark.row = selection.mark.col \ = selection.end.row = selection.end.col = 0 -#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ +#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) -#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ +#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) -#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ (((A) == (C)) && ((B) > (D))) -#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ (((A) == (C)) && ((B) >= (D))) -#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ (((A) == (C)) && ((B) < (D))) -#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ +#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ (((A) == (C)) && ((B) <= (D))) /* these must be row_col_t */ -#define ROWCOL_IS_AFTER(X, Y) \ +#define ROWCOL_IS_AFTER(X, Y) \ ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IS_BEFORE(X, Y) \ +#define ROWCOL_IS_BEFORE(X, Y) \ ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_AFTER(X, Y) \ +#define ROWCOL_IN_ROW_AFTER(X, Y) \ ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_BEFORE(X, Y) \ +#define ROWCOL_IN_ROW_BEFORE(X, Y) \ ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ +#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) -#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ +#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) /* @@ -92,22 +94,22 @@ */ #define drawBuffer TermWin.vt -#define CLEAR_ROWS(row, num) \ - if (TermWin.mapped) \ - XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ +#define CLEAR_ROWS(row, num) \ + if (TermWin.mapped) \ + XClearArea (display->display, drawBuffer, 0, \ Row2Pixel (row), (unsigned int)TermWin.width, \ (unsigned int)Height2Pixel (num), False) -#define CLEAR_CHARS(x, y, num) \ - if (TermWin.mapped) \ - XClearArea (display->display, drawBuffer, x, y, \ - (unsigned int)Width2Pixel (num), \ +#define CLEAR_CHARS(x, y, num) \ + if (TermWin.mapped) \ + XClearArea (display->display, drawBuffer, x, y, \ + (unsigned int)Width2Pixel (num), \ (unsigned int)Height2Pixel (1), False) -#define ERASE_ROWS(row, num) \ - XFillRectangle (display->display, drawBuffer, TermWin.gc, \ - TermWin.int_bwidth, Row2Pixel (row), \ - (unsigned int)TermWin.width, \ +#define ERASE_ROWS(row, num) \ + XFillRectangle (display->display, drawBuffer, TermWin.gc, \ + 0, Row2Pixel (row), \ + (unsigned int)TermWin.width, \ (unsigned int)Height2Pixel (num)) /* ------------------------------------------------------------------------- * @@ -189,7 +191,7 @@ if (prev_nrow == 0) { /* - * first time called so just malloc everything : don't rely on realloc + * 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 *)); @@ -256,6 +258,7 @@ for (p = nrow; p < prev_nrow; p++) { q = p + TermWin.saveLines; + if (screen.text[q]) { #ifdef DEBUG_STRICT @@ -264,6 +267,7 @@ talloc->free (screen.text[q]); ralloc->free (screen.rend[q]); } + if (swap.text[p]) { #ifdef DEBUG_STRICT @@ -272,6 +276,7 @@ talloc->free (swap.text[p]); ralloc->free (swap.rend[p]); } + #ifdef DEBUG_STRICT assert (drawn_text[p] && drawn_rend[p]); #endif @@ -311,7 +316,7 @@ 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 (swap.text, swap.rend, p, setrstyle); scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); } @@ -336,7 +341,6 @@ /* 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)); @@ -344,39 +348,38 @@ { 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; + screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); + screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); 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); + 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; + drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); + drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); if (ncol > prev_ncol) - scr_blank_line (& (drawn_text[p][prev_ncol]), - & (drawn_rend[p][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; + swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); + swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); 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]), + scr_blank_line (&swap.text[p][prev_ncol], + &swap.rend[p][prev_ncol], ncol - prev_ncol, setrstyle); } @@ -439,15 +442,6 @@ total_rows = TermWin.nrow + TermWin.saveLines; -#ifdef DEBUG_STRICT - for (i = 0; i < total_rows; i++) - { - if (screen.text[i]) - /* then so is screen.rend[i] */ - assert (screen.rend[i]); - } -#endif - delete talloc; talloc = 0; delete ralloc; ralloc = 0; @@ -485,7 +479,7 @@ prev_nrow = prev_ncol = 0; scr_reset (); - scr_clear (); + scr_clear (true); scr_refresh (SLOW_REFRESH); } @@ -500,16 +494,17 @@ void rxvt_term::scr_cursor (int mode) { - screen_t *s; + screen_t *s; D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) if (current_screen == SECONDARY) - s = & (swap); + s = &swap; else #endif - s = & (screen); + s = &screen; + switch (mode) { case SAVE: @@ -519,6 +514,7 @@ s->s_charset = s->charset; s->s_charset_char = charsets[s->charset]; break; + case RESTORE: want_refresh = 1; s->cur.row = s->s_cur.row; @@ -530,6 +526,7 @@ set_font_style (); break; } + /* boundary check in case screen size changed between SAVE and RESTORE */ MIN_IT (s->cur.row, TermWin.nrow - 1); MIN_IT (s->cur.col, TermWin.ncol - 1); @@ -551,9 +548,9 @@ int rxvt_term::scr_change_screen (int scrn) { - int i; + int i; #if NSCREENS - int offset; + int offset; #endif want_refresh = 1; @@ -563,41 +560,43 @@ TermWin.view_start = 0; if (current_screen == scrn) - return current_screen; + return scrn; selection_check (2); /* check for boundary cross */ SWAP_IT (current_screen, scrn, int); #if NSCREENS - num_scr = 0; - offset = TermWin.saveLines; - for (i = prev_nrow; i--;) + if (Options & Opt_secondaryScreen) { - SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); - SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); - SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); - } - SWAP_IT (screen.cur.row, swap.cur.row, int16_t); - SWAP_IT (screen.cur.col, swap.cur.col, int16_t); + num_scr = 0; + offset = TermWin.saveLines; + for (i = prev_nrow; i--;) + { + SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); + SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); + SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); + } + SWAP_IT (screen.cur.row, swap.cur.row, int16_t); + SWAP_IT (screen.cur.col, swap.cur.col, int16_t); # ifdef DEBUG_STRICT - assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); - assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); + assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); + assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); # else /* drive with your eyes closed */ - MAX_IT (screen.cur.row, 0); - MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); - MAX_IT (screen.cur.col, 0); - MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); -# endif - SWAP_IT (screen.charset, swap.charset, int16_t); - SWAP_IT (screen.flags, swap.flags, int); - screen.flags |= Screen_VisibleCursor; - swap.flags |= Screen_VisibleCursor; -#else -# ifdef SCROLL_ON_NO_SECONDARY - if (current_screen == PRIMARY) - scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); + MAX_IT (screen.cur.row, 0); + MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); + MAX_IT (screen.cur.col, 0); + MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); # endif + SWAP_IT (screen.charset, swap.charset, int16_t); + SWAP_IT (screen.flags, swap.flags, int); + screen.flags |= Screen_VisibleCursor; + swap.flags |= Screen_VisibleCursor; + } + else #endif + if (Options & Opt_secondaryScroll) + //if (current_screen == PRIMARY) + scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); return scrn; } @@ -649,7 +648,8 @@ 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) && (current_screen == PRIMARY)) + if (row1 == 0 && count > 0 + && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) { nscrolled = (long)TermWin.nscrolled + (long)count; @@ -712,6 +712,7 @@ 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++) { @@ -719,6 +720,7 @@ screen.text[j] = screen.text[i]; screen.rend[j] = screen.rend[i]; } + j = row2 - count + 1, i = count; } else /* if (j < 0) */ @@ -731,6 +733,7 @@ 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--) { @@ -738,6 +741,7 @@ screen.text[j] = screen.text[i]; screen.rend[j] = screen.rend[i]; } + j = row1, i = count; count = -count; } @@ -750,8 +754,7 @@ 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); + scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); } return count; @@ -762,13 +765,13 @@ * Add text given in of length to screen struct */ void -rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) +rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) { - unsigned char checksel, clearsel; - uint32_t c; - int i, row, last_col; - text_t *stp; - rend_t *srp; + unsigned char checksel, clearsel; + unicode_t c; + int i, row, last_col; + text_t *stp; + rend_t *srp; if (len <= 0) /* sanity */ return; @@ -801,43 +804,46 @@ #endif row = screen.cur.row + TermWin.saveLines; - checksel = (selection.op - && current_screen == selection.screen) ? 1 : 0; + checksel = selection.op && current_screen == selection.screen ? 1 : 0; clearsel = 0; stp = screen.text[row]; srp = screen.rend[row]; - for (i = 0; i < len;) + while (len--) { - c = str[i++]; - switch (c) - { - case '\t': - scr_tab (1); - continue; - case '\n': - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); - screen.flags &= ~Screen_WrapNext; - if (screen.cur.row == screen.bscroll) - scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); - else if (screen.cur.row < (TermWin.nrow - 1)) - row = (++screen.cur.row) + TermWin.saveLines; - stp = screen.text[row]; /* _must_ refresh */ - srp = screen.rend[row]; /* _must_ refresh */ - continue; - case '\r': - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); - screen.flags &= ~Screen_WrapNext; - screen.cur.col = 0; - continue; - default: - if (c == 127) - continue; /* yummmm..... */ - break; - } + c = *str++; + + if (c < 0x20) + switch (c) + { + case C0_HT: + scr_tab (1); + continue; + + case C0_LF: + if (screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT (screen.tlen[row], screen.cur.col); + + screen.flags &= ~Screen_WrapNext; + + if (screen.cur.row == screen.bscroll) + scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); + else if (screen.cur.row < (TermWin.nrow - 1)) + row = (++screen.cur.row) + TermWin.saveLines; + + stp = screen.text[row]; /* _must_ refresh */ + srp = screen.rend[row]; /* _must_ refresh */ + continue; + + case C0_CR: + if (screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT (screen.tlen[row], screen.cur.col); + + screen.flags &= ~Screen_WrapNext; + screen.cur.col = 0; + continue; + } if (checksel /* see if we're writing within selection */ && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) @@ -846,6 +852,7 @@ checksel = 0; clearsel = 1; } + if (screen.flags & Screen_WrapNext) { screen.tlen[row] = -1; @@ -853,56 +860,112 @@ scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); else if (screen.cur.row < (TermWin.nrow - 1)) row = (++screen.cur.row) + TermWin.saveLines; + stp = screen.text[row]; /* _must_ refresh */ srp = screen.rend[row]; /* _must_ refresh */ screen.cur.col = 0; screen.flags &= ~Screen_WrapNext; } + if (screen.flags & Screen_Insert) scr_insdel_chars (1, INSERT); + // rely on wcwidth to tell us the character width, at least for non-latin1 + // do wcwidth before further replacements, as wcwidth says that line-drawing + // characters have width -1 (DOH!) on GNU/Linux sometimes. + int width = c < 256 ? 1 : wcwidth (c); + if (charsets[screen.charset] == '0') // DEC SPECIAL - switch (c) - { - case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; - case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; - case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; - case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; - case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; - case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; - case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; - case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; - case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; - case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; - case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; - } + { + // vt100 special graphics and line drawing + static uint16_t vt100_0[32] = { // 5f .. 7e + 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, + 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, + 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, + 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, + }; - rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); - // rely on wcwidth to tell us the character width, at least for non-ascii - int width = c <= 128 ? 1 : wcwidth (c); - - // width -1 characters (e.g. combining chars) are ignored currently. - if (width > 0) - do - { - stp[screen.cur.col] = c; - srp[screen.cur.col] = rend; + if (c >= 0x5f && c <= 0x7e) + { + c = vt100_0[c - 0x5f]; + width = 1; + } + } - if (screen.cur.col < last_col - 1) - screen.cur.col++; - else - { - screen.tlen[row] = last_col; - if (screen.flags & Screen_Autowrap) - screen.flags |= Screen_WrapNext; - break; - } + if (width != 0) + { +#if !UNICODE_3 && ENABLE_COMBINING + // trim characters we can't store directly :( + if (c >= 0x10000) + c = rxvt_composite.compose (c); // map to lower 16 bits +#endif + bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); + rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c, bold)); - c = NOCHAR; - } - while (--width > 0); - else - (void)0; /* handle combining character etc. here. */ + do + { + stp[screen.cur.col] = c; + srp[screen.cur.col] = rend; + + if (screen.cur.col < last_col - 1) + screen.cur.col++; + else + { + screen.tlen[row] = last_col; + if (screen.flags & Screen_Autowrap) + screen.flags |= Screen_WrapNext; + break; + } + + c = NOCHAR; + } + while (--width > 0); + + // pad with spaces when overwriting wide character with smaller one + for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) + { + stp[c] = ' '; + srp[c] = rend; + } + } + else if (width == 0) + { +#if ENABLE_COMBINING + // handle combining characters + // we just tag the accent on the previous on-screen character. + // this is arguably not correct, but also arguably not wrong. + // we don't handle double-width characters nicely yet. + + text_t *tp; + rend_t *rp; + + if (screen.cur.col > 0) + { + tp = stp + screen.cur.col - 1; + rp = srp + screen.cur.col - 1; + } + else if (screen.cur.row > 0 + && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) + { + tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; + rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; + } + else + continue; + + // handle double-width-chars by making them look extremely ugly + if (*tp == NOCHAR) + *tp = ' '; // hack //D //TODO //--tp, --rp; + + // first try to find a precomposed character + unicode_t n = rxvt_compose (*tp, c); + if (n == NOCHAR) + n = rxvt_composite.compose (*tp, c); + + *tp = n; + *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); +#endif + } } if (screen.tlen[row] != -1) /* XXX: think about this */ @@ -932,6 +995,7 @@ rxvt_term::scr_backspace () { want_refresh = 1; + if (screen.cur.col == 0) { if (screen.cur.row > 0) @@ -946,6 +1010,7 @@ } else if ((screen.flags & Screen_WrapNext) == 0) scr_gotorc (0, -1, RELATIVE); + screen.flags &= ~Screen_WrapNext; } @@ -958,11 +1023,12 @@ void rxvt_term::scr_tab (int count) { - int i, x; + int i, x; D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); want_refresh = 1; i = x = screen.cur.col; + if (count == 0) return; else if (count > 0) @@ -974,6 +1040,7 @@ if (!--count) break; } + if (count) x = TermWin.ncol - 1; } @@ -986,9 +1053,11 @@ if (!++count) break; } + if (count) x = 0; } + if (x != screen.cur.col) scr_gotorc (0, x, R_RELATIVE); } @@ -1055,8 +1124,7 @@ D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); - screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) - : col); + screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; MAX_IT (screen.cur.col, 0); MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); @@ -1092,6 +1160,10 @@ } MAX_IT (screen.cur.row, 0); MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); + + while (screen.cur.col > 0 + && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) + screen.cur.col--; } /* ------------------------------------------------------------------------- */ @@ -1101,7 +1173,7 @@ void rxvt_term::scr_index (enum page_dirn direction) { - int dirn; + int dirn; want_refresh = 1; dirn = ((direction == UP) ? 1 : -1); @@ -1171,8 +1243,7 @@ } if (screen.text[row]) - scr_blank_line (& (screen.text[row][col]), - & (screen.rend[row][col]), num, rstyle); + scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); else scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); } @@ -1187,10 +1258,10 @@ void rxvt_term::scr_erase_screen (int mode) { - int num; - int32_t row, row_offset; - rend_t ren; - XGCValues gcvalue; + int num; + int32_t row, row_offset; + rend_t ren; + XGCValues gcvalue; want_refresh = 1; D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); @@ -1219,15 +1290,20 @@ default: return; } + refresh_type |= REFRESH_BOUNDS; + if (selection.op && current_screen == selection.screen && ((selection.beg.row >= row && selection.beg.row <= row + num) || (selection.end.row >= row && selection.end.row <= row + num))) CLEAR_SELECTION (); + if (row >= TermWin.nrow) /* Out Of Bounds */ return; + MIN_IT (num, (TermWin.nrow - row)); + if (rstyle & (RS_RVid | RS_Uline)) ren = (rend_t) ~RS_None; else if (GET_BASEBG (rstyle) == Color_bg) @@ -1244,6 +1320,7 @@ gcvalue.foreground = PixColors[Color_fg]; XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); } + for (; num--; row++) { scr_blank_screen_mem (screen.text, screen.rend, @@ -1287,7 +1364,7 @@ void rxvt_term::scr_insdel_lines (int count, int insdel) { - int end; + int end; ZERO_SCROLLBACK (); @@ -1316,11 +1393,11 @@ void rxvt_term::scr_insdel_chars (int count, int insdel) { - int col, row; - rend_t tr; - text_t *stp; - rend_t *srp; - int16_t *slp; + int col, row; + rend_t tr; + text_t *stp; + rend_t *srp; + int16_t *slp; want_refresh = 1; ZERO_SCROLLBACK (); @@ -1337,6 +1414,7 @@ stp = screen.text[row]; srp = screen.rend[row]; slp = & (screen.tlen[row]); + switch (insdel) { case INSERT: @@ -1346,11 +1424,13 @@ stp[col] = stp[col - count]; srp[col] = srp[col - count]; } + if (*slp != -1) { *slp += count; MIN_IT (*slp, TermWin.ncol); } + if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) { @@ -1364,9 +1444,11 @@ selection.end.col += count; } } + scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), (unsigned int)count, rstyle); break; + case ERASE: screen.cur.col += count; /* don't worry if > TermWin.ncol */ selection_check (1); @@ -1374,21 +1456,26 @@ scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), (unsigned int)count, rstyle); break; + case DELETE: - tr = srp[TermWin.ncol - 1] - & (RS_fgMask | RS_bgMask | RS_baseattrMask); + tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); + for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) { stp[col] = stp[col + count]; srp[col] = srp[col + count]; } + scr_blank_line (& (stp[TermWin.ncol - count]), & (srp[TermWin.ncol - count]), (unsigned int)count, tr); + if (*slp == -1) /* break line continuation */ *slp = TermWin.ncol; + *slp -= count; MAX_IT (*slp, 0); + if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) { @@ -1404,6 +1491,7 @@ selection.end.col -= count; } } + break; } } @@ -1418,8 +1506,10 @@ { MAX_IT (top, 0); MIN_IT (bot, (int)TermWin.nrow - 1); + if (top > bot) return; + screen.tscroll = top; screen.bscroll = bot; scr_gotorc (0, 0, 0); @@ -1435,6 +1525,7 @@ rxvt_term::scr_cursor_visible (int mode) { want_refresh = 1; + if (mode) screen.flags |= Screen_VisibleCursor; else @@ -1659,9 +1750,9 @@ return; #ifdef DEBUG_STRICT - x = max (x, (int)TermWin.int_bwidth); + x = max (x, 0); x = min (x, (int)TermWin.width); - y = max (y, (int)TermWin.int_bwidth); + y = max (y, 0); y = min (y, (int)TermWin.height); #endif @@ -1682,8 +1773,7 @@ D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) - fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, - (rc[PART_END].col - rc[PART_BEG].col + 1)); + fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); if (refresh) scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); @@ -1760,6 +1850,7 @@ want_refresh = 1; num_scr -= (TermWin.view_start - oldviewstart); } + return (int) (TermWin.view_start - oldviewstart); } @@ -1837,21 +1928,20 @@ void rxvt_term::scr_refresh (unsigned char refresh_type) { - unsigned char clearfirst, /* first character writes before cell */ - clearlast, /* last character writes beyond cell */ - must_clear, /* use draw_string not draw_image_string */ - rvid, /* reverse video this position */ - showcursor; /* show the cursor */ - int16_t col, row, /* column/row we're processing */ - ocrow; /* old cursor row */ - int cursorwidth; - int i, /* tmp */ - row_offset; /* basic offset in screen structure */ + unsigned char clearfirst, /* first character writes before cell */ + clearlast, /* last character writes beyond cell */ + must_clear, /* use draw_string not draw_image_string */ + rvid, /* reverse video this position */ + showcursor; /* show the cursor */ + int16_t col, row, /* column/row we're processing */ + ocrow; /* old cursor row */ + int i, /* tmp */ + row_offset; /* basic offset in screen structure */ #ifndef NO_CURSORCOLOR - rend_t cc1; /* store colours at cursor position (s) */ + rend_t cc1; /* store colours at cursor position (s) */ #endif - rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ - text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ + rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ + text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ if (refresh_type == NO_REFRESH || !TermWin.mapped) return; @@ -1888,25 +1978,19 @@ * C: set the cursor character (s) */ { - unsigned char setoldcursor; - rend_t ccol1, /* Cursor colour */ - ccol2; /* Cursor colour2 */ + unsigned char setoldcursor; + rend_t ccol1, /* Cursor colour */ + ccol2; /* Cursor colour2 */ showcursor = (screen.flags & Screen_VisibleCursor); - cursorwidth = 0; #ifdef CURSOR_BLINK if (hidden_cursor) showcursor = 0; #endif - cursorwidth = 0; - if (showcursor) { - cursorwidth++; - - srp = & (screen.rend[screen.cur.row + TermWin.saveLines] - [screen.cur.col]); + srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); if (showcursor && TermWin.focus) { @@ -1932,7 +2016,6 @@ *srp = SET_FGCOLOR (*srp, ccol1); *srp = SET_BGCOLOR (*srp, ccol2); #endif - } } @@ -1945,9 +2028,8 @@ { if (ocrow < TermWin.nrow && oldcursor.col < TermWin.ncol) - { - drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); - } + drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); + if (TermWin.focus || !showcursor) oldcursor.row = -1; else @@ -1956,6 +2038,7 @@ } else if (!TermWin.focus) setoldcursor = 1; + if (setoldcursor) { if (screen.cur.row + TermWin.view_start >= TermWin.nrow) @@ -1977,11 +2060,11 @@ if (refresh_type == FAST_REFRESH && num_scr_allow && i && abs (i) < TermWin.nrow && !must_clear) { - int16_t nits; - int j; - rend_t *drp2; - text_t *dtp2; - int len, wlen; + int16_t nits; + int j; + rend_t *drp2; + text_t *dtp2; + int len, wlen; j = TermWin.nrow; wlen = len = -1; @@ -2055,25 +2138,25 @@ for (col = 0; col < 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 */ + && (srp[col] == drp[col] /* Either rendition the same or */ || (stp[col] == ' ' /* space w/ no background change */ - && GET_BGATTR (rend) == GET_BGATTR (drp[col])))) + && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) continue; + // redraw one or more characters + + // seek to the beginning if wide characters + while (stp[col] == NOCHAR && col > 0) + --col; + + rend_t rend = srp[col]; /* screen rendition (target rendtion) */ text_t *text = stp + col; int count = 1; - /* redraw one or more characters */ - dtp[col] = stp[col]; drp[col] = rend; - if (*text == NOCHAR) // never start redrawing at invisible characters. */ - continue; - int xpixel = Col2Pixel (col); // this loop looks very messy, it can probably be optimized @@ -2123,7 +2206,22 @@ rend = GET_ATTR (rend); - rvid = !! (rend & RS_RVid); + rvid = !!(rend & RS_RVid); + +#ifndef NO_BOLD_UNDERLINE_REVERSE + if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) + { + if (ISSET_PIXCOLOR (Color_BD)) + fore = Color_BD; + else + rvid = !rvid; + } + + if (rend & RS_Uline) + if (ISSET_PIXCOLOR (Color_UL)) + fore = Color_UL; +#endif + if (rvid) { SWAP_IT (fore, back, int); @@ -2136,10 +2234,10 @@ ) back = Color_RV; #endif - } + #ifdef TEXT_BLINK - if (rend & RS_Blink) + if (rend & RS_Blink && back == Color_bg) { if (!text_blink_ev.active) { @@ -2150,20 +2248,6 @@ fore = back; } #endif -#ifndef NO_BOLD_UNDERLINE_REVERSE - else if (rend & RS_Bold) - { - if (ISSET_PIXCOLOR (Color_BD)) - fore = Color_BD; - else if (fore == Color_fg) - fore = Color_White; - } - else if (rend & RS_Uline) - { - if (ISSET_PIXCOLOR (Color_UL)) - fore = Color_UL; - } -#endif /* * Actually do the drawing of the string here @@ -2171,7 +2255,7 @@ rxvt_font *font = (*TermWin.fontset)[fid]; if (back == fore) - font->clear_rect (xpixel, ypixel, + font->clear_rect (*TermWin.drawable, xpixel, ypixel, TermWin.fwidth * count, TermWin.fheight, back); else if (back == Color_bg) @@ -2183,20 +2267,20 @@ for (i = 0; i < count; i++) /* don't draw empty strings */ if (text[i] != ' ') { - font->draw (xpixel, ypixel, text, count, fore, -1); + font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); break; } } else - font->draw (xpixel, ypixel, text, count, fore, Color_bg); + font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); } else - font->draw (xpixel, ypixel, text, count, fore, back); + font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); if ((rend & RS_Uline) && (font->descent > 1)) XDrawLine (display->display, drawBuffer, TermWin.gc, - xpixel, ypixel + font->ascent + 1, - xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); + xpixel, ypixel + font->ascent + 1, + xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); } /* for (col....) */ } /* for (row....) */ @@ -2213,7 +2297,6 @@ #ifndef NO_CURSORCOLOR *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; #endif - } else if (oldcursor.row >= 0) { @@ -2221,11 +2304,16 @@ if (ISSET_PIXCOLOR (Color_cursor)) XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); #endif + int cursorwidth = 1; + while (oldcursor.col + cursorwidth < TermWin.ncol + && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) + cursorwidth++; + XDrawRectangle (display->display, drawBuffer, TermWin.gc, - Col2Pixel (oldcursor.col), - Row2Pixel (oldcursor.row), - (unsigned int) (Width2Pixel (cursorwidth) - 1), - (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); + Col2Pixel (oldcursor.col), + Row2Pixel (oldcursor.row), + (unsigned int) (Width2Pixel (cursorwidth) - 1), + (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); } } @@ -2237,23 +2325,27 @@ /* * I: other general cleanup */ +#if 0 if (clearfirst && TermWin.int_bwidth) /* * clear the whole screen height, note that width == 0 is treated * specially by XClearArea */ XClearArea (display->display, TermWin.vt, 0, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight (), False); + (unsigned int)TermWin.int_bwidth, + (unsigned int)TermWin_TotalHeight (), False); + if (clearlast && TermWin.int_bwidth) /* * clear the whole screen height, note that width == 0 is treated * specially by XClearArea */ XClearArea (display->display, TermWin.vt, - TermWin.width + TermWin.int_bwidth, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight (), False); + TermWin.width + TermWin.int_bwidth, 0, + (unsigned int)TermWin.int_bwidth, + (unsigned int)TermWin_TotalHeight (), False); +#endif + if (refresh_type & SMOOTH_REFRESH) XSync (display->display, False); @@ -2262,15 +2354,39 @@ want_refresh = 0; /* screen is current */ } +void +rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) +{ + if (!rp || !tp) + return; + + for (int i = TermWin.ncol; i; i--, rp++, tp++) + *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); +} + +void +rxvt_term::scr_remap_chars () +{ + for (int i = TermWin.nrow + TermWin.saveLines; i--; ) + scr_remap_chars (screen.text[i], screen.rend[i]); + + for (int i = TermWin.nrow; i--; ) + { + scr_remap_chars (drawn_text[i], drawn_rend[i]); + scr_remap_chars (swap.text[i], swap.rend[i]); + } +} + /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_clear () +rxvt_term::scr_clear (bool really) { if (!TermWin.mapped) return; num_scr_allow = 0; want_refresh = 1; + #ifdef TRANSPARENT if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) { @@ -2287,21 +2403,21 @@ } #endif - XClearWindow (display->display, TermWin.vt); + if (really) + XClearWindow (display->display, TermWin.vt); } /* ------------------------------------------------------------------------- */ void rxvt_term::scr_reverse_selection () { - int i, col, row, end_row; - rend_t *srp; - if (selection.op && current_screen == selection.screen) { - end_row = TermWin.saveLines - TermWin.view_start; - i = selection.beg.row + TermWin.saveLines; - row = selection.end.row + TermWin.saveLines; + int end_row = TermWin.saveLines - TermWin.view_start; + int i = selection.beg.row + TermWin.saveLines; + int col, row = selection.end.row + TermWin.saveLines; + rend_t *srp; + if (i >= end_row) col = selection.beg.col; else @@ -2309,10 +2425,12 @@ col = 0; i = end_row; } + end_row += TermWin.nrow; for (; i < row && i < end_row; i++, col = 0) for (srp = screen.rend[i]; col < TermWin.ncol; col++) srp[col] ^= RS_RVid; + if (i == row && i < end_row) for (srp = screen.rend[i]; col < selection.end.col; col++) srp[col] ^= RS_RVid; @@ -2410,8 +2528,8 @@ MEMCPY (ds, data + i, n); for (j = 0; j < n; j++) - if (ds[j] == '\n') - ds[j] = '\r'; + if (ds[j] == C0_LF) + ds[j] = C0_CR; tt_write (ds, (int)n); } @@ -2461,10 +2579,10 @@ for (;;) { if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), - (long) (PROP_SIZE / 4), delete_prop, - AnyPropertyType, &ct.encoding, &ct.format, - &ct.nitems, &bytes_after, - &ct.value) != Success) + (long) (PROP_SIZE / 4), delete_prop, + AnyPropertyType, &ct.encoding, &ct.format, + &ct.nitems, &bytes_after, + &ct.value) != Success) break; if (ct.encoding == 0) @@ -2482,7 +2600,9 @@ if (ct.nitems == 0) { D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); - if (selection_wait == Sel_normal && nread == 0) + + if (selection_wait == Sel_normal && nread == 0 + && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion { /* * pass through again trying CUT_BUFFER0 if we've come from @@ -2500,8 +2620,7 @@ char **cl; int cr; - if (XmbTextPropertyToTextList (display->display, &ct, &cl, - &cr) >= 0 && cl) + if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) { for (int i = 0; i < cr; i++) paste ((unsigned char *)cl[i], STRLEN (cl[i])); @@ -2532,7 +2651,7 @@ { selection_wait = Sel_none; - rxvt_print_error ("data loss: timeout on INCR selection paste"); + rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); } /* @@ -2545,13 +2664,14 @@ if (prop == None) return; + D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); if (selection_wait == Sel_normal) { - int a, afmt; - Atom atype; - unsigned long bytes_after, nitems; - unsigned char *s = NULL; + int a, afmt; + Atom atype; + unsigned long bytes_after, nitems; + unsigned char *s = NULL; a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, xa[XA_INCR], &atype, &afmt, &nitems, @@ -2560,6 +2680,7 @@ XFree (s); if (a != Success) return; + #ifndef __CYGWIN32__ if (atype == xa[XA_INCR]) { /* start an INCR transfer */ @@ -2575,6 +2696,7 @@ else if (selection_wait == Sel_incr) { reget_time = 1; + if (selection_paste (win, prop, True) == -1) { D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); @@ -2585,6 +2707,7 @@ if (reget_time) /* received more data so reget time */ incr_ev.start (NOW + 10); } + /* ------------------------------------------------------------------------- */ /* * Request the current selection: @@ -2599,21 +2722,25 @@ rxvt_term::selection_request (Time tm, int x, int y) { D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); + if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) return; /* outside window */ - if (selection.text != NULL) - { /* internal selection */ + if (selection.text) + { /* internal selection */ D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); - paste (selection.text, selection.len); + char *str = rxvt_wcstombs (selection.text, selection.len); + paste ((unsigned char *)str, strlen (str)); + free (str); return; } else { - int i; + int i; selection_request_time = tm; selection_wait = Sel_normal; + for (i = Sel_Primary; i <= Sel_Clipboard; i++) { #if X_HAVE_UTF8_STRING @@ -2628,6 +2755,7 @@ } } + selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); selection_paste (display->root, XA_CUT_BUFFER0, False); @@ -2636,25 +2764,28 @@ int rxvt_term::selection_request_other (Atom target, int selnum) { - Atom sel; + Atom sel; #ifdef DEBUG_SELECT - char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; + char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; #endif selection_type |= selnum; + if (selnum == Sel_Primary) sel = XA_PRIMARY; else if (selnum == Sel_Secondary) sel = XA_SECONDARY; else sel = xa[XA_CLIPBOARD]; + if (XGetSelectionOwner (display->display, sel) != None) { D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], - TermWin.vt, selection_request_time); + TermWin.vt, selection_request_time); return 1; } + return 0; } @@ -2669,11 +2800,13 @@ D_SELECT ((stderr, "rxvt_selection_clear ()")); want_refresh = 1; - if (selection.text) - free (selection.text); + free (selection.text); selection.text = NULL; selection.len = 0; CLEAR_SELECTION (); + + if (display->selection_owner == this) + display->selection_owner = 0; } /* ------------------------------------------------------------------------- */ @@ -2684,13 +2817,9 @@ void rxvt_term::selection_make (Time tm) { - int i, col, end_col, row, end_row; - unsigned char *new_selection_text; - char *str; - text_t *t; -#ifdef ACS_ASCII - rend_t *re; -#endif + int i, col, end_col, row, end_row; + wchar_t *new_selection_text; + text_t *t; D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); switch (selection.op) @@ -2706,24 +2835,25 @@ default: return; } + selection.op = SELECTION_DONE; if (selection.clicks == 4) return; /* nothing selected, go away */ - i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; - str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); - - new_selection_text = (unsigned char *)str; + i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); + new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); col = selection.beg.col; MAX_IT (col, 0); row = selection.beg.row + TermWin.saveLines; end_row = selection.end.row + TermWin.saveLines; + int ofs = 0; + int extra = 0; for (; row <= end_row; row++, col = 0) { - t = & (screen.text[row][col]); + t = &(screen.text[row][col]); end_col = screen.tlen[row]; @@ -2734,69 +2864,67 @@ MIN_IT (end_col, selection.end.col); for (; col < end_col; col++) - if (*t == NOCHAR) - t++; - else - { - int len = wctomb (str, *t++); - if (len > 0) - str += len; - } + { + if (*t == NOCHAR) + t++; +#if ENABLE_COMBINING + else if (IS_COMPOSE (*t)) + { + int len = rxvt_composite.expand (*t, 0); + + extra -= (len - 1); + + if (extra < 0) + { + extra += i; + i += i; + new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); + } + + ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); + } +#endif + else + new_selection_text[ofs++] = *t++; + } if (screen.tlen[row] != -1 && row != end_row) - *str++ = '\n'; + new_selection_text[ofs++] = C0_LF; } -#ifndef NO_OLD_SELECTION - if (selection_style == OLD_SELECT) - if (end_col == TermWin.ncol) - *str++ = '\n'; -#endif -#ifndef NO_NEW_SELECTION - if (selection_style != OLD_SELECT) - if (end_col != selection.end.col) - *str++ = '\n'; -#endif - *str = '\0'; + if (end_col != selection.end.col) + new_selection_text[ofs++] = C0_LF; + + new_selection_text[ofs] = 0; - i = str - (char *)new_selection_text; - if (i == 0) + if (ofs == 0) { free (new_selection_text); return; } - // due to MB_MAX_CUR, selection wastage is usually high, so realloc - if (str - (char *)new_selection_text > 1024) - new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); - - selection.len = i; - - if (selection.text) - free (selection.text); + free (selection.text); - selection.text = new_selection_text; + // we usually allocate much more than necessary, so realloc it smaller again + selection.len = ofs; + selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) display->set_selection_owner (this); else - rxvt_print_error ("can't get primary selection"); + rxvt_warn ("can't get primary selection, ignoring.\n"); - { - XTextProperty ct; - char *cl = (char *)selection.text; +#if 0 + XTextProperty ct; - if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) - { - XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, ct.value, ct.nitems); - XFree (ct.value); - } - else + if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) + { XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, selection.text, (int)selection.len); - } + PropModeReplace, ct.value, ct.nitems); + XFree (ct.value); + } +#endif selection_time = tm; D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); @@ -2835,16 +2963,22 @@ want_refresh = 1; selection.mark.col = col; selection.mark.row = row - TermWin.view_start; + MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); MAX_IT (selection.mark.col, 0); MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); + while (selection.mark.col > 0 + && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) + --selection.mark.col; + if (selection.op) { /* clear the old selection */ selection.beg.row = selection.end.row = selection.mark.row; selection.beg.col = selection.end.col = selection.mark.col; } + selection.op = SELECTION_INIT; selection.screen = current_screen; } @@ -2856,17 +2990,17 @@ */ /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ -#define DELIMIT_TEXT(x) \ - (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) +#define DELIMIT_TEXT(x) \ + (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) #define DELIMIT_REND(x) 1 void rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) { - int col, row, dirnadd, tcol, trow, w1, w2; - row_col_t bound; - text_t *stp; - rend_t *srp; + int col, row, dirnadd, tcol, trow, w1, w2; + row_col_t bound; + text_t *stp; + rend_t *srp; if (dirn == UP) { @@ -2880,6 +3014,7 @@ bound.col = TermWin.ncol - 1; dirnadd = 1; } + row = mark->row + TermWin.saveLines; col = mark->col; MAX_IT (col, 0); @@ -2887,17 +3022,6 @@ stp = & (screen.text[row][col]); w1 = DELIMIT_TEXT (*stp); - if (selection_style != NEW_SELECT) - { - if (w1 == 1) - { - stp += dirnadd; - if (DELIMIT_TEXT (*stp) == 1) - goto Old_Word_Selection_You_Die; - col += dirnadd; - } - w1 = 0; - } srp = (&screen.rend[row][col]); w2 = DELIMIT_REND (*srp); @@ -2906,24 +3030,33 @@ for (; col != bound.col; col += dirnadd) { stp += dirnadd; + srp += dirnadd; + + if (*stp == NOCHAR) + continue; + if (DELIMIT_TEXT (*stp) != w1) break; - srp += dirnadd; if (DELIMIT_REND (*srp) != w2) break; } + if ((col == bound.col) && (row != bound.row)) { if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) { trow = row + dirnadd; tcol = dirn == UP ? TermWin.ncol - 1 : 0; + if (screen.text[trow] == NULL) break; + stp = & (screen.text[trow][tcol]); srp = & (screen.rend[trow][tcol]); + if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) break; + row = trow; col = tcol; continue; @@ -2931,6 +3064,7 @@ } break; } + Old_Word_Selection_You_Die: D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); @@ -2962,29 +3096,25 @@ MAX_IT (col, 0); MIN_IT (col, (int)TermWin.ncol); -#ifndef NO_NEW_SELECTION /* * If we're selecting characters (single click) then we must check first * if we are at the same place as the original mark. If we are then * select nothing. Otherwise, if we're to the right of the mark, you have to * be _past_ a character for it to be selected. */ - if (selection_style != OLD_SELECT) - { - if (((selection.clicks % 3) == 1) && !flag - && (col == selection.mark.col - && (row == selection.mark.row + TermWin.view_start))) - { - /* select nothing */ - selection.beg.row = selection.end.row = 0; - selection.beg.col = selection.end.col = 0; - selection.clicks = 4; - want_refresh = 1; - D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); - return; - } + if (((selection.clicks % 3) == 1) && !flag + && (col == selection.mark.col + && (row == selection.mark.row + TermWin.view_start))) + { + /* select nothing */ + selection.beg.row = selection.end.row = 0; + selection.beg.col = selection.end.col = 0; + selection.clicks = 4; + want_refresh = 1; + D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); + return; } -#endif + if (selection.clicks == 4) selection.clicks = 1; @@ -3000,9 +3130,9 @@ void rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) { - int16_t ncol = TermWin.ncol; - int end_col; - row_col_t pos; + int16_t ncol = TermWin.ncol; + int end_col; + row_col_t pos; enum { LEFT, RIGHT } closeto = RIGHT; @@ -3048,67 +3178,6 @@ pos.row -= TermWin.view_start; /* adjust for scroll */ -#ifndef NO_OLD_SELECTION - /* - * This mimics some of the selection behaviour of version 2.20 and before. - * There are no ``selection modes'', button3 is always character extension. - * Note: button3 drag is always available, c.f. v2.20 - * Selection always terminates (left or right as appropriate) at the mark. - */ - if (selection_style == OLD_SELECT) - { - if (selection.clicks == 1 || button3) - { - if (hate_those_clicks) - { - hate_those_clicks = 0; - if (selection.clicks == 1) - { - selection.beg.row = selection.mark.row; - selection.beg.col = selection.mark.col; - } - else - { - selection.mark.row = selection.beg.row; - selection.mark.col = selection.beg.col; - } - } - if (ROWCOL_IS_BEFORE (pos, selection.mark)) - { - selection.end.row = selection.mark.row; - selection.end.col = selection.mark.col + 1; - selection.beg.row = pos.row; - selection.beg.col = pos.col; - } - else - { - selection.beg.row = selection.mark.row; - selection.beg.col = selection.mark.col; - selection.end.row = pos.row; - selection.end.col = pos.col + 1; - } - } - else if (selection.clicks == 2) - { - selection_delimit_word (UP, & (selection.mark), - & (selection.beg)); - selection_delimit_word (DN, & (selection.mark), - & (selection.end)); - hate_those_clicks = 1; - } - else if (selection.clicks == 3) - { - selection.beg.row = selection.end.row = selection.mark.row; - selection.beg.col = 0; - selection.end.col = ncol; - hate_those_clicks = 1; - } - D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); - return; - } -#endif /* ! NO_OLD_SELECTION */ -#ifndef NO_NEW_SELECTION - /* selection_style must not be OLD_SELECT to get here */ /* * This is mainly xterm style selection with a couple of differences, mainly * in the way button3 drag extension works. @@ -3123,7 +3192,7 @@ * time of the most recent button3 press */ if (button3 && buttonpress) - { /* button3 press */ + { /* button3 press */ /* * first determine which edge of the selection we are closest to */ @@ -3134,13 +3203,13 @@ < ((selection.end.col - pos.col) + ((selection.end.row - pos.row) * ncol))))) closeto = LEFT; + if (closeto == LEFT) { selection.beg.row = pos.row; selection.beg.col = pos.col; selection.mark.row = selection.end.row; - selection.mark.col = selection.end.col - - (selection.clicks == 2); + selection.mark.col = selection.end.col - (selection.clicks == 2); } else { @@ -3151,18 +3220,18 @@ } } else - { /* button1 drag or button3 drag */ + { /* button1 drag or button3 drag */ if (ROWCOL_IS_AFTER (selection.mark, pos)) { if ((selection.mark.row == selection.end.row) && (selection.mark.col == selection.end.col) && clickchange && selection.clicks == 2) selection.mark.col--; + selection.beg.row = pos.row; selection.beg.col = pos.col; selection.end.row = selection.mark.row; - selection.end.col = selection.mark.col - + (selection.clicks == 2); + selection.end.col = selection.mark.col + (selection.clicks == 2); } else { @@ -3176,6 +3245,7 @@ if (selection.clicks == 1) { end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; + if (end_col != -1 && selection.beg.col > end_col) { #if 1 @@ -3186,37 +3256,35 @@ else selection.beg.col = selection.mark.col; #endif - } + end_col = screen.tlen[selection.end.row + TermWin.saveLines]; + if (end_col != -1 && selection.end.col > end_col) selection.end.col = ncol; - } else if (selection.clicks == 2) { if (ROWCOL_IS_AFTER (selection.end, selection.beg)) selection.end.col--; - selection_delimit_word (UP, & (selection.beg), - & (selection.beg)); - selection_delimit_word (DN, & (selection.end), - & (selection.end)); + + selection_delimit_word (UP, & (selection.beg), & (selection.beg)); + selection_delimit_word (DN, & (selection.end), & (selection.end)); } else if (selection.clicks == 3) { #ifndef NO_FRILLS if ((Options & Opt_tripleclickwords)) { - int end_row; + int end_row; + + selection_delimit_word (UP, & (selection.beg), & (selection.beg)); + end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; - selection_delimit_word (UP, & (selection.beg), - & (selection.beg)); - end_row = screen.tlen[selection.mark.row - + TermWin.saveLines]; - for (end_row = selection.mark.row; end_row < TermWin.nrow; - end_row++) + for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) { end_col = screen.tlen[end_row + TermWin.saveLines]; + if (end_col != -1) { selection.end.row = end_row; @@ -3228,7 +3296,6 @@ } else #endif - { if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) selection.mark.col++; @@ -3236,8 +3303,9 @@ selection.end.col = ncol; } } + if (button3 && buttonpress) - { /* mark may need to be changed */ + { /* mark may need to be changed */ if (closeto == LEFT) { selection.mark.row = selection.end.row; @@ -3251,7 +3319,6 @@ } } D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); -#endif /* ! NO_NEW_SELECTION */ } #ifndef NO_FRILLS @@ -3335,20 +3402,22 @@ if (rq.target == xa[XA_TARGETS]) { - Atom32 target_list[5]; + Atom32 target_list[6]; Atom32 *target = target_list; *target++ = (Atom32) xa[XA_TARGETS]; + *target++ = (Atom32) xa[XA_TIMESTAMP]; *target++ = (Atom32) XA_STRING; *target++ = (Atom32) xa[XA_TEXT]; *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; #if X_HAVE_UTF8_STRING *target++ = (Atom32) xa[XA_UTF8_STRING]; #endif + XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, - (8 * sizeof (target_list[0])), PropModeReplace, - (unsigned char *)target_list, - target - target_list); + (8 * sizeof (target_list[0])), PropModeReplace, + (unsigned char *)target_list, + target - target_list); ev.property = rq.property; } else if (rq.target == xa[XA_MULTIPLE]) @@ -3358,8 +3427,8 @@ else if (rq.target == xa[XA_TIMESTAMP] && selection.text) { XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, - (8 * sizeof (Time)), PropModeReplace, - (unsigned char *)&selection_time, 1); + (8 * sizeof (Time)), PropModeReplace, + (unsigned char *)&selection_time, 1); ev.property = rq.property; } else if (rq.target == XA_STRING @@ -3370,7 +3439,7 @@ { short freect = 0; int selectlen; - char *cl; + wchar_t *cl; target = rq.target; @@ -3379,7 +3448,7 @@ // will ask for another format anyways. style = XStringStyle; else if (target == xa[XA_TEXT]) - style = XTextStyle; + style = XStdICCTextStyle; else if (target == xa[XA_COMPOUND_TEXT]) style = XCompoundTextStyle; #if X_HAVE_UTF8_STRING @@ -3394,16 +3463,18 @@ if (selection.text) { - cl = (char *)selection.text; + cl = selection.text; selectlen = selection.len; } else { - cl = ""; + cl = L""; selectlen = 0; } - if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) + // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it + // manually for XUTF8StringStyle. + if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) freect = 1; else { @@ -3420,6 +3491,7 @@ if (freect) XFree (ct.value); } + XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); } @@ -3453,50 +3525,3 @@ #endif /* ------------------------------------------------------------------------- */ - -/* ------------------------------------------------------------------------- * - * DEBUG ROUTINES * - * ------------------------------------------------------------------------- */ -#if 0 -void -rxvt_debug_colors (void) -{ - int color; - const char *name[] = - { - "fg", "bg", - "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" - }; - - fprintf (stderr, "Color ( "); - if (rstyle & RS_RVid) - fprintf (stderr, "rvid "); - if (rstyle & RS_Bold) - fprintf (stderr, "bold "); - if (rstyle & RS_Blink) - fprintf (stderr, "blink "); - if (rstyle & RS_Uline) - fprintf (stderr, "uline "); - fprintf (stderr, "): "); - - color = GET_FGCOLOR (rstyle); -#ifndef NO_BRIGHTCOLOR - if (color >= minBrightCOLOR && color <= maxBrightCOLOR) - { - color -= (minBrightCOLOR - minCOLOR); - fprintf (stderr, "bright "); - } -#endif - fprintf (stderr, "%s on ", name[color]); - - color = GET_BGCOLOR (rstyle); -#ifndef NO_BRIGHTCOLOR - if (color >= minBrightCOLOR && color <= maxBrightCOLOR) - { - color -= (minBrightCOLOR - minCOLOR); - fprintf (stderr, "bright "); - } -#endif - fprintf (stderr, "%s\n", name[color]); -} -#endif