--- rxvt-unicode/src/screen.C 2004/02/01 20:12:53 1.26 +++ rxvt-unicode/src/screen.C 2004/04/08 20:31:45 1.71 @@ -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) { @@ -73,17 +75,17 @@ /* these must be row_col_t */ #define ROWCOL_IS_AFTER(X, Y) \ - ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) + ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) #define ROWCOL_IS_BEFORE(X, Y) \ - ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) + ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) #define ROWCOL_IN_ROW_AFTER(X, Y) \ - ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) + ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) #define ROWCOL_IN_ROW_BEFORE(X, Y) \ - ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) + ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) #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) + 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) \ - ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) + ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) /* * CLEAR_ROWS : clear rows starting from row @@ -94,21 +96,21 @@ #define CLEAR_ROWS(row, num) \ if (TermWin.mapped) \ - XClearArea (Xdisplay, drawBuffer, TermWin.int_bwidth, \ - Row2Pixel(row), (unsigned int)TermWin.width, \ - (unsigned int)Height2Pixel(num), False) + XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ + Row2Pixel (row), (unsigned int)TermWin.width, \ + (unsigned int)Height2Pixel (num), False) #define CLEAR_CHARS(x, y, num) \ if (TermWin.mapped) \ - XClearArea (Xdisplay, drawBuffer, x, y, \ - (unsigned int)Width2Pixel(num), \ - (unsigned int)Height2Pixel(1), False) + XClearArea (display->display, drawBuffer, x, y, \ + (unsigned int)Width2Pixel (num), \ + (unsigned int)Height2Pixel (1), False) #define ERASE_ROWS(row, num) \ - XFillRectangle (Xdisplay, drawBuffer, TermWin.gc, \ - TermWin.int_bwidth, Row2Pixel(row), \ + XFillRectangle (display->display, drawBuffer, TermWin.gc, \ + TermWin.int_bwidth, Row2Pixel (row), \ (unsigned int)TermWin.width, \ - (unsigned int)Height2Pixel(num)) + (unsigned int)Height2Pixel (num)) /* ------------------------------------------------------------------------- * * SCREEN `COMMON' ROUTINES * @@ -133,7 +135,7 @@ rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) { #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) { @@ -155,7 +157,7 @@ int k; rend_t setrstyle; - D_SCREEN((stderr, "rxvt_scr_reset()")); + D_SCREEN ((stderr, "rxvt_scr_reset ()")); TermWin.view_start = 0; num_scr = 0; @@ -192,18 +194,18 @@ * 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 *)); + 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++) { @@ -214,7 +216,7 @@ scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); } - MEMSET(charsets, 'B', sizeof(charsets)); + MEMSET (charsets, 'B', sizeof (charsets)); TermWin.nscrolled = 0; /* no saved lines */ rstyle = DEFAULT_RSTYLE; screen.flags = Screen_DefaultFlags; @@ -323,12 +325,12 @@ TermWin.nscrolled -= k; } #ifdef DEBUG_STRICT - assert(screen.cur.row < TermWin.nrow); - assert(swap.cur.row < TermWin.nrow); + 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); + 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 } @@ -347,11 +349,11 @@ 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); + 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]), + scr_blank_line (& (screen.text[p][prev_ncol]), + & (screen.rend[p][prev_ncol]), ncol - prev_ncol, setrstyle); } @@ -363,8 +365,8 @@ rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 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]) @@ -372,11 +374,11 @@ 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); + 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); } @@ -390,13 +392,13 @@ } if (tabs) - free(tabs); + free (tabs); } prev_nrow = nrow; prev_ncol = ncol; - tabs = (char *)rxvt_malloc (ncol * sizeof(char)); + tabs = (char *)rxvt_malloc (ncol * sizeof (char)); for (p = 0; p < ncol; p++) tabs[p] = (p % TABSIZE == 0) ? 1 : 0; @@ -405,25 +407,25 @@ } void -rxvt_term::scr_reset_realloc() +rxvt_term::scr_reset_realloc () { uint16_t total_rows, nrow; nrow = TermWin.nrow; total_rows = nrow + TermWin.saveLines; /* *INDENT-OFF* */ - screen.text = (text_t **)rxvt_realloc(screen.text, total_rows * sizeof(text_t *)); - buf_text = (text_t **)rxvt_realloc(buf_text , total_rows * sizeof(text_t *)); - drawn_text = (text_t **)rxvt_realloc(drawn_text , nrow * sizeof(text_t *)); - swap.text = (text_t **)rxvt_realloc(swap.text , nrow * sizeof(text_t *)); - - screen.tlen = (int16_t *)rxvt_realloc(screen.tlen, total_rows * sizeof(int16_t)); - swap.tlen = (int16_t *)rxvt_realloc(swap.tlen , total_rows * sizeof(int16_t)); - - screen.rend = (rend_t **)rxvt_realloc(screen.rend, total_rows * sizeof(rend_t *)); - buf_rend = (rend_t **)rxvt_realloc(buf_rend , total_rows * sizeof(rend_t *)); - drawn_rend = (rend_t **)rxvt_realloc(drawn_rend , nrow * sizeof(rend_t *)); - swap.rend = (rend_t **)rxvt_realloc(swap.rend , nrow * sizeof(rend_t *)); + 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* */ } @@ -432,22 +434,13 @@ * Free everything. That way malloc debugging can find leakage. */ void -rxvt_term::scr_release() +rxvt_term::scr_release () { uint16_t total_rows; int i; total_rows = TermWin.nrow + TermWin.saveLines; -#ifdef DEBUG_STRICT - for (i = 0; i < total_rows; i++) - { - if (screen.text[i]) - /* then so is screen.rend[i] */ - assert(screen.rend[i]); - } -#endif - delete talloc; talloc = 0; delete ralloc; ralloc = 0; @@ -479,7 +472,7 @@ void rxvt_term::scr_poweron () { - D_SCREEN((stderr, "rxvt_scr_poweron()")); + D_SCREEN ((stderr, "rxvt_scr_poweron ()")); scr_release (); prev_nrow = prev_ncol = 0; @@ -487,9 +480,6 @@ scr_clear (); scr_refresh (SLOW_REFRESH); -#ifdef RXVT_GRAPHICS - Gr_reset (); -#endif } /* ------------------------------------------------------------------------- * @@ -503,16 +493,17 @@ void rxvt_term::scr_cursor (int mode) { - screen_t *s; + screen_t *s; - D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); + 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: @@ -522,6 +513,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; @@ -533,15 +525,16 @@ set_font_style (); break; } + /* boundary check in case screen size changed between SAVE and RESTORE */ - MIN_IT(s->cur.row, TermWin.nrow - 1); - MIN_IT(s->cur.col, TermWin.ncol - 1); + MIN_IT (s->cur.row, TermWin.nrow - 1); + MIN_IT (s->cur.col, TermWin.ncol - 1); #ifdef DEBUG_STRICT - assert(s->cur.row >= 0); - assert(s->cur.col >= 0); + assert (s->cur.row >= 0); + assert (s->cur.col >= 0); #else /* drive with your eyes closed */ - MAX_IT(s->cur.row, 0); - MAX_IT(s->cur.col, 0); + MAX_IT (s->cur.row, 0); + MAX_IT (s->cur.col, 0); #endif } @@ -554,70 +547,55 @@ int rxvt_term::scr_change_screen (int scrn) { - int i; + int i; #if NSCREENS - int offset; + int offset; #endif want_refresh = 1; - D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); + D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 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); + 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); + 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; - -# ifdef RXVT_GRAPHICS - - if (Gr_Displayed ()) - { - Gr_scroll (0); - Gr_ChangeScreen (); + SWAP_IT (screen.charset, swap.charset, int16_t); + SWAP_IT (screen.flags, swap.flags, int); + screen.flags |= Screen_VisibleCursor; + swap.flags |= Screen_VisibleCursor; } -# endif -#else -# ifdef SCROLL_ON_NO_SECONDARY -# ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_ClearScreen (); -# endif - if (current_screen == PRIMARY -# ifdef RXVT_GRAPHICS - && !Gr_Displayed () -# endif - ) - scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0); -# endif + else #endif + if (Options & Opt_secondaryScroll) + //if (current_screen == PRIMARY) + scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); return scrn; } @@ -630,9 +608,9 @@ { color &= RS_fgMask; if (fgbg == Color_fg) - rstyle = SET_FGCOLOR(rstyle, color); + rstyle = SET_FGCOLOR (rstyle, color); else - rstyle = SET_BGCOLOR(rstyle, color); + rstyle = SET_BGCOLOR (rstyle, color); } /* ------------------------------------------------------------------------- */ @@ -667,9 +645,10 @@ return 0; want_refresh = 1; - D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); + 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; @@ -720,7 +699,7 @@ count = -count; i = row2 - row1 + 1; - MIN_IT(count, i); + MIN_IT (count, i); if (j > 0) { @@ -774,11 +753,6 @@ (unsigned int)j, rstyle); } -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (count); -#endif - return count; } @@ -787,13 +761,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,8 +775,8 @@ want_refresh = 1; last_col = TermWin.ncol; - D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); - ZERO_SCROLLBACK(); + D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); + ZERO_SCROLLBACK (); if (nlines > 0) { nlines += (screen.cur.row - screen.bscroll); @@ -811,127 +785,186 @@ && (screen.bscroll == (TermWin.nrow - 1))) { /* _at least_ this many lines need to be scrolled */ - scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0); + scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); screen.cur.row -= nlines; } } #ifdef DEBUG_STRICT - assert(screen.cur.col < last_col); - assert((screen.cur.row < TermWin.nrow) - && (screen.cur.row >= -(int32_t)TermWin.nscrolled)); + assert (screen.cur.col < last_col); + assert ((screen.cur.row < TermWin.nrow) + && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); #else /* drive with your eyes closed */ - MIN_IT(screen.cur.col, last_col - 1); - MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); - MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled); + MIN_IT (screen.cur.col, last_col - 1); + MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); + MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); #endif row = screen.cur.row + TermWin.saveLines; - checksel = (selection.op - && current_screen == selection.screen) ? 1 : 0; + 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) - && ROWCOL_IS_BEFORE(screen.cur, selection.end)) + && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) + && ROWCOL_IS_BEFORE (screen.cur, selection.end)) { checksel = 0; clearsel = 1; } + if (screen.flags & Screen_WrapNext) { screen.tlen[row] = -1; if (screen.cur.row == screen.bscroll) - scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0); + 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); + if (c >= 0x5f && c <= 0x7e) + { + c = vt100_0[c - 0x5f]; + width = 1; + } + } - // 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 !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 + rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); - 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; - } + do + { + stp[screen.cur.col] = c; + srp[screen.cur.col] = rend; - c = NOCHAR; - } - while (--width > 0); - else - (void)0; /* handle combining character etc. here. */ + 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 */ - MAX_IT(screen.tlen[row], screen.cur.col); + MAX_IT (screen.tlen[row], screen.cur.col); /* * If we wrote anywhere in the selected area, kill the selection @@ -939,12 +972,12 @@ * should be a similar check. */ if (clearsel) - CLEAR_SELECTION(); + CLEAR_SELECTION (); #ifdef DEBUG_STRICT - assert(screen.cur.row >= 0); + assert (screen.cur.row >= 0); #else /* drive with your eyes closed */ - MAX_IT(screen.cur.row, 0); + MAX_IT (screen.cur.row, 0); #endif } @@ -957,6 +990,7 @@ rxvt_term::scr_backspace () { want_refresh = 1; + if (screen.cur.col == 0) { if (screen.cur.row > 0) @@ -971,6 +1005,7 @@ } else if ((screen.flags & Screen_WrapNext) == 0) scr_gotorc (0, -1, RELATIVE); + screen.flags &= ~Screen_WrapNext; } @@ -983,11 +1018,12 @@ void rxvt_term::scr_tab (int count) { - int i, x; + int i, x; - D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); + D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); want_refresh = 1; i = x = screen.cur.col; + if (count == 0) return; else if (count > 0) @@ -999,6 +1035,7 @@ if (!--count) break; } + if (count) x = TermWin.ncol - 1; } @@ -1011,9 +1048,11 @@ if (!++count) break; } + if (count) x = 0; } + if (x != screen.cur.col) scr_gotorc (0, x, R_RELATIVE); } @@ -1076,18 +1115,13 @@ rxvt_term::scr_gotorc (int row, int col, int relative) { want_refresh = 1; - ZERO_SCROLLBACK(); -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (0); -#endif + ZERO_SCROLLBACK (); - D_SCREEN((stderr, "rxvt_scr_gotorc(r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); - - screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) - : col); - MAX_IT(screen.cur.col, 0); - MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); + D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); + + screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; + MAX_IT (screen.cur.col, 0); + MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); screen.flags &= ~Screen_WrapNext; if (relative & R_RELATIVE) @@ -1114,13 +1148,17 @@ if (screen.flags & Screen_Relative) { /* relative origin mode */ screen.cur.row = row + screen.tscroll; - MIN_IT(screen.cur.row, screen.bscroll); + MIN_IT (screen.cur.row, screen.bscroll); } else screen.cur.row = row; } - MAX_IT(screen.cur.row, 0); - MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); + 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--; } /* ------------------------------------------------------------------------- */ @@ -1130,27 +1168,22 @@ void rxvt_term::scr_index (enum page_dirn direction) { - int dirn; + int dirn; want_refresh = 1; dirn = ((direction == UP) ? 1 : -1); - D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); + D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); - ZERO_SCROLLBACK(); - -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (0); -#endif + ZERO_SCROLLBACK (); screen.flags &= ~Screen_WrapNext; if ((screen.cur.row == screen.bscroll && direction == UP) || (screen.cur.row == screen.tscroll && direction == DN)) - scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); + scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); else screen.cur.row += dirn; - MAX_IT(screen.cur.row, 0); - MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); + MAX_IT (screen.cur.row, 0); + MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); selection_check (0); } @@ -1167,14 +1200,9 @@ unsigned int row, col, num; want_refresh = 1; - D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row)); + D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); ZERO_SCROLLBACK (); -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (0); -#endif - selection_check (1); screen.flags &= ~Screen_WrapNext; @@ -1185,17 +1213,17 @@ case 0: /* erase to end of line */ col = screen.cur.col; num = TermWin.ncol - col; - MIN_IT(screen.tlen[row], (int16_t)col); - if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur) - || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur)) - CLEAR_SELECTION(); + MIN_IT (screen.tlen[row], (int16_t)col); + if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) + || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) + CLEAR_SELECTION (); break; case 1: /* erase to beginning of line */ col = 0; num = screen.cur.col + 1; - if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur) - || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur)) - CLEAR_SELECTION(); + if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) + || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) + CLEAR_SELECTION (); break; case 2: /* erase whole line */ col = 0; @@ -1203,15 +1231,15 @@ screen.tlen[row] = 0; if (selection.beg.row <= screen.cur.row && selection.end.row >= screen.cur.row) - CLEAR_SELECTION(); + CLEAR_SELECTION (); break; default: return; } 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); } @@ -1226,13 +1254,13 @@ void rxvt_term::scr_erase_screen (int mode) { - int num; - int32_t row, row_offset; - rend_t ren; - XGCValues gcvalue; + int num; + int32_t row, 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)); + D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); ZERO_SCROLLBACK (); row_offset = (int32_t)TermWin.saveLines; @@ -1252,44 +1280,47 @@ break; case 2: /* erase whole screen */ selection_check (3); -#ifdef RXVT_GRAPHICS - Gr_ClearScreen (); -#endif row = 0; num = TermWin.nrow; break; default: return; } + refresh_type |= REFRESH_BOUNDS; + if (selection.op && current_screen == selection.screen && ((selection.beg.row >= row && selection.beg.row <= row + num) || (selection.end.row >= row && selection.end.row <= row + num))) CLEAR_SELECTION (); + if (row >= TermWin.nrow) /* Out Of Bounds */ return; - MIN_IT(num, (TermWin.nrow - row)); + + MIN_IT (num, (TermWin.nrow - row)); + if (rstyle & (RS_RVid | RS_Uline)) ren = (rend_t) ~RS_None; - else if (GET_BASEBG(rstyle) == Color_bg) + else if (GET_BASEBG (rstyle) == Color_bg) { ren = DEFAULT_RSTYLE; - CLEAR_ROWS(row, num); + CLEAR_ROWS (row, num); } else { ren = (rstyle & (RS_fgMask | RS_bgMask)); - gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; - XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); - ERASE_ROWS(row, num); + gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; + XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); + ERASE_ROWS (row, num); gcvalue.foreground = PixColors[Color_fg]; - XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); + XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); } + for (; num--; row++) { scr_blank_screen_mem (screen.text, screen.rend, - (unsigned int)(row + row_offset), rstyle); + (unsigned int) (row + row_offset), rstyle); screen.tlen[row + row_offset] = 0; scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); @@ -1309,7 +1340,7 @@ want_refresh = 1; num_scr_allow = 0; - ZERO_SCROLLBACK(); + ZERO_SCROLLBACK (); selection_check (3); fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); @@ -1329,14 +1360,9 @@ void rxvt_term::scr_insdel_lines (int count, int insdel) { - int end; - - ZERO_SCROLLBACK(); + int end; -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (0); -#endif + ZERO_SCROLLBACK (); selection_check (1); @@ -1353,7 +1379,7 @@ } screen.flags &= ~Screen_WrapNext; - scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); + scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); } /* ------------------------------------------------------------------------- */ @@ -1363,32 +1389,28 @@ 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(); - -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (0); -#endif + ZERO_SCROLLBACK (); if (count <= 0) return; selection_check (1); - MIN_IT(count, (TermWin.ncol - screen.cur.col)); + MIN_IT (count, (TermWin.ncol - screen.cur.col)); row = screen.cur.row + TermWin.saveLines; screen.flags &= ~Screen_WrapNext; stp = screen.text[row]; srp = screen.rend[row]; - slp = &(screen.tlen[row]); + slp = & (screen.tlen[row]); + switch (insdel) { case INSERT: @@ -1398,17 +1420,19 @@ stp[col] = stp[col - count]; srp[col] = srp[col - count]; } + if (*slp != -1) { *slp += count; - MIN_IT(*slp, TermWin.ncol); + MIN_IT (*slp, TermWin.ncol); } + if (selection.op && current_screen == selection.screen - && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) + && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) { if (selection.end.row != screen.cur.row || (selection.end.col + count >= TermWin.ncol)) - CLEAR_SELECTION(); + CLEAR_SELECTION (); else { /* shift selection */ selection.beg.col += count; @@ -1416,38 +1440,45 @@ selection.end.col += count; } } - scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), + + 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); screen.cur.col -= count; - scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), + 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]), + + 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); + MAX_IT (*slp, 0); + if (selection.op && current_screen == selection.screen - && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) + && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) { if (selection.end.row != screen.cur.row || (screen.cur.col >= selection.beg.col - count) || selection.end.col >= TermWin.ncol) - CLEAR_SELECTION(); + CLEAR_SELECTION (); else { /* shift selection */ @@ -1456,6 +1487,7 @@ selection.end.col -= count; } } + break; } } @@ -1468,10 +1500,12 @@ void rxvt_term::scr_scroll_region (int top, int bot) { - MAX_IT(top, 0); - MIN_IT(bot, (int)TermWin.nrow - 1); + MAX_IT (top, 0); + MIN_IT (bot, (int)TermWin.nrow - 1); + if (top > bot) return; + screen.tscroll = top; screen.bscroll = bot; scr_gotorc (0, 0, 0); @@ -1487,6 +1521,7 @@ rxvt_term::scr_cursor_visible (int mode) { want_refresh = 1; + if (mode) screen.flags |= Screen_VisibleCursor; else @@ -1505,7 +1540,7 @@ if (mode) screen.flags |= Screen_Autowrap; else - screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); + screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); } /* ------------------------------------------------------------------------- */ @@ -1554,7 +1589,7 @@ rxvt_term::scr_set_tab (int mode) { if (mode < 0) - MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); + MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); else if (screen.cur.col < TermWin.ncol) tabs[screen.cur.col] = (mode ? 1 : 0); } @@ -1573,19 +1608,19 @@ if (rvideo != mode) { rvideo = mode; - SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); + SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); #if defined(XPM_BACKGROUND) if (bgPixmap.pixmap == None) #endif #if defined(TRANSPARENT) - if (!(Options & Opt_transparent) || am_transparent == 0) + if (! (Options & Opt_transparent) || am_transparent == 0) #endif - XSetWindowBackground(Xdisplay, TermWin.vt, + XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); gcvalue.foreground = PixColors[Color_fg]; gcvalue.background = PixColors[Color_bg]; - XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground, + XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, &gcvalue); scr_clear (); scr_touch (true); @@ -1600,7 +1635,7 @@ void rxvt_term::scr_report_position () { - tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); + tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); } /* ------------------------------------------------------------------------- * @@ -1711,30 +1746,30 @@ return; #ifdef DEBUG_STRICT - x = max(x, (int)TermWin.int_bwidth); - x = min(x, (int)TermWin.width); - y = max(y, (int)TermWin.int_bwidth); - y = min(y, (int)TermWin.height); + x = max (x, (int)TermWin.int_bwidth); + x = min (x, (int)TermWin.width); + y = max (y, (int)TermWin.int_bwidth); + y = min (y, (int)TermWin.height); #endif /* round down */ - rc[PART_BEG].col = Pixel2Col(x); - rc[PART_BEG].row = Pixel2Row(y); + rc[PART_BEG].col = Pixel2Col (x); + rc[PART_BEG].row = Pixel2Row (y); /* round up */ - rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); - rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); + rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); + rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); /* sanity checks */ for (i = PART_BEG; i < RC_COUNT; i++) { - MIN_IT(rc[i].col, TermWin.ncol - 1); - MIN_IT(rc[i].row, TermWin.nrow - 1); + MIN_IT (rc[i].col, TermWin.ncol - 1); + MIN_IT (rc[i].row, 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)); + 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, + fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, (rc[PART_END].col - rc[PART_BEG].col + 1)); if (refresh) @@ -1766,11 +1801,11 @@ if (y < len) { p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; - p -= (long)(TermWin.nrow - 1); - p = max(p, 0); + p -= (long) (TermWin.nrow - 1); + p = max (p, 0); } - TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); - D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); + TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); + D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); return scr_changeview (oldviewstart); } @@ -1786,20 +1821,20 @@ int n; uint16_t oldviewstart; - D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); + D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); #ifdef DEBUG_STRICT - assert((nlines >= 0) && (nlines <= TermWin.nrow)); + assert ((nlines >= 0) && (nlines <= TermWin.nrow)); #endif oldviewstart = TermWin.view_start; if (direction == UP) { n = TermWin.view_start + nlines; - TermWin.view_start = min(n, TermWin.nscrolled); + TermWin.view_start = min (n, TermWin.nscrolled); } else { n = TermWin.view_start - nlines; - TermWin.view_start = max(n, 0); + TermWin.view_start = max (n, 0); } return scr_changeview (oldviewstart); } @@ -1810,13 +1845,10 @@ if (TermWin.view_start != oldviewstart) { want_refresh = 1; -#ifdef RXVT_GRAPHICS - if (Gr_Displayed ()) - Gr_scroll (0); -#endif num_scr -= (TermWin.view_start - oldviewstart); } - return (int)(TermWin.view_start - oldviewstart); + + return (int) (TermWin.view_start - oldviewstart); } /* ------------------------------------------------------------------------- */ @@ -1828,7 +1860,7 @@ # ifdef MAPALERT_OPTION if (Options & Opt_mapAlert) # endif - XMapWindow(Xdisplay, TermWin.parent[0]); + XMapWindow (display->display, TermWin.parent[0]); # endif if (Options & Opt_visualBell) { @@ -1836,7 +1868,7 @@ scr_rvideo_mode (!rvideo); /* refresh also done */ } else - XBell(Xdisplay, 0); + XBell (display->display, 0); #endif } @@ -1866,9 +1898,9 @@ { t = screen.text[r1 + row_offset]; for (i = TermWin.ncol - 1; i >= 0; i--) - if (!isspace(t[i])) + if (!isspace (t[i])) break; - fprintf(fd, "%.*s\n", (i + 1), t); + fprintf (fd, "%.*s\n", (i + 1), t); } pclose_printer (fd); #endif @@ -1882,32 +1914,31 @@ */ #define FONT_WIDTH(X, Y) \ - (X)->per_char[(Y) - (X)->min_char_or_byte2].width + (X)->per_char[ (Y) - (X)->min_char_or_byte2].width #define FONT_RBEAR(X, Y) \ - (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing + (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing #define FONT_LBEAR(X, Y) \ - (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing + (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing #define IS_FONT_CHAR(X, Y) \ ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) void rxvt_term::scr_refresh (unsigned char refresh_type) { - unsigned char clearfirst, /* first character writes before cell */ - clearlast, /* last character writes beyond cell */ - must_clear, /* use draw_string not draw_image_string */ - rvid, /* reverse video this position */ - showcursor; /* show the cursor */ - int16_t col, row, /* column/row we're processing */ - ocrow; /* old cursor row */ - int cursorwidth; - int i, /* tmp */ - row_offset; /* basic offset in screen structure */ + unsigned char 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; @@ -1941,28 +1972,22 @@ scr_reverse_selection (); /* - * C: set the cursor character(s) + * 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) { @@ -1973,7 +1998,7 @@ ccol1 = Color_cursor; else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol1 = GET_FGCOLOR(rstyle); + ccol1 = GET_FGCOLOR (rstyle); #else ccol1 = Color_fg; #endif @@ -1981,14 +2006,13 @@ ccol2 = Color_cursor2; else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol2 = GET_BGCOLOR(rstyle); + ccol2 = GET_BGCOLOR (rstyle); #else 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 - } } @@ -2001,9 +2025,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 @@ -2012,6 +2035,7 @@ } else if (!TermWin.focus) setoldcursor = 1; + if (setoldcursor) { if (screen.cur.row + TermWin.view_start >= TermWin.nrow) @@ -2031,13 +2055,13 @@ */ i = num_scr; if (refresh_type == FAST_REFRESH && num_scr_allow && i - && abs(i) < TermWin.nrow && !must_clear) + && 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; @@ -2079,10 +2103,10 @@ { /* also comes here at end if needed because of >= above */ if (wlen < len) - SWAP_IT(wlen, len, int); + SWAP_IT (wlen, len, int); - D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); - XCopyArea (Xdisplay, TermWin.vt, TermWin.vt, + D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); + XCopyArea (display->display, TermWin.vt, TermWin.vt, TermWin.gc, 0, Row2Pixel (len + i), (unsigned int)TermWin_TotalWidth (), (unsigned int)Height2Pixel (wlen - len + 1), @@ -2106,31 +2130,31 @@ /* * E2: OK, now the real pass */ - int ypixel = (int)Row2Pixel(row); + int ypixel = (int)Row2Pixel (row); 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); + int xpixel = Col2Pixel (col); // this loop looks very messy, it can probably be optimized // and cleaned a bit by you? @@ -2180,9 +2204,24 @@ rend = GET_ATTR (rend); rvid = !!(rend & RS_RVid); + +#ifndef NO_BOLD_UNDERLINE_REVERSE + if (rend & RS_Bold && fore == Color_fg) + { + 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); + SWAP_IT (fore, back, int); #ifndef NO_BOLD_UNDERLINE_REVERSE if (ISSET_PIXCOLOR (Color_RV) @@ -2192,10 +2231,10 @@ ) back = Color_RV; #endif - } + #ifdef TEXT_BLINK - if (rend & RS_Blink) + if (rend & RS_Blink && back == Color_bg) { if (!text_blink_ev.active) { @@ -2206,20 +2245,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 @@ -2227,7 +2252,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) @@ -2239,20 +2264,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(Xdisplay, drawBuffer, TermWin.gc, - xpixel, ypixel + font->ascent + 1, - xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); + XDrawLine (display->display, drawBuffer, TermWin.gc, + xpixel, ypixel + font->ascent + 1, + xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); } /* for (col....) */ } /* for (row....) */ @@ -2263,25 +2288,29 @@ { if (TermWin.focus) { - srp = &(screen.rend[screen.cur.row + TermWin.saveLines] + srp = & (screen.rend[screen.cur.row + TermWin.saveLines] [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 (oldcursor.row >= 0) { #ifndef NO_CURSORCOLOR if (ISSET_PIXCOLOR (Color_cursor)) - XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); + XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); #endif - XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, - Col2Pixel(oldcursor.col), - Row2Pixel(oldcursor.row), - (unsigned int)(Width2Pixel(cursorwidth) - 1), - (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); + 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)); } } @@ -2298,66 +2327,92 @@ * clear the whole screen height, note that width == 0 is treated * specially by XClearArea */ - XClearArea(Xdisplay, TermWin.vt, 0, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight(), False); + XClearArea (display->display, TermWin.vt, 0, 0, + (unsigned int)TermWin.int_bwidth, + (unsigned int)TermWin_TotalHeight (), False); + if (clearlast && TermWin.int_bwidth) /* * clear the whole screen height, note that width == 0 is treated * specially by XClearArea */ - XClearArea(Xdisplay, TermWin.vt, - TermWin.width + TermWin.int_bwidth, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight(), False); + XClearArea (display->display, TermWin.vt, + TermWin.width + TermWin.int_bwidth, 0, + (unsigned int)TermWin.int_bwidth, + (unsigned int)TermWin_TotalHeight (), False); + if (refresh_type & SMOOTH_REFRESH) - XSync(Xdisplay, False); + XSync (display->display, False); num_scr = 0; num_scr_allow = 1; want_refresh = 0; /* screen is current */ } +void +rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) +{ + 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)) { int i; - if (!(Options & Opt_transparent_all)) + if (! (Options & Opt_transparent_all)) i = 0; else - i = (int)(sizeof(TermWin.parent) / sizeof(Window)); + i = (int) (sizeof (TermWin.parent) / sizeof (Window)); while (i--) if (TermWin.parent[i] != None) - XClearWindow(Xdisplay, TermWin.parent[i]); + XClearWindow (display->display, TermWin.parent[i]); } #endif - XClearWindow (Xdisplay, 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 @@ -2365,10 +2420,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; @@ -2395,13 +2452,13 @@ : TermWin.ncol; for (towrite = width; towrite; towrite -= wrote) { - wrote = write(fd, &(screen.text[row][width - towrite]), + wrote = write (fd, & (screen.text[row][width - towrite]), towrite); if (wrote < 0) return; /* XXX: death, no report */ } if (screen.tlen[row] >= 0) - if (write(fd, r1, 1) <= 0) + if (write (fd, r1, 1) <= 0) return; /* XXX: death, no report */ } } @@ -2423,25 +2480,25 @@ return; pos.row = pos.col = 0; - if ((selection.beg.row < -(int32_t)TermWin.nscrolled) + if ((selection.beg.row < - (int32_t)TermWin.nscrolled) || (selection.beg.row >= TermWin.nrow) - || (selection.mark.row < -(int32_t)TermWin.nscrolled) + || (selection.mark.row < - (int32_t)TermWin.nscrolled) || (selection.mark.row >= TermWin.nrow) - || (selection.end.row < -(int32_t)TermWin.nscrolled) + || (selection.end.row < - (int32_t)TermWin.nscrolled) || (selection.end.row >= TermWin.nrow) || (check_more == 1 && current_screen == selection.screen - && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) - && ROWCOL_IS_BEFORE(screen.cur, selection.end)) + && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) + && ROWCOL_IS_BEFORE (screen.cur, selection.end)) || (check_more == 2 - && ROWCOL_IS_BEFORE(selection.beg, pos) - && ROWCOL_IS_AFTER(selection.end, pos)) + && ROWCOL_IS_BEFORE (selection.beg, pos) + && ROWCOL_IS_AFTER (selection.end, pos)) || (check_more == 3 - && ROWCOL_IS_AFTER(selection.end, pos)) + && ROWCOL_IS_AFTER (selection.end, pos)) || (check_more == 4 /* screen width change */ && (selection.beg.row != selection.end.row || selection.end.col > TermWin.ncol))) - CLEAR_SELECTION(); + CLEAR_SELECTION (); } /* ------------------------------------------------------------------------- */ @@ -2466,13 +2523,13 @@ 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); } - free(ds); + free (ds); } /* ------------------------------------------------------------------------- */ @@ -2487,7 +2544,7 @@ unsigned long bytes_after; XTextProperty ct; - D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); + D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); if (prop == None) /* check for failed XConvertSelection */ { @@ -2516,36 +2573,38 @@ for (;;) { - if (XGetWindowProperty(Xdisplay, win, prop, (long)(nread / 4), - (long)(PROP_SIZE / 4), delete_prop, - AnyPropertyType, &ct.encoding, &ct.format, - &ct.nitems, &bytes_after, - &ct.value) != Success) + if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), + (long) (PROP_SIZE / 4), delete_prop, + AnyPropertyType, &ct.encoding, &ct.format, + &ct.nitems, &bytes_after, + &ct.value) != Success) break; if (ct.encoding == 0) { - D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); + D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); break; } if (ct.value == NULL) { - D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); + 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 (selection_wait == Sel_normal && nread == 0) + D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); + + 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 - * XConvertSelection() but nothing was presented + * XConvertSelection () but nothing was presented */ - D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); - selection_paste (Xroot, XA_CUT_BUFFER0, False); + D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); + selection_paste (display->root, XA_CUT_BUFFER0, False); } nread = -1; /* discount any previous stuff */ @@ -2556,7 +2615,7 @@ char **cl; int cr; - if (XmbTextPropertyToTextList (Xdisplay, &ct, &cl, + if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) { for (int i = 0; i < cr; i++) @@ -2579,7 +2638,7 @@ if (selection_wait == Sel_normal) selection_wait = Sel_none; - D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); + D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); return (int)nread; } @@ -2588,7 +2647,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"); } /* @@ -2601,27 +2660,29 @@ if (prop == None) return; - D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); + + 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(Xdisplay, win, prop, 0L, 1L, False, + a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, xa[XA_INCR], &atype, &afmt, &nitems, &bytes_after, &s); if (s) - XFree(s); + XFree (s); if (a != Success) return; + #ifndef __CYGWIN32__ if (atype == xa[XA_INCR]) { /* start an INCR transfer */ - D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); - XDeleteProperty(Xdisplay, win, prop); - XFlush(Xdisplay); + D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); + XDeleteProperty (display->display, win, prop); + XFlush (display->display); reget_time = 1; selection_wait = Sel_incr; } @@ -2631,9 +2692,10 @@ 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")); + D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); selection_wait = Sel_none; incr_ev.stop (); } @@ -2641,35 +2703,40 @@ if (reget_time) /* received more data so reget time */ incr_ev.start (NOW + 10); } + /* ------------------------------------------------------------------------- */ /* * Request the current selection: * Order: > internal selection if available * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) * > CUT_BUFFER0 - * (+) if ownership is claimed but property is empty, rxvt_selection_paste() + * (+) if ownership is claimed but property is empty, rxvt_selection_paste () * will auto fallback to CUT_BUFFER0 * EXT: button 2 release */ void rxvt_term::selection_request (Time tm, int x, int y) { - D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, 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 */ - D_SELECT((stderr, "rxvt_selection_request: pasting internal")); - paste (selection.text, selection.len); + if (selection.text) + { /* internal selection */ + D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); + 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 @@ -2684,33 +2751,37 @@ } } - selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ - D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); - selection_paste (Xroot, XA_CUT_BUFFER0, False); + + 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); } 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(Xdisplay, sel) != None) + + if (XGetSelectionOwner (display->display, sel) != None) { - D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); - XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION], - TermWin.vt, selection_request_time); + 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); return 1; } + return 0; } @@ -2722,14 +2793,16 @@ void rxvt_term::selection_clear () { - D_SELECT((stderr, "rxvt_selection_clear()")); + D_SELECT ((stderr, "rxvt_selection_clear ()")); want_refresh = 1; - if (selection.text) - free(selection.text); + free (selection.text); selection.text = NULL; selection.len = 0; - CLEAR_SELECTION(); + CLEAR_SELECTION (); + + if (display->selection_owner == this) + display->selection_owner = 0; } /* ------------------------------------------------------------------------- */ @@ -2740,21 +2813,17 @@ 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)); + D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); switch (selection.op) { case SELECTION_CONT: break; case SELECTION_INIT: - CLEAR_SELECTION(); + CLEAR_SELECTION (); /* FALLTHROUGH */ case SELECTION_BEGIN: selection.op = SELECTION_DONE; @@ -2762,20 +2831,21 @@ 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); + 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) { @@ -2790,71 +2860,70 @@ 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); - - selection.text = new_selection_text; - - XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); - if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt) - rxvt_print_error("can't get primary selection"); + free (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_warn ("can't get primary selection, ignoring.\n"); - { - XTextProperty ct; - char *cl = (char *)selection.text; +#if 0 + XTextProperty ct; - if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0) - { - XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, ct.value, ct.nitems); - XFree (ct.value); - } - else - XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, - PropModeReplace, selection.text, (int)selection.len); - } + if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) + { + XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, + PropModeReplace, ct.value, ct.nitems); + XFree (ct.value); + } +#endif selection_time = tm; - D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); + D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); } /* ------------------------------------------------------------------------- */ @@ -2865,12 +2934,12 @@ void rxvt_term::selection_click (int clicks, int x, int y) { - D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); + D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); clicks = ((clicks - 1) % 3) + 1; selection.clicks = clicks; /* save clicks so extend will work */ - selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); + selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); if (clicks == 2 || clicks == 3) selection_extend_colrow (selection.mark.col, @@ -2890,16 +2959,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); + 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; } @@ -2911,17 +2986,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) { @@ -2935,50 +3010,49 @@ bound.col = TermWin.ncol - 1; dirnadd = 1; } + row = mark->row + TermWin.saveLines; col = mark->col; - MAX_IT(col, 0); + MAX_IT (col, 0); /* find the edge of a word */ - stp = &(screen.text[row][col]); - w1 = DELIMIT_TEXT(*stp); + 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); + 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) + + if (*stp == NOCHAR) + continue; + + if (DELIMIT_TEXT (*stp) != w1) + break; + if (DELIMIT_REND (*srp) != w2) break; } + if ((col == bound.col) && (row != bound.row)) { - if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) + 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) + + 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; @@ -2986,8 +3060,9 @@ } 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)); + D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); if (dirn == DN) col++; /* put us on one past the end */ @@ -3010,36 +3085,32 @@ { int col, row; - col = Pixel2Col(x); - row = Pixel2Row(y); - MAX_IT(row, 0); - MIN_IT(row, (int)TermWin.nrow - 1); - MAX_IT(col, 0); - MIN_IT(col, (int)TermWin.ncol); + col = Pixel2Col (x); + row = Pixel2Row (y); + MAX_IT (row, 0); + MIN_IT (row, (int)TermWin.nrow - 1); + MAX_IT (col, 0); + MIN_IT (col, (int)TermWin.ncol); -#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; @@ -3055,21 +3126,21 @@ 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; - D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); - D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); + D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); + D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); want_refresh = 1; switch (selection.op) { case SELECTION_INIT: - CLEAR_SELECTION(); + CLEAR_SELECTION (); selection.op = SELECTION_BEGIN; /* FALLTHROUGH */ case SELECTION_BEGIN: @@ -3095,7 +3166,7 @@ { selection.beg.col = selection.end.col = selection.mark.col; selection.beg.row = selection.end.row = selection.mark.row; - D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); + D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); } pos.col = col; @@ -3103,67 +3174,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. @@ -3178,24 +3188,24 @@ * 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 */ - if (ROWCOL_IS_BEFORE(pos, selection.beg) - || (!ROWCOL_IS_AFTER(pos, selection.end) + if (ROWCOL_IS_BEFORE (pos, selection.beg) + || (!ROWCOL_IS_AFTER (pos, selection.end) && (((pos.col - selection.beg.col) + ((pos.row - selection.beg.row) * ncol)) < ((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 { @@ -3206,18 +3216,18 @@ } } else - { /* button1 drag or button3 drag */ - if (ROWCOL_IS_AFTER(selection.mark, pos)) + { /* 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 { @@ -3231,6 +3241,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 @@ -3241,37 +3252,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)) + 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]; - for (end_row = selection.mark.row; end_row < TermWin.nrow; - end_row++) + selection_delimit_word (UP, & (selection.beg), & (selection.beg)); + end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; + + for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) { end_col = screen.tlen[end_row + TermWin.saveLines]; + if (end_col != -1) { selection.end.row = end_row; @@ -3283,16 +3292,16 @@ } else #endif - { - if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) + if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) selection.mark.col++; selection.beg.col = 0; 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; @@ -3305,8 +3314,7 @@ selection.mark.col = selection.beg.col; } } - D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); -#endif /* ! NO_NEW_SELECTION */ + 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)); } #ifndef NO_FRILLS @@ -3356,7 +3364,7 @@ rxvt_term::selection_rotate (int x, int y) { selection.clicks = selection.clicks % 3 + 1; - selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); + selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); } /* ------------------------------------------------------------------------- */ @@ -3373,7 +3381,7 @@ * EXT: SelectionRequest */ void -rxvt_term::selection_send (const XSelectionRequestEvent *rq) +rxvt_term::selection_send (const XSelectionRequestEvent &rq) { XSelectionEvent ev; XTextProperty ct; @@ -3382,59 +3390,61 @@ ev.type = SelectionNotify; ev.property = None; - ev.display = rq->display; - ev.requestor = rq->requestor; - ev.selection = rq->selection; - ev.target = rq->target; - ev.time = rq->time; + ev.display = rq.display; + ev.requestor = rq.requestor; + ev.selection = rq.selection; + ev.target = rq.target; + ev.time = rq.time; - if (rq->target == xa[XA_TARGETS]) + 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(Xdisplay, rq->requestor, rq->property, XA_ATOM, - (8 * sizeof(target_list[0])), PropModeReplace, - (unsigned char *)target_list, - target - target_list); - ev.property = rq->property; + + XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, + (8 * sizeof (target_list[0])), PropModeReplace, + (unsigned char *)target_list, + target - target_list); + ev.property = rq.property; } - else if (rq->target == xa[XA_MULTIPLE]) + else if (rq.target == xa[XA_MULTIPLE]) { /* TODO: Handle MULTIPLE */ } - else if (rq->target == xa[XA_TIMESTAMP] && selection.text) + else if (rq.target == xa[XA_TIMESTAMP] && selection.text) { - XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER, - (8 * sizeof(Time)), PropModeReplace, - (unsigned char *)&selection_time, 1); - ev.property = rq->property; - } - else if (rq->target == XA_STRING - || rq->target == xa[XA_TEXT] - || rq->target == xa[XA_COMPOUND_TEXT] - || rq->target == xa[XA_UTF8_STRING] + XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, + (8 * sizeof (Time)), PropModeReplace, + (unsigned char *)&selection_time, 1); + ev.property = rq.property; + } + else if (rq.target == XA_STRING + || rq.target == xa[XA_TEXT] + || rq.target == xa[XA_COMPOUND_TEXT] + || rq.target == xa[XA_UTF8_STRING] ) { short freect = 0; int selectlen; - char *cl; + wchar_t *cl; - target = rq->target; + target = rq.target; if (target == XA_STRING) // we actually don't do XA_STRING, but who cares, as i18n clients // will ask for another format anyways. style = XStringStyle; else if (target == xa[XA_TEXT]) - style = XTextStyle; + style = XStdICCTextStyle; else if (target == xa[XA_COMPOUND_TEXT]) style = XCompoundTextStyle; #if X_HAVE_UTF8_STRING @@ -3449,16 +3459,18 @@ if (selection.text) { - cl = (char *)selection.text; + cl = selection.text; selectlen = selection.len; } else { - cl = ""; + cl = L""; selectlen = 0; } - if (XmbTextListToTextProperty(Xdisplay, &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 { @@ -3467,15 +3479,16 @@ ct.nitems = selectlen; } - XChangeProperty(Xdisplay, rq->requestor, rq->property, - target, 8, PropModeReplace, - ct.value, (int)ct.nitems); - ev.property = rq->property; + XChangeProperty (display->display, rq.requestor, rq.property, + target, 8, PropModeReplace, + ct.value, (int)ct.nitems); + ev.property = rq.property; if (freect) XFree (ct.value); } - XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); + + XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); } /* ------------------------------------------------------------------------- * @@ -3488,20 +3501,20 @@ void rxvt_term::pixel_position (int *x, int *y) { - *x = Pixel2Col(*x); - /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */ - *y = Pixel2Row(*y); - /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */ + *x = Pixel2Col (*x); + /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ + *y = Pixel2Row (*y); + /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ } /* ------------------------------------------------------------------------- */ #ifdef USE_XIM void -rxvt_term::set_position (XPoint *pos) +rxvt_term::im_set_position (XPoint *pos) { XWindowAttributes xwa; - XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); + XGetWindowAttributes (display->display, TermWin.vt, &xwa); pos->x = Col2Pixel (screen.cur.col) + xwa.x; pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; } @@ -3514,7 +3527,7 @@ * ------------------------------------------------------------------------- */ #if 0 void -rxvt_debug_colors(void) +rxvt_debug_colors (void) { int color; const char *name[] = @@ -3523,35 +3536,35 @@ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" }; - fprintf(stderr, "Color ( "); + fprintf (stderr, "Color ( "); if (rstyle & RS_RVid) - fprintf(stderr, "rvid "); + fprintf (stderr, "rvid "); if (rstyle & RS_Bold) - fprintf(stderr, "bold "); + fprintf (stderr, "bold "); if (rstyle & RS_Blink) - fprintf(stderr, "blink "); + fprintf (stderr, "blink "); if (rstyle & RS_Uline) - fprintf(stderr, "uline "); - fprintf(stderr, "): "); + fprintf (stderr, "uline "); + fprintf (stderr, "): "); - color = GET_FGCOLOR(rstyle); + color = GET_FGCOLOR (rstyle); #ifndef NO_BRIGHTCOLOR if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { color -= (minBrightCOLOR - minCOLOR); - fprintf(stderr, "bright "); + fprintf (stderr, "bright "); } #endif - fprintf(stderr, "%s on ", name[color]); + fprintf (stderr, "%s on ", name[color]); - color = GET_BGCOLOR(rstyle); + color = GET_BGCOLOR (rstyle); #ifndef NO_BRIGHTCOLOR if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { color -= (minBrightCOLOR - minCOLOR); - fprintf(stderr, "bright "); + fprintf (stderr, "bright "); } #endif - fprintf(stderr, "%s\n", name[color]); + fprintf (stderr, "%s\n", name[color]); } #endif