ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC vs.
Revision 1.457 by sf-exg, Tue Jun 21 12:03:56 2016 UTC

… …
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
254 255
255 scr_alloc (); 256 scr_alloc ();
256 257
257 if (!prev_row_buf) 258 if (!prev_row_buf)
258 { 259 {
259 /*
260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
261 */
262 top_row = 0; 260 top_row = 0;
263 term_start = 0; 261 term_start = 0;
264 262
265 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
266 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
… …
291 { 289 {
292 /* 290 /*
293 * add or delete rows as appropriate 291 * add or delete rows as appropriate
294 */ 292 */
295 293
294 int common_col = min (prev_ncol, ncol);
295
296 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
297 { 297 {
298 copy_line (drawn_buf [row], prev_drawn_buf [row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
301
299 copy_line (swap_buf [row], prev_swap_buf [row]); 302 copy_line (swap_buf [row], prev_swap_buf [row]);
300 } 303 }
301 304
302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
303 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
… …
612 * Change the colour for following text 615 * Change the colour for following text
613 */ 616 */
614void 617void
615rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
616{ 619{
617 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
618 color = fgbg; 621 color = fgbg;
619 622
620 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
621 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
622 else 625 else
… …
713 716
714 // finally move the view window, if desired 717 // finally move the view window, if desired
715 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
716 && view_start != 0 719 && view_start != 0
717 && view_start != -saveLines) 720 && view_start != -saveLines)
718 scr_page (UP, count); 721 scr_page (count);
719 722
720 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
721 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
722 } 725 }
723 else 726 else
… …
1009 } 1012 }
1010 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1011 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1012 { 1015 {
1013 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1014 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1015 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1016 } 1019 }
1017 else 1020 else
1018 continue; 1021 continue;
1019 1022
1020 linep->touch (); 1023 linep->touch ();
… …
1238 * direction should be UP or DN 1241 * direction should be UP or DN
1239 */ 1242 */
1240void 1243void
1241rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1242{ 1245{
1243 int dirn;
1244
1245 want_refresh = 1; 1246 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1247 1248
1248 dirn = ((direction == UP) ? 1 : -1);
1249
1250 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1251 1250
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1255 else 1254 else
1256 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1257 1256
1258 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1259 selection_check (0); 1258 selection_check (0);
1260} 1259}
1261 1260
… …
1899 * the top of the screen 1898 * the top of the screen
1900 */ 1899 */
1901void 1900void
1902rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1903{ 1902{
1904 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1903 // lerp (y, 0, len, top_row, nrow - 1)
1904 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1905} 1905}
1906 1906
1907/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1908/* 1908/*
1909 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1910 * direction should be UP or DN 1910 * direction should be UP or DN
1911 */ 1911 */
1912bool 1912bool
1913rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1914{ 1914{
1915 int new_view_start =
1916 direction == UP ? view_start - nlines
1917 : view_start + nlines;
1918
1919 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1920} 1916}
1921 1917
1922bool 1918bool
1923rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1924{ 1920{
… …
2046 int i; /* tmp */ 2042 int i; /* tmp */
2047 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2048 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend; 2045 rend_t cur_rend;
2050 int cur_col; 2046 int cur_col;
2047 int cursorwidth;
2051 2048
2052 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2053 2050
2054 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2055 return; 2052 return;
… …
2080 2077
2081 /* 2078 /*
2082 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2083 */ 2080 */
2084 { 2081 {
2085 bool setoldcursor;
2086
2087#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2088 if (hidden_cursor) 2083 if (hidden_cursor)
2089 showcursor = 0; 2084 showcursor = 0;
2090#endif 2085#endif
2091 2086
… …
2093 { 2088 {
2094 int col = screen.cur.col; 2089 int col = screen.cur.col;
2095 2090
2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2097 col--; 2092 col--;
2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098 2098
2099 cur_rend = ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col; 2100 cur_col = col;
2101 2101
2102#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
… …
2119 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2120#else 2120#else
2121 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2122#endif 2122#endif
2123 2123
2124 if (focus) 2124 if (focus && cursor_type == 0)
2125 { 2125 {
2126 rend_t rend = cur_rend; 2126 rend_t rend = cur_rend;
2127 2127
2128 if (option (Opt_cursorUnderline))
2129 rend ^= RS_Uline;
2130 else
2131 {
2132 rend ^= RS_RVid; 2128 rend ^= RS_RVid;
2133 rend = SET_FGCOLOR (rend, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2134 rend = SET_BGCOLOR (rend, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2135 }
2136 2131
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2138 } 2133 }
2139 } 2134 }
2140 2135
2141 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2142 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2143 if (ocrow != -1) 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 // save the current cursor coordinates if the cursor is visible
2141 // and either the window is unfocused or the cursor style is
2142 // underline or vertical bar, so as to clear the outline cursor in
2143 // the next refresh if the cursor moves or becomes invisible
2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2144 { 2145 {
2145 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2146 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2147 {
2148 if (ocrow < nrow
2149 && oldcursor.col < ncol)
2150 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2151
2152 if (focus || !showcursor)
2153 oldcursor.row = -1;
2154 else
2155 setoldcursor = 1;
2156 }
2157 } 2148 }
2158 else if (!focus) 2149 else
2159 setoldcursor = 1;
2160
2161 if (setoldcursor)
2162 {
2163 if (screen.cur.row - view_start >= nrow)
2164 oldcursor.row = -1; 2150 oldcursor.row = -1;
2165 else
2166 {
2167 oldcursor.row = screen.cur.row - view_start;
2168 oldcursor.col = screen.cur.col;
2169 }
2170 }
2171 } 2151 }
2172 2152
2173#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2174 /* 2154 /*
2175 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
2256 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2257 2237
2258 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2259 { 2239 {
2260 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2261 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2262 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2263 || (stp[col] == ' ' /* space w/ no background change */
2264 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2265 continue; 2242 continue;
2266 2243
2267 // redraw one or more characters 2244 // redraw one or more characters
2268 2245
2269 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2441 else 2418 else
2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2443 2420
2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2445 { 2422 {
2423 if (showcursor && focus && row == screen.cur.row
2424 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 else
2446#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2447 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2448 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2449 else 2430 else
2450#endif 2431#endif
… …
2461 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2462 */ 2443 */
2463 if (showcursor) 2444 if (showcursor)
2464 { 2445 {
2465 if (focus) 2446 if (focus)
2447 {
2448 if (cursor_type == 0)
2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2450 else if (oldcursor.row >= 0)
2451 {
2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2453 if (cursor_type == 1)
2454 XFillRectangle (dpy, vt, gc,
2455 Col2Pixel (cur_col),
2456 Row2Pixel (oldcursor.row + 1) - 2,
2457 Width2Pixel (1),
2458 2);
2459 else
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row),
2463 2,
2464 Height2Pixel (1));
2465 }
2466 }
2467 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2468 { 2468 {
2469 int cursorwidth = 1;
2470 int col = oldcursor.col;
2471
2472 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2473 col--;
2474
2475 while (col + cursorwidth < ncol
2476 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2477 cursorwidth++;
2478
2479#ifndef NO_CURSORCOLOR
2480 if (ISSET_PIXCOLOR (Color_cursor))
2481 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2482 else
2483#endif
2484 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2485 2470
2486 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2487 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2488 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2489 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2490 (unsigned int) (Height2Pixel (1) - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2491 } 2476 }
2492 } 2477 }
… …
2530 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2531 } 2516 }
2532} 2517}
2533 2518
2534void ecb_cold 2519void ecb_cold
2535rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2536{ 2521{
2537 bool transparent = false; 2522 bool transparent = false;
2538 2523
2539#ifdef HAVE_IMG 2524#ifdef HAVE_IMG
2540 if (bg_img != 0) 2525 if (bg_img != 0)
… …
2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2562 } 2547 }
2563 2548
2564 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2565 2550
2566 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2567 { 2552 {
2568 if (transparent) 2553 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else 2555 else
2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2693 || (check_more == 1 2678 || (check_more == 1
2694 && current_screen == selection.screen 2679 && current_screen == selection.screen
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 CLEAR_ALL_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2683}
2684
2685void
2686rxvt_term::selection_changed () NOTHROW
2687{
2688 line_t &r1 = ROW (selection.beg.row);
2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2690 ++selection.beg.col;
2691
2692 line_t &r2 = ROW (selection.end.row);
2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2694 ++selection.end.col;
2695
2696 want_refresh = 1;
2698} 2697}
2699 2698
2700/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2701/* 2700/*
2702 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
3005 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3006 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3007 */ 3006 */
3008 3007
3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3010#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3012#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3013 3012
3014void ecb_cold 3013void ecb_cold
3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3136{ 3135{
3137 row_col_t pos; 3136 row_col_t pos;
3138 enum { 3137 enum {
3139 LEFT, RIGHT 3138 LEFT, RIGHT
3140 } closeto = RIGHT; 3139 } closeto = RIGHT;
3141
3142 want_refresh = 1;
3143 3140
3144 switch (selection.op) 3141 switch (selection.op)
3145 { 3142 {
3146 case SELECTION_INIT: 3143 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3327 3324
3328#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3329 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3330 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3331#endif 3328#endif
3329
3330 selection_changed ();
3332} 3331}
3333 3332
3334#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3335void ecb_cold 3334void ecb_cold
3336rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines