--- rxvt-unicode/src/screen.C 2006/01/08 00:07:18 1.214 +++ rxvt-unicode/src/screen.C 2007/12/14 06:30:50 1.291 @@ -1,9 +1,9 @@ -/*--------------------------------*-C-*--------------------------------------* +/*---------------------------------------------------------------------------* * File: screen.C *---------------------------------------------------------------------------* * * Copyright (c) 1997-2001 Geoff Wing - * Copyright (c) 2003-2006 Marc Lehmann + * Copyright (c) 2003-2007 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 @@ -28,13 +28,11 @@ #include "rxvt.h" /* NECESSARY */ #include "rxvtperl.h" /* NECESSARY */ -#include /* get the typedef for CARD32 */ - #include #include "salloc.C" // HACK, should be a seperate compile! -inline void fill_text (text_t *start, text_t value, int len) +static inline void fill_text (text_t *start, text_t value, int len) { while (len--) *start++ = value; @@ -49,7 +47,7 @@ * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * * ------------------------------------------------------------------------- */ #define ZERO_SCROLLBACK() \ - if (OPTION (Opt_scrollTtyOutput)) \ + if (option (Opt_scrollTtyOutput)) \ view_start = 0 #define CLEAR_SELECTION() \ selection.beg.row = selection.beg.col \ @@ -95,18 +93,18 @@ #define CLEAR_ROWS(row, num) \ if (mapped) \ - XClearArea (display->display, drawBuffer, 0, \ + XClearArea (dpy, drawBuffer, 0, \ Row2Pixel (row), (unsigned int)width, \ (unsigned int)Height2Pixel (num), False) #define CLEAR_CHARS(x, y, num) \ if (mapped) \ - XClearArea (display->display, drawBuffer, x, y, \ + XClearArea (dpy, drawBuffer, x, y, \ (unsigned int)Width2Pixel (num), \ (unsigned int)Height2Pixel (1), False) #define ERASE_ROWS(row, num) \ - XFillRectangle (display->display, drawBuffer, gc, \ + XFillRectangle (dpy, drawBuffer, gc, \ 0, Row2Pixel (row), \ (unsigned int)width, \ (unsigned int)Height2Pixel (num)) @@ -117,7 +115,7 @@ /* Fill part/all of a line with blanks. */ void -rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) +rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW { if (!l.t) { @@ -128,7 +126,7 @@ l.touch (); - efs &= ~RS_baseattrMask; + efs &= ~RS_baseattrMask; // remove italic etc. fontstyles efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); text_t *et = l.t + col; @@ -144,9 +142,12 @@ /* ------------------------------------------------------------------------- */ /* Fill a full line with blanks - make sure it is allocated first */ void -rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) +rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW { scr_blank_line (l, 0, ncol, efs); + + l.l = 0; + l.f = 0; } /* ------------------------------------------------------------------------- * @@ -160,6 +161,7 @@ scr_overlay_off (); #endif + rvideo_mode = false; view_start = 0; num_scr = 0; @@ -172,13 +174,16 @@ if (ncol == prev_ncol && nrow == prev_nrow) return; + if (current_screen != PRIMARY) + scr_swap_screen (); + // we need at least two lines for wrapping to work correctly - if (nrow + saveLines < 2) + while (nrow + saveLines < 2) { //TODO//FIXME saveLines++; prev_nrow--; - nsaved++; + top_row--; } want_refresh = 1; @@ -193,18 +198,16 @@ { /* * 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 */ - nsaved = 0; /* no saved lines */ + top_row = 0; term_start = 0; talloc = new rxvt_salloc (ncol * sizeof (text_t)); ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); - temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); - drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); - swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); + row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); + drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); + swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); for (int row = nrow; row--; ) { @@ -235,8 +238,6 @@ selection.op = SELECTION_CLEAR; selection.screen = PRIMARY; selection.clicks = 0; - CLEAR_ALL_SELECTION (); - rvideo = 0; } else { @@ -259,7 +260,6 @@ #endif drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); - temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); for (int row = min (nrow, prev_nrow); row--; ) @@ -274,15 +274,16 @@ drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); } - line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); - + line_t *old_buf = row_buf; + row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); + int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row - int pend = MOD (term_start - nsaved , prev_total_rows); + int pend = MOD (term_start + top_row , prev_total_rows); int q = total_rows; // rewrapped row - if (nsaved) + if (top_row) { - // re-wrap lines, this is rather ugly, possibly because I am too dumb + // Re-wrap lines. This is rather ugly, possibly because I am too dumb // to come up with a lean and mean algorithm. row_col_t ocur = screen.cur; @@ -326,6 +327,10 @@ int qcol = 0; + // see below for cursor adjustment rationale + if (p == ocur.row) + screen.cur.row = q - (total_rows - nrow); + // fill a single destination line while (lofs < llen && qcol < ncol) { @@ -345,9 +350,6 @@ int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); - assert (len); - assert (pline.t); - memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); @@ -363,16 +365,16 @@ while (p != pend && q > 0); term_start = total_rows - nrow; - nsaved = term_start - q; - + top_row = q - term_start; + // make sure all terminal lines exist - while (nsaved < 0) - scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); + while (top_row > 0) + scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); } else { // if no scrollback exists (yet), wing, instead of wrap - + for (int row = min (nrow, prev_nrow); row--; ) { line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; @@ -390,11 +392,6 @@ term_start = 0; } -#ifdef DEBUG_STRICT //TODO: remove - for (int i = -nsaved; i < nrow; i++) - assert (ROW (i).t); -#endif - free (old_buf); delete old_ta; delete old_ra; @@ -402,18 +399,22 @@ clamp_it (screen.cur.row, 0, nrow - 1); clamp_it (screen.cur.col, 0, ncol - 1); - if (tabs) - free (tabs); + free (tabs); } + CLEAR_ALL_SELECTION (); + prev_nrow = nrow; prev_ncol = ncol; - tabs = (char *)rxvt_malloc (ncol * sizeof (char)); + tabs = (char *)rxvt_malloc (ncol); - for (int col = ncol; col--; ) + for (int col = ncol; --col; ) tabs [col] = col % TABSIZE == 0; + if (current_screen != PRIMARY) + scr_swap_screen (); + tt_winch (); HOOK_INVOKE ((this, HOOK_RESET, DT_END)); @@ -424,18 +425,20 @@ * Free everything. That way malloc debugging can find leakage. */ void -rxvt_term::scr_release () +rxvt_term::scr_release () NOTHROW { - delete talloc; talloc = 0; - delete ralloc; ralloc = 0; + if (row_buf) + { + delete talloc; talloc = 0; + delete ralloc; ralloc = 0; - free (row_buf); - free (swap_buf); - free (drawn_buf); - free (temp_buf); - free (tabs); + free (row_buf); + free (swap_buf); + free (drawn_buf); + free (tabs); - row_buf = 0; // signal that we freed all the arrays + row_buf = 0; // signal that we freed all the arrays + } } /* ------------------------------------------------------------------------- */ @@ -450,7 +453,7 @@ scr_reset (); scr_clear (true); - scr_refresh (SLOW_REFRESH); + scr_refresh (); } /* ------------------------------------------------------------------------- * @@ -462,7 +465,7 @@ * XTERM_SEQ: Restore cursor: ESC 8 */ void -rxvt_term::scr_cursor (int mode) +rxvt_term::scr_cursor (cursor_mode mode) NOTHROW { screen_t *s; @@ -504,55 +507,61 @@ #endif } +void +rxvt_term::scr_swap_screen () +{ + if (!option (Opt_secondaryScreen)) + return; + + for (int i = prev_nrow; i--; ) + ::swap (ROW(i), swap_buf [i]); + + ::swap (screen.cur, swap.cur); + + screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); + screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); +} + /* ------------------------------------------------------------------------- */ /* * Swap between primary and secondary screens * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l */ -int +void rxvt_term::scr_change_screen (int scrn) { + if (scrn == current_screen) + return; + want_refresh = 1; view_start = 0; - if (current_screen == scrn) - return scrn; - selection_check (2); /* check for boundary cross */ int i = current_screen; current_screen = scrn; scrn = i; - ::swap (screen.cur.row, swap.cur.row); - ::swap (screen.cur.col, swap.cur.col); - - screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); - screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); - #if NSCREENS - if (OPTION (Opt_secondaryScreen)) + if (option (Opt_secondaryScreen)) { num_scr = 0; - for (int i = prev_nrow; i--; ) - ::swap (ROW(i), swap_buf [i]); + scr_swap_screen (); ::swap (screen.charset, swap.charset); - ::swap (screen.flags, swap.flags); + ::swap (screen.flags, swap.flags); screen.flags |= Screen_VisibleCursor; - swap.flags |= Screen_VisibleCursor; + swap.flags |= Screen_VisibleCursor; } else #endif - if (OPTION (Opt_secondaryScroll)) + if (option (Opt_secondaryScroll)) scr_scroll_text (0, prev_nrow - 1, prev_nrow); - - return scrn; } // clear WrapNext indicator, solidifying position on next line void -rxvt_term::scr_do_wrap () +rxvt_term::scr_do_wrap () NOTHROW { if (!(screen.flags & Screen_WrapNext)) return; @@ -572,9 +581,9 @@ * Change the colour for following text */ void -rxvt_term::scr_color (unsigned int color, int fgbg) +rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW { - if (color > maxTermCOLOR) + if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) color = fgbg; if (fgbg == Color_fg) @@ -588,15 +597,15 @@ * Change the rendition style for following text */ void -rxvt_term::scr_rendition (int set, int style) - { - if (set) - rstyle |= style; - else if (style == ~RS_None) - rstyle = DEFAULT_RSTYLE; - else - rstyle &= ~style; - } +rxvt_term::scr_rendition (int set, int style) NOTHROW +{ + if (set) + rstyle |= style; + else if (style == ~RS_None) + rstyle = DEFAULT_RSTYLE; + else + rstyle &= ~style; +} /* ------------------------------------------------------------------------- */ /* @@ -605,7 +614,7 @@ * count negative ==> scroll down */ int -rxvt_term::scr_scroll_text (int row1, int row2, int count) +rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW { if (count == 0 || (row1 > row2)) return 0; @@ -615,40 +624,73 @@ if (count > 0 && row1 == 0 - && row2 == nrow - 1 - && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) + && (current_screen == PRIMARY || option (Opt_secondaryScroll))) { - nsaved = min (nsaved + count, saveLines); + top_row = max (top_row - count, -saveLines); - HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); - + // scroll everything up 'count' lines term_start = (term_start + count) % total_rows; + // sever bottommost line + { + line_t &l = ROW(row2 - count); + l.is_longer (0); + l.touch (); + } + + // erase newly scrolled-in lines + for (int i = count; i--; ) + { + line_t &l = ROW(nrow - 1 - i); + + // optimize if already cleared, can be significant on slow machines + // could be rolled into scr_blank_screen_mem + if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) + { + scr_blank_line (l, 0, l.l, rstyle); + l.l = 0; + l.f = 0; + } + else + scr_blank_screen_mem (l, rstyle); + } + + // now copy lines below the scroll region bottom to the + // bottom of the screen again, so they look as if they + // hadn't moved. + for (int i = nrow; --i > row2; ) + { + line_t &l1 = ROW(i - count); + line_t &l2 = ROW(i); + + ::swap (l1, l2); + l2.touch (); + } + + // move and/or clear selection, if any if (selection.op && current_screen == selection.screen) { selection.beg.row -= count; selection.end.row -= count; selection.mark.row -= count; - if (selection.beg.row < -nsaved - || selection.end.row < -nsaved - || selection.mark.row < -nsaved) + if (selection.beg.row < top_row + || selection.end.row < top_row + || selection.mark.row < top_row) { CLEAR_ALL_SELECTION (); selection.op = SELECTION_CLEAR; } } - for (int i = count; i--; ) - { - ROW(row2 - i).l = 0; - scr_blank_screen_mem (ROW(row2 - i), rstyle); - } - - if (OPTION (Opt_scrollWithBuffer) + // finally move the view window, if desired + if (option (Opt_scrollWithBuffer) && view_start != 0 - && view_start != saveLines) + && view_start != -saveLines) scr_page (UP, count); + + if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) + HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); } else { @@ -670,7 +712,7 @@ selection.beg.row -= count; selection.end.row -= count; selection.mark.row -= count; - + selection_check (0); } } @@ -682,6 +724,8 @@ min_it (count, rows); + line_t *temp_buf = row_buf + total_rows; + for (int row = 0; row < rows; row++) { temp_buf [row] = ROW(row1 + (row + count + rows) % rows); @@ -702,7 +746,7 @@ * Add text given in of length to screen struct */ void -rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) +rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW { if (len <= 0) /* sanity */ return; @@ -718,6 +762,7 @@ if (minlines > 0) { minlines += screen.cur.row - screen.bscroll; + min_it (minlines, screen.cur.row - top_row); if (minlines > 0 && screen.tscroll == 0 @@ -732,7 +777,7 @@ #ifdef DEBUG_STRICT assert (screen.cur.col < ncol); assert (screen.cur.row < nrow - && screen.cur.row >= -nsaved); + && screen.cur.row >= top_row); #endif int row = screen.cur.row; @@ -788,11 +833,11 @@ if (screen.flags & Screen_WrapNext) { - max_it (line->l, ncol); + scr_do_wrap (); + + line->l = ncol; line->is_longer (1); - scr_do_wrap (); - row = screen.cur.row; line = &ROW(row); /* _must_ refresh */ } @@ -801,11 +846,11 @@ if (IN_RANGE_INC (c, 0xd800, 0xdfff)) c = 0xfffd; - // rely on wcwidth to tell us the character width, at least for non-latin1 - // do wcwidth before further replacements, as wcwidth might return -1 - // for the line drawing characters below as they might be invalid in the current + // rely on wcwidth to tell us the character width, do wcwidth before + // further replacements, as wcwidth might return -1 for the line + // drawing characters below as they might be invalid in the current // locale. - int width = c < 0x100 ? 1 : wcwidth (c); + int width = WCWIDTH (c); if (charsets [screen.charset] == '0') // DEC SPECIAL { @@ -966,7 +1011,7 @@ * XTERM_SEQ: CTRL-H */ void -rxvt_term::scr_backspace () +rxvt_term::scr_backspace () NOTHROW { want_refresh = 1; @@ -994,7 +1039,7 @@ * XTERM_SEQ: CTRL-I */ void -rxvt_term::scr_tab (int count, bool ht) +rxvt_term::scr_tab (int count, bool ht) NOTHROW { int i, x; @@ -1017,7 +1062,7 @@ if (!--count) break; } - else + else ht &= l.t[i] == ' ' && RS_SAME (l.r[i], base_rend); @@ -1026,7 +1071,7 @@ // store horizontal tab commands as characters inside the text // buffer so they can be selected and pasted. - if (ht && OPTION (Opt_pastableTabs)) + if (ht && option (Opt_pastableTabs)) { base_rend = SET_FONT (base_rend, 0); @@ -1069,9 +1114,9 @@ * Move cursor left in row. If we're at the left boundary, shift everything * in that row right. Clear left column. */ -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void -rxvt_term::scr_backindex () +rxvt_term::scr_backindex () NOTHROW { if (screen.cur.col > 0) scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); @@ -1086,9 +1131,9 @@ * Move cursor right in row. If we're at the right boundary, shift everything * in that row left. Clear right column. */ -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void -rxvt_term::scr_forwardindex () +rxvt_term::scr_forwardindex () NOTHROW { if (screen.cur.col < ncol - 1) scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); @@ -1111,7 +1156,7 @@ * Goto Row/Column */ void -rxvt_term::scr_gotorc (int row, int col, int relative) +rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW { want_refresh = 1; ZERO_SCROLLBACK (); @@ -1143,7 +1188,8 @@ else { if (screen.flags & Screen_Relative) - { /* relative origin mode */ + { + /* relative origin mode */ screen.cur.row = row + screen.tscroll; min_it (screen.cur.row, screen.bscroll); } @@ -1159,7 +1205,7 @@ * direction should be UP or DN */ void -rxvt_term::scr_index (enum page_dirn direction) +rxvt_term::scr_index (enum page_dirn direction) NOTHROW { int dirn; @@ -1188,7 +1234,7 @@ * XTERM_SEQ: Clear whole line : ESC [ 2 K */ void -rxvt_term::scr_erase_line (int mode) +rxvt_term::scr_erase_line (int mode) NOTHROW { unsigned int col, num; @@ -1242,7 +1288,7 @@ * XTERM_SEQ: Clear whole screen : ESC [ 2 J */ void -rxvt_term::scr_erase_screen (int mode) +rxvt_term::scr_erase_screen (int mode) NOTHROW { int num; int32_t row; @@ -1297,30 +1343,27 @@ { ren = rstyle & (RS_fgMask | RS_bgMask); gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; - XChangeGC (display->display, gc, GCForeground, &gcvalue); + XChangeGC (dpy, gc, GCForeground, &gcvalue); ERASE_ROWS (row, num); gcvalue.foreground = pix_colors[Color_fg]; - XChangeGC (display->display, gc, GCForeground, &gcvalue); + XChangeGC (dpy, gc, GCForeground, &gcvalue); } for (; num--; row++) { - line_t &l = ROW(row); - l.l = 0; - l.is_longer (0); - scr_blank_screen_mem (l, rstyle); + scr_blank_screen_mem (ROW(row), rstyle); scr_blank_line (drawn_buf [row], 0, ncol, ren); } } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void -rxvt_term::scr_erase_savelines () +rxvt_term::scr_erase_savelines () NOTHROW { want_refresh = 1; ZERO_SCROLLBACK (); - nsaved = 0; + top_row = 0; } #endif @@ -1330,7 +1373,7 @@ * XTERM_SEQ: Screen Alignment Test: ESC # 8 */ void -rxvt_term::scr_E () +rxvt_term::scr_E () NOTHROW { rend_t fs; @@ -1361,7 +1404,7 @@ * Insert/Delete lines */ void -rxvt_term::scr_insdel_lines (int count, int insdel) +rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW { int end; @@ -1391,7 +1434,7 @@ * Insert/Delete characters from the current position */ void -rxvt_term::scr_insdel_chars (int count, int insdel) +rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW { int col, row; rend_t tr; @@ -1432,7 +1475,8 @@ || (selection.end.col + count >= ncol)) CLEAR_SELECTION (); else - { /* shift selection */ + { + /* shift selection */ selection.beg.col += count; selection.mark.col += count; /* XXX: yes? */ selection.end.col += count; @@ -1489,7 +1533,7 @@ * XTERM_SEQ: Set region - inclusive: ESC [ ; r */ void -rxvt_term::scr_scroll_region (int top, int bot) +rxvt_term::scr_scroll_region (int top, int bot) NOTHROW { max_it (top, 0); min_it (bot, nrow - 1); @@ -1509,7 +1553,7 @@ * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l */ void -rxvt_term::scr_cursor_visible (int mode) +rxvt_term::scr_cursor_visible (int mode) NOTHROW { want_refresh = 1; @@ -1526,7 +1570,7 @@ * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l */ void -rxvt_term::scr_autowrap (int mode) +rxvt_term::scr_autowrap (int mode) NOTHROW { if (mode) screen.flags |= Screen_Autowrap; @@ -1545,7 +1589,7 @@ * XTERM_SEQ: Set Relative: ESC [ ? 6 l */ void -rxvt_term::scr_relative_origin (int mode) +rxvt_term::scr_relative_origin (int mode) NOTHROW { if (mode) screen.flags |= Screen_Relative; @@ -1562,7 +1606,7 @@ * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l */ void -rxvt_term::scr_insert_mode (int mode) +rxvt_term::scr_insert_mode (int mode) NOTHROW { if (mode) screen.flags |= Screen_Insert; @@ -1578,10 +1622,10 @@ * XTERM_SEQ: Clear all tabs : ESC [ 3 g */ void -rxvt_term::scr_set_tab (int mode) +rxvt_term::scr_set_tab (int mode) NOTHROW { if (mode < 0) - memset (tabs, 0, ncol * sizeof (char)); + memset (tabs, 0, ncol); else if (screen.cur.col < ncol) tabs [screen.cur.col] = !!mode; } @@ -1593,27 +1637,29 @@ * XTERM_SEQ: Normal video : ESC [ ? 5 l */ void -rxvt_term::scr_rvideo_mode (int mode) +rxvt_term::scr_rvideo_mode (bool on) NOTHROW { - XGCValues gcvalue; + rvideo_mode = on; - if (rvideo != mode) +#ifndef NO_BELL + on ^= rvideo_bell; +#endif + + if (rvideo_state != on) { - rvideo = mode; + rvideo_state = on; + ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); -#if XPM_BACKGROUND +#ifdef HAVE_BG_PIXMAP if (bgPixmap.pixmap == None) #endif -#if TRANSPARENT - if (! OPTION (Opt_transparent) || am_transparent == 0) -#endif - XSetWindowBackground (display->display, vt, - pix_colors[Color_bg]); + XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); + XGCValues gcvalue; gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; - XChangeGC (display->display, gc, GCBackground | GCForeground, - &gcvalue); + XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); + scr_clear (); scr_touch (true); } @@ -1625,7 +1671,7 @@ * XTERM_SEQ: Report position: ESC [ 6 n */ void -rxvt_term::scr_report_position () +rxvt_term::scr_report_position () NOTHROW { tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); } @@ -1638,7 +1684,7 @@ * Set font style */ void -rxvt_term::set_font_style () +rxvt_term::set_font_style () NOTHROW { #if 0 switch (charsets [screen.charset]) @@ -1670,7 +1716,7 @@ * XTERM_SEQ: Invoke G3 character set: ESC O */ void -rxvt_term::scr_charset_choose (int set) +rxvt_term::scr_charset_choose (int set) NOTHROW { screen.charset = set; set_font_style (); @@ -1686,7 +1732,7 @@ * See set_font_style for possible values for */ void -rxvt_term::scr_charset_set (int set, unsigned int ch) +rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW { charsets[set] = (unsigned char)ch; set_font_style (); @@ -1701,16 +1747,15 @@ * refresh matching text. */ bool -rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) +rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW { bool found = false; for (int i = 0; i < nrow; i++) { - int col = 0; rend_t *drp = drawn_buf[i].r; - for (; col < ncol; col++, drp++) + for (int col = 0; col < ncol; col++, drp++) if ((*drp & mask) == value) { found = true; @@ -1731,7 +1776,7 @@ }; void -rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) +rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW { int i; row_col_t rc[RC_COUNT]; @@ -1760,12 +1805,14 @@ min_it (rc[i].col, ncol - 1); min_it (rc[i].row, nrow - 1); } - +// TODO: this line somehow causes segfault if scr_expose() is called just after resize for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); + num_scr_allow = 0; + if (refresh) - scr_refresh (SLOW_REFRESH); + scr_refresh (); } /* ------------------------------------------------------------------------- */ @@ -1773,7 +1820,7 @@ * Refresh the entire screen */ void -rxvt_term::scr_touch (bool refresh) +rxvt_term::scr_touch (bool refresh) NOTHROW { scr_expose (0, 0, width, height, refresh); } @@ -1783,24 +1830,10 @@ * Move the display so that the line represented by scrollbar value Y is at * the top of the screen */ -int -rxvt_term::scr_move_to (int y, int len) +void +rxvt_term::scr_move_to (int y, int len) NOTHROW { - long p = 0; - unsigned int oldviewstart; - - oldviewstart = view_start; - - if (y < len) - { - p = (nrow + nsaved) * (len - y) / len; - p -= (long) (nrow - 1); - p = max (p, 0); - } - - view_start = (unsigned int)min (p, nsaved); - - return scr_changeview (oldviewstart); + scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); } /* ------------------------------------------------------------------------- */ @@ -1808,71 +1841,84 @@ * Page the screen up/down nlines * direction should be UP or DN */ -int -rxvt_term::scr_page (enum page_dirn direction, int nlines) +bool +rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW { - int n; - unsigned int oldviewstart; + int new_view_start = + direction == UP ? view_start - nlines + : view_start + nlines; - oldviewstart = view_start; - - if (direction == UP) - { - n = view_start + nlines; - view_start = min (n, nsaved); - } - else - { - n = view_start - nlines; - view_start = max (n, 0); - } - - return scr_changeview (oldviewstart); + return scr_changeview (new_view_start); } -int -rxvt_term::scr_changeview (unsigned int oldviewstart) +bool +rxvt_term::scr_changeview (int new_view_start) NOTHROW { - if (view_start != oldviewstart) - { - HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); + clamp_it (new_view_start, top_row, 0); - want_refresh = 1; - num_scr -= (view_start - oldviewstart); - } + if (new_view_start == view_start) + return false; + + num_scr += new_view_start - view_start; + view_start = new_view_start; + want_refresh = 1; - return (int)view_start - (int)oldviewstart; + HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); + + return true; } +#ifndef NO_BELL +void +rxvt_term::bell_cb (ev::timer &w, int revents) +{ + rvideo_bell = false; + scr_rvideo_mode (rvideo_mode); + refresh_check (); +} +#endif + /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_bell () +rxvt_term::scr_bell () NOTHROW { #ifndef NO_BELL # ifndef NO_MAPALERT # ifdef MAPALERT_OPTION - if (OPTION (Opt_mapAlert)) + if (option (Opt_mapAlert)) # endif - XMapWindow (display->display, parent[0]); + XMapWindow (dpy, parent[0]); # endif - if (OPTION (Opt_visualBell)) +# if ENABLE_FRILLS + if (option (Opt_urgentOnBell)) { - scr_rvideo_mode (!rvideo); /* refresh also done */ - rxvt_usleep (VISUAL_BELL_DURATION); - scr_rvideo_mode (!rvideo); /* refresh also done */ + if (XWMHints *h = XGetWMHints(dpy, parent[0])) + { + h->flags |= XUrgencyHint; + XSetWMHints (dpy, parent[0], h); + } } - else - XBell (display->display, 0); +# endif + if (option (Opt_visualBell)) + { + rvideo_bell = true; + scr_rvideo_mode (rvideo_mode); + flush (); + + bell_ev.start (VISUAL_BELL_DURATION); + } + else + XBell (dpy, 0); #endif } /* ------------------------------------------------------------------------- */ /* ARGSUSED */ void -rxvt_term::scr_printscreen (int fullhist) +rxvt_term::scr_printscreen (int fullhist) NOTHROW { #ifdef PRINTPIPE int nrows, row_start; @@ -1883,13 +1929,13 @@ if (fullhist) { - nrows = nrow + nsaved; - row_start = -nsaved; + nrows = nrow - top_row; + row_start = top_row; } else { nrows = nrow; - row_start = -view_start; + row_start = view_start; } wctomb (0, 0); @@ -1931,9 +1977,9 @@ * screen.text/screen.rend contain what the screen will change to. */ void -rxvt_term::scr_refresh (unsigned char refresh_type) +rxvt_term::scr_refresh () NOTHROW { - unsigned char must_clear, /* use draw_string not draw_image_string */ + unsigned char have_bg, showcursor; /* show the cursor */ int16_t col, row, /* column/row we're processing */ ocrow; /* old cursor row */ @@ -1942,6 +1988,8 @@ rend_t cc1; /* store colours at cursor position (s) */ #endif rend_t *crp; // cursor rendition pointer + rend_t ccol1, /* Cursor colour */ + ccol2; /* Cursor colour2 */ want_refresh = 0; /* screen is current */ @@ -1951,14 +1999,11 @@ /* * A: set up vars */ - must_clear = 0; + have_bg = 0; refresh_count = 0; -#if XPM_BACKGROUND - must_clear |= bgPixmap.pixmap != None; -#endif -#if TRANSPARENT - must_clear |= OPTION (Opt_transparent) && am_transparent; +#ifdef HAVE_BG_PIXMAP + have_bg |= bgPixmap.pixmap != None; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -1972,8 +2017,6 @@ */ { unsigned char setoldcursor; - rend_t ccol1, /* Cursor colour */ - ccol2; /* Cursor colour2 */ showcursor = (screen.flags & Screen_VisibleCursor); #ifdef CURSOR_BLINK @@ -1990,35 +2033,38 @@ crp = &ROW(screen.cur.row).r[col]; - if (showcursor && focus) - { - if (OPTION (Opt_cursorUnderline)) - *crp ^= RS_Uline; - else - { - *crp ^= RS_RVid; - #ifndef NO_CURSORCOLOR - cc1 = *crp & (RS_fgMask | RS_bgMask); - if (ISSET_PIXCOLOR (Color_cursor)) - ccol1 = Color_cursor; - else + cc1 = *crp & (RS_fgMask | RS_bgMask); + if (ISSET_PIXCOLOR (Color_cursor)) + ccol1 = Color_cursor; + else +#endif #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol1 = fgcolor_of (rstyle); + ccol1 = fgcolor_of (rstyle); #else - ccol1 = Color_fg; + ccol1 = Color_fg; +#endif + +#ifndef NO_CURSORCOLOR + if (ISSET_PIXCOLOR (Color_cursor2)) + ccol2 = Color_cursor2; + else #endif - if (ISSET_PIXCOLOR (Color_cursor2)) - ccol2 = Color_cursor2; - else #ifdef CURSOR_COLOR_IS_RENDITION_COLOR - ccol2 = bgcolor_of (rstyle); + ccol2 = bgcolor_of (rstyle); #else - ccol2 = Color_bg; + ccol2 = Color_bg; #endif + + if (showcursor && focus) + { + if (option (Opt_cursorUnderline)) + *crp ^= RS_Uline; + else + { + *crp ^= RS_RVid; *crp = SET_FGCOLOR (*crp, ccol1); *crp = SET_BGCOLOR (*crp, ccol2); -#endif } } } @@ -2027,7 +2073,7 @@ setoldcursor = 0; if (ocrow != -1) { - if (screen.cur.row + view_start != ocrow + if (screen.cur.row - view_start != ocrow || screen.cur.col != oldcursor.col) { if (ocrow < nrow @@ -2045,11 +2091,11 @@ if (setoldcursor) { - if (screen.cur.row + view_start >= nrow) + if (screen.cur.row - view_start >= nrow) oldcursor.row = -1; else { - oldcursor.row = screen.cur.row + view_start; + oldcursor.row = screen.cur.row - view_start; oldcursor.col = screen.cur.col; } } @@ -2065,23 +2111,25 @@ * D: CopyArea pass - very useful for slower links * This has been deliberately kept simple. */ - i = num_scr; if (!display->is_local && refresh_type == FAST_REFRESH && num_scr_allow && num_scr - && abs (num_scr) < nrow && !must_clear) + && abs (num_scr) < nrow && !have_bg) { int16_t nits; + int i = num_scr; int j; int len, wlen; + dLocal (int, num_scr); j = nrow; wlen = len = -1; row = i > 0 ? 0 : j - 1; + for (; j-- >= 0; row += (i > 0 ? 1 : -1)) { if (row + i >= 0 && row + i < nrow && row + i != ocrow) { - line_t s = ROW(row - view_start); + line_t s = ROW(view_start + row); line_t d = drawn_buf[row]; line_t d2 = drawn_buf[row + i]; @@ -2107,17 +2155,22 @@ } } - if (len != -1) + if (len >= 0) { /* also comes here at end if needed because of >= above */ if (wlen < len) ::swap (wlen, len); - XCopyArea (display->display, vt, vt, + XGCValues gcv; + + gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); + XCopyArea (dpy, vt, vt, gc, 0, Row2Pixel (len + i), (unsigned int)this->width, (unsigned int)Height2Pixel (wlen - len + 1), 0, Row2Pixel (len)); + gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); + len = -1; } } @@ -2129,8 +2182,8 @@ */ for (row = 0; row < nrow; row++) { - text_t *stp = ROW(row - view_start).t; - rend_t *srp = ROW(row - view_start).r; + text_t *stp = ROW(view_start + row).t; + rend_t *srp = ROW(view_start + row).r; text_t *dtp = drawn_buf[row].t; rend_t *drp = drawn_buf[row].r; @@ -2183,14 +2236,14 @@ if (stp[col] != dtp[col] || !RS_SAME (srp[col], drp[col])) { - if (must_clear && (i++ > count / 2)) + if (have_bg && (i++ > count / 2)) break; dtp[col] = stp[col]; drp[col] = rend; i = 0; } - else if (must_clear || (stp[col] != ' ' && ++i >= 16)) + else if (have_bg || (stp[col] != ' ' && ++i >= 16)) break; } @@ -2210,23 +2263,10 @@ // only do special processing if any attributes are set, which is unlikely if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) { -#if ENABLE_STYLES - // force redraw after "careful" characters to avoid pixel droppings - if (srp[col] & RS_Careful && col < ncol - 1 && 0) - drp[col + 1] = ~srp[col + 1]; - - // include previous careful character(s) if possible, looks nicer (best effort...) - while (text > stp - && srp[text - stp - 1] & RS_Careful - && RS_SAME (rend, srp[text - stp - 1])) - text--, count++, xpixel -= fwidth; -#endif - bool invert = rend & RS_RVid; #ifndef NO_BOLD_UNDERLINE_REVERSE - if (rend & RS_Bold - && fore == Color_fg) + if (rend & RS_Bold && fore == Color_fg) { if (ISSET_PIXCOLOR (Color_BD)) fore = Color_BD; @@ -2236,8 +2276,7 @@ # endif } - if (rend & RS_Italic - && fore == Color_fg) + if (rend & RS_Italic && fore == Color_fg) { if (ISSET_PIXCOLOR (Color_IT)) fore = Color_IT; @@ -2247,18 +2286,29 @@ # endif } - if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) + if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) fore = Color_UL; #endif if (invert) { - ::swap (fore, back); +#ifdef OPTION_HC + if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) + || !ISSET_PIXCOLOR (Color_HC)) +#endif + /* invert the column if no highlightColor is set or it is the + * current cursor column */ + ::swap (fore, back); +#ifdef OPTION_HC + else if (ISSET_PIXCOLOR (Color_HC)) + back = Color_HC; +#endif #ifndef NO_BOLD_UNDERLINE_REVERSE +# ifndef OPTION_HC if (ISSET_PIXCOLOR (Color_RV)) back = Color_RV; - +# endif if (fore == back) { fore = Color_bg; @@ -2270,15 +2320,33 @@ #ifdef TEXT_BLINK if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) { - if (!text_blink_ev.active) + if (!text_blink_ev.is_active ()) { - text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); + text_blink_ev.again (); hidden_text = 0; } else if (hidden_text) fore = back; } #endif + +#if ENABLE_STYLES + // "careful" (too wide) character handling + + // include previous careful character(s) if possible, looks nicer (best effort...) + while (text > stp + && srp[text - stp - 1] & RS_Careful + && RS_SAME (rend, srp[text - stp - 1])) + text--, count++, xpixel -= fwidth; + + // force redraw after "careful" characters to avoid pixel droppings + for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) + drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; + + // force redraw before "careful" characters to avoid pixel droppings + for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) + drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; +#endif } /* @@ -2286,25 +2354,19 @@ */ rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; - if (back == fore) - font->clear_rect (*drawable, xpixel, ypixel, - fwidth * count, fheight, - back); - else if (back == Color_bg) + if (have_bg && back == Color_bg) { - if (must_clear) - { - CLEAR_CHARS (xpixel, ypixel, count); + // this is very ugly, maybe push it into ->draw? - for (i = 0; i < count; i++) /* don't draw empty strings */ - if (text[i] != ' ') - { - font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); - break; - } - } - else - font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); + for (i = 0; i < count; i++) /* don't draw empty strings */ + if (text[i] != ' ') + { + font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); + goto did_clear; + } + + CLEAR_CHARS (xpixel, ypixel, count); + did_clear: ; } else font->draw (*drawable, xpixel, ypixel, text, count, fore, back); @@ -2313,12 +2375,12 @@ { #if ENABLE_FRILLS if (ISSET_PIXCOLOR (Color_underline)) - XSetForeground (display->display, gc, pix_colors[Color_underline]); + XSetForeground (dpy, gc, pix_colors[Color_underline]); else #endif - XSetForeground (display->display, gc, pix_colors[fore]); + XSetForeground (dpy, gc, pix_colors[fore]); - XDrawLine (display->display, drawBuffer, gc, + XDrawLine (dpy, drawBuffer, gc, xpixel, ypixel + font->ascent + 1, xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); } @@ -2337,7 +2399,7 @@ { if (focus) { - if (OPTION (Opt_cursorUnderline)) + if (option (Opt_cursorUnderline)) *crp ^= RS_Uline; else { @@ -2361,10 +2423,12 @@ #ifndef NO_CURSORCOLOR if (ISSET_PIXCOLOR (Color_cursor)) - XSetForeground (display->display, gc, pix_colors[Color_cursor]); + XSetForeground (dpy, gc, pix_colors[Color_cursor]); + else #endif + XSetForeground (dpy, gc, pix_colors[ccol1]); - XDrawRectangle (display->display, drawBuffer, gc, + XDrawRectangle (dpy, drawBuffer, gc, Col2Pixel (col), Row2Pixel (oldcursor.row), (unsigned int) (Width2Pixel (cursorwidth) - 1), @@ -2377,15 +2441,12 @@ */ scr_reverse_selection (); - if (refresh_type & SMOOTH_REFRESH) - XFlush (display->display); - num_scr = 0; num_scr_allow = 1; } void -rxvt_term::scr_remap_chars (line_t &l) +rxvt_term::scr_remap_chars (line_t &l) NOTHROW { if (!l.t) return; @@ -2397,7 +2458,7 @@ } void -rxvt_term::scr_remap_chars () +rxvt_term::scr_remap_chars () NOTHROW { for (int i = total_rows; i--; ) scr_remap_chars (row_buf [i]); @@ -2410,38 +2471,35 @@ } void -rxvt_term::scr_recolour () +rxvt_term::scr_recolour () NOTHROW { - if (1 -#if TRANSPARENT - && !am_transparent -#endif -#if XPM_BACKGROUND - && !bgPixmap.pixmap -#endif - ) - { - XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); - XClearWindow (display->display, parent[0]); - XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); -#if HAVE_SCROLLBARS - if (scrollBar.win) - { - XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); - scrollBar.setIdle (); - scrollbar_show (0); - } -#endif - } +#ifdef HAVE_BG_PIXMAP + bgPixmap.apply (); +#else + + XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); + XClearWindow (dpy, parent[0]); + XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); + +# if HAVE_SCROLLBARS + if (scrollBar.win) + { + XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); + scrollBar.setIdle (); + scrollbar_show (0); + } +# endif scr_clear (); scr_touch (true); want_refresh = 1; + +#endif } /* ------------------------------------------------------------------------- */ void -rxvt_term::scr_clear (bool really) +rxvt_term::scr_clear (bool really) NOTHROW { if (!mapped) return; @@ -2450,60 +2508,75 @@ want_refresh = 1; if (really) - XClearWindow (display->display, vt); + XClearWindow (dpy, vt); } -/* ------------------------------------------------------------------------- */ void -rxvt_term::scr_reverse_selection () +rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW { - if (selection.op - && current_screen == selection.screen - && selection.end.row >= -view_start) + int view_end = view_start + nrow; + int row, col; + + for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) { - int view_end = -view_start + nrow; - int row, col; + text_t *stp = ROW(row).t; + rend_t *srp = ROW(row).r; -#if ENABLE_FRILLS - if (selection.rect) - { - for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) - { - text_t *stp = ROW(row).t; - rend_t *srp = ROW(row).r; + for (col = beg_col; col < end_col; col++) + srp[col] ^= rstyle1; - for (col = selection.beg.col; col < selection.end.col; col++) - srp[col] ^= RS_RVid; + while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) + srp[col] ^= rstyle2; - while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) - srp[col] ^= RS_RVid | RS_Uline; + if (++col < end_col) + srp[col] ^= rstyle2; + } +} - if (++col < selection.end.col) - srp[col] ^= RS_RVid | RS_Uline; - } - } - else -#endif - { - if (selection.beg.row >= -view_start) - { - col = selection.beg.col; - row = selection.beg.row; - } - else - { - col = 0; - row = -view_start; - } +void +rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW +{ + int view_end = view_start + nrow; + int row, col; - for (; row < min (selection.end.row, view_end); row++, col = 0) - for (rend_t *srp = ROW(row).r; col < ncol; col++) - srp[col] ^= RS_RVid; + if (beg_row >= view_start) + { + col = beg_col; + row = beg_row; + } + else + { + col = 0; + row = view_start; + } - if (row == selection.end.row) - for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) - srp[col] ^= RS_RVid; - } + for (; row < min (end_row, view_end); row++, col = 0) + for (rend_t *srp = ROW(row).r; col < ncol; col++) + srp[col] ^= rstyle; + + if (row == end_row) + for (rend_t *srp = ROW(row).r; col < end_col; col++) + srp[col] ^= rstyle; +} + +/* ------------------------------------------------------------------------- */ +void +rxvt_term::scr_reverse_selection () NOTHROW +{ + if (selection.op + && current_screen == selection.screen + && selection.end.row >= view_start) + { +#if !ENABLE_MINIMAL + if (selection.rect) + scr_xor_rect (selection.beg.row, selection.beg.col, + selection.end.row, selection.end.col, + RS_RVid, RS_RVid | RS_Uline); + else +#endif + scr_xor_span (selection.beg.row, selection.beg.col, + selection.end.row, selection.end.col, + RS_RVid); } } @@ -2514,7 +2587,7 @@ */ #if 0 void -rxvt_term::scr_dump (int fd) +rxvt_term::scr_dump (int fd) NOTHROW { int row, wrote; unsigned int width, towrite; @@ -2543,7 +2616,7 @@ * CHARACTER SELECTION * * ------------------------------------------------------------------------- */ void -rxvt_term::selection_check (int check_more) +rxvt_term::selection_check (int check_more) NOTHROW { row_col_t pos; @@ -2551,9 +2624,9 @@ return; pos.row = pos.col = 0; - if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) - || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) - || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) + if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) + || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) + || !IN_RANGE_EXC (selection.end.row, top_row, nrow) || (check_more == 1 && current_screen == selection.screen && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) @@ -2574,7 +2647,7 @@ * Paste a selection direct to the command fd */ void -rxvt_term::paste (char *data, unsigned int len) +rxvt_term::paste (char *data, unsigned int len) NOTHROW { /* convert normal newline chars into common keyboard Return key sequence */ for (unsigned int i = 0; i < len; i++) @@ -2590,7 +2663,7 @@ * EXT: SelectionNotify */ void -rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) +rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW { if (prop == None) /* check for failed XConvertSelection */ { @@ -2620,7 +2693,7 @@ unsigned long bytes_after; XTextProperty ct; - if (XGetWindowProperty (display->display, win, prop, + if (XGetWindowProperty (dpy, win, prop, 0, PROP_SIZE / 4, delete_prop, AnyPropertyType, &ct.encoding, &ct.format, @@ -2639,7 +2712,7 @@ // fetch and append remaining data XTextProperty ct2; - if (XGetWindowProperty (display->display, win, prop, + if (XGetWindowProperty (dpy, win, prop, ct.nitems / 4, (bytes_after + 3) / 4, delete_prop, AnyPropertyType, &ct2.encoding, &ct2.format, @@ -2662,11 +2735,11 @@ { // INCR selection, start handshake if (!delete_prop) - XDeleteProperty (display->display, win, prop); + XDeleteProperty (dpy, win, prop); selection_wait = Sel_incr; incr_buf_fill = 0; - incr_ev.start (NOW + 10); + incr_ev.start (10); goto bailout; } @@ -2685,7 +2758,7 @@ incr_buf_size = 0; incr_ev.stop (); } - else + else { if (selection_wait == Sel_normal && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion @@ -2702,7 +2775,7 @@ } else if (selection_wait == Sel_incr) { - incr_ev.start (NOW + 10); + incr_ev.start (10); while (incr_buf_fill + ct.nitems > incr_buf_size) { @@ -2719,7 +2792,7 @@ char **cl; int cr; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it // so recode it manually if (ct.encoding == xa[XA_UTF8_STRING]) @@ -2733,7 +2806,7 @@ } else #endif - if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 + if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 && cl) { for (int i = 0; i < cr; i++) @@ -2752,7 +2825,7 @@ } void -rxvt_term::incr_cb (time_watcher &w) +rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW { selection_wait = Sel_none; @@ -2763,7 +2836,7 @@ } void -rxvt_term::selection_property (Window win, Atom prop) +rxvt_term::selection_property (Window win, Atom prop) NOTHROW { if (prop == None || selection_wait != Sel_incr) return; @@ -2773,7 +2846,7 @@ /* ------------------------------------------------------------------------- */ /* - * Request the current selection: + * Request the current selection: * Order: > internal selection if available * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) * > CUT_BUFFER0 @@ -2782,13 +2855,11 @@ * EXT: button 2 release */ void -rxvt_term::selection_request (Time tm, int x, int y) +rxvt_term::selection_request (Time tm, int selnum) NOTHROW { - if (x < 0 || x >= width || y < 0 || y >= height) - return; /* outside window */ - - if (selection.text) - { /* internal selection */ + if (selection.text && selnum == Sel_Primary) + { + /* internal selection */ char *str = rxvt_wcstombs (selection.text, selection.len); paste (str, strlen (str)); free (str); @@ -2796,23 +2867,18 @@ } else { - int i; - selection_request_time = tm; selection_wait = Sel_normal; - for (i = Sel_Primary; i <= Sel_Clipboard; i++) - { #if X_HAVE_UTF8_STRING - selection_type = Sel_UTF8String; - if (selection_request_other (xa[XA_UTF8_STRING], i)) - return; + selection_type = Sel_UTF8String; + if (selection_request_other (xa[XA_UTF8_STRING], selnum)) + return; #else - selection_type = Sel_CompoundText; - if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) - return; + selection_type = Sel_CompoundText; + if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) + return; #endif - } } selection_wait = Sel_none; /* don't loop in selection_paste () */ @@ -2820,7 +2886,7 @@ } int -rxvt_term::selection_request_other (Atom target, int selnum) +rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW { Atom sel; @@ -2833,9 +2899,9 @@ else sel = xa[XA_CLIPBOARD]; - if (XGetSelectionOwner (display->display, sel) != None) + if (XGetSelectionOwner (dpy, sel) != None) { - XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], + XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], vt, selection_request_time); return 1; } @@ -2849,7 +2915,7 @@ * EXT: SelectionClear */ void -rxvt_term::selection_clear () +rxvt_term::selection_clear () NOTHROW { want_refresh = 1; free (selection.text); @@ -2908,7 +2974,7 @@ for (; row <= selection.end.row; row++, col = 0) { -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect) { col = selection.beg.col; @@ -2921,7 +2987,7 @@ col = max (col, 0); if (row == selection.end.row -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL || selection.rect #endif ) @@ -2954,7 +3020,7 @@ new_selection_text[ofs++] = *t++; } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect) { while (ofs @@ -2994,23 +3060,26 @@ } bool -rxvt_term::selection_grab (Time tm) +rxvt_term::selection_grab (Time tm) NOTHROW { selection_time = tm; - XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); - if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) + XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); + if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) { display->set_selection_owner (this); return true; } else - return false; + { + selection_clear (); + return false; + } #if 0 XTextProperty ct; - if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) + if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) { set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); XFree (ct.value); @@ -3024,16 +3093,25 @@ * EXT: button 1 press */ void -rxvt_term::selection_click (int clicks, int x, int y) +rxvt_term::selection_click (int clicks, int x, int y) NOTHROW { clicks = ((clicks - 1) % 3) + 1; selection.clicks = clicks; /* save clicks so extend will work */ + if (clicks == 2 && !selection.rect + && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) + { + MEvent.clicks = 1; // what a mess + selection.screen = current_screen; + selection.op = SELECTION_CONT; + return; + } + selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); if (clicks == 2 || clicks == 3) selection_extend_colrow (selection.mark.col, - selection.mark.row + view_start, + selection.mark.row - view_start, 0, /* button 3 */ 1, /* button press */ 0); /* click change */ @@ -3044,22 +3122,23 @@ * Mark a selection at the specified col/row */ void -rxvt_term::selection_start_colrow (int col, int row) +rxvt_term::selection_start_colrow (int col, int row) NOTHROW { want_refresh = 1; - selection.mark.row = row - view_start; + selection.mark.row = row + view_start; selection.mark.col = col; - selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); + selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); while (selection.mark.col > 0 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) --selection.mark.col; - + if (selection.op) - { /* clear the old selection */ + { + /* clear the old selection */ selection.beg.row = selection.end.row = selection.mark.row; selection.beg.col = selection.end.col = selection.mark.col; } @@ -3080,7 +3159,7 @@ #define DELIMIT_REND(x) 1 void -rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) +rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW { int col, row, dirnadd, tcol, trow, w1, w2; row_col_t bound; @@ -3089,7 +3168,7 @@ if (dirn == UP) { - bound.row = - nsaved - 1; + bound.row = top_row - 1; bound.col = 0; dirnadd = -1; } @@ -3164,7 +3243,7 @@ * flag == 2 ==> button 3 motion */ void -rxvt_term::selection_extend (int x, int y, int flag) +rxvt_term::selection_extend (int x, int y, int flag) NOTHROW { int col = clamp (Pixel2Col (x), 0, ncol); int row = clamp (Pixel2Row (y), 0, nrow - 1); @@ -3177,7 +3256,7 @@ */ if (((selection.clicks % 3) == 1) && !flag && (col == selection.mark.col - && (row == selection.mark.row + view_start))) + && (row == selection.mark.row - view_start))) { /* select nothing */ selection.beg.row = selection.end.row = 0; @@ -3200,7 +3279,7 @@ * Extend the selection to the specified col/row */ void -rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) +rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW { row_col_t pos; enum { @@ -3242,7 +3321,7 @@ } pos.col = col; - pos.row = row - view_start; + pos.row = view_start + row; /* * This is mainly xterm style selection with a couple of differences, mainly @@ -3258,7 +3337,8 @@ * 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 */ @@ -3286,7 +3366,8 @@ } } 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 @@ -3313,7 +3394,7 @@ { if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN && !ROW(selection.beg.row).is_longer () -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL && !selection.rect #endif ) @@ -3322,7 +3403,7 @@ if ( selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN && !ROW(selection.end.row).is_longer () -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL && !selection.rect #endif ) @@ -3333,16 +3414,13 @@ if (ROWCOL_IS_AFTER (selection.end, selection.beg)) selection.end.col--; - if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) - { - 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) { #if ENABLE_FRILLS - if (OPTION (Opt_tripleclickwords)) + if (option (Opt_tripleclickwords)) { selection_delimit_word (UP, &selection.beg, &selection.beg); @@ -3352,7 +3430,9 @@ { selection.end.row = end_row; selection.end.col = ROW(end_row).l; +# if !ENABLE_MINIMAL selection_remove_trailing_spaces (); +# endif break; } } @@ -3378,7 +3458,8 @@ } if (button3 && buttonpress) - { /* mark may need to be changed */ + { + /* mark may need to be changed */ if (closeto == LEFT) { selection.mark.row = selection.end.row; @@ -3391,15 +3472,15 @@ } } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect && selection.beg.col > selection.end.col) ::swap (selection.beg.col, selection.end.col); #endif } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void -rxvt_term::selection_remove_trailing_spaces () +rxvt_term::selection_remove_trailing_spaces () NOTHROW { int32_t end_col, end_row; text_t *stp; @@ -3447,7 +3528,7 @@ * EXT: button 3 double click */ void -rxvt_term::selection_rotate (int x, int y) +rxvt_term::selection_rotate (int x, int y) NOTHROW { selection.clicks = selection.clicks % 3 + 1; selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); @@ -3459,10 +3540,9 @@ * EXT: SelectionRequest */ void -rxvt_term::selection_send (const XSelectionRequestEvent &rq) +rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW { XSelectionEvent ev; - dDisp; ev.type = SelectionNotify; ev.property = None; @@ -3486,7 +3566,7 @@ *target++ = xa[XA_UTF8_STRING]; #endif - XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, + XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 32, PropModeReplace, (unsigned char *)target_list, target - target_list); ev.property = rq.property; @@ -3499,7 +3579,7 @@ #endif else if (rq.target == xa[XA_TIMESTAMP] && selection.text) { - XChangeProperty (disp, rq.requestor, rq.property, rq.target, + XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 32, PropModeReplace, (unsigned char *)&selection_time, 1); ev.property = rq.property; } @@ -3533,7 +3613,7 @@ style = enc_text; else if (target == xa[XA_COMPOUND_TEXT]) style = enc_compound_text; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL else if (target == xa[XA_UTF8_STRING]) style = enc_utf8; #endif @@ -3554,7 +3634,7 @@ selectlen = 0; } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it // so recode it manually if (style == enc_utf8) @@ -3567,7 +3647,7 @@ } else #endif - if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) + if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) freect = 1; else { @@ -3577,7 +3657,7 @@ ct.encoding = target; } - XChangeProperty (disp, rq.requestor, rq.property, + XChangeProperty (dpy, rq.requestor, rq.property, ct.encoding, 8, PropModeReplace, ct.value, (int)ct.nitems); ev.property = rq.property; @@ -3586,33 +3666,17 @@ XFree (ct.value); } - XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); -} - -/* ------------------------------------------------------------------------- * - * MOUSE ROUTINES * - * ------------------------------------------------------------------------- */ - -/* - * return col/row values corresponding to x/y pixel values - */ -void -rxvt_term::pixel_position (int *x, int *y) -{ - *x = Pixel2Col (*x); - /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ - *y = Pixel2Row (*y); - /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ + XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); } /* ------------------------------------------------------------------------- */ #ifdef USE_XIM void -rxvt_term::im_set_position (XPoint &pos) +rxvt_term::im_set_position (XPoint &pos) NOTHROW { XWindowAttributes xwa; - XGetWindowAttributes (display->display, vt, &xwa); + XGetWindowAttributes (dpy, vt, &xwa); pos.x = xwa.x + Col2Pixel (screen.cur.col); pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; @@ -3621,7 +3685,7 @@ #if ENABLE_OVERLAY void -rxvt_term::scr_overlay_new (int x, int y, int w, int h) +rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW { if (nrow < 1 || ncol < 1) return; @@ -3676,7 +3740,7 @@ } void -rxvt_term::scr_overlay_off () +rxvt_term::scr_overlay_off () NOTHROW { if (!ov_text) return; @@ -3694,7 +3758,7 @@ } void -rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) +rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW { if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) return; @@ -3706,19 +3770,19 @@ } void -rxvt_term::scr_overlay_set (int x, int y, const char *s) +rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW { while (*s) scr_overlay_set (x++, y, *s++); } void -rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) +rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW { while (*s) { text_t t = *s++; - int width = wcwidth (t); + int width = WCWIDTH (t); while (width--) { @@ -3729,7 +3793,7 @@ } void -rxvt_term::scr_swap_overlay () +rxvt_term::scr_swap_overlay () NOTHROW { if (!ov_text) return; @@ -3740,8 +3804,8 @@ text_t *t1 = ov_text[y]; rend_t *r1 = ov_rend[y]; - text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; - rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; + text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; + rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; for (int x = ov_w; x--; ) {