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.438 by sf-exg, Mon Mar 25 15:41:07 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
… …
614 * Change the colour for following text 615 * Change the colour for following text
615 */ 616 */
616void 617void
617rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
618{ 619{
619 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
620 color = fgbg; 621 color = fgbg;
621 622
622 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
623 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
624 else 625 else
… …
715 716
716 // finally move the view window, if desired 717 // finally move the view window, if desired
717 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
718 && view_start != 0 719 && view_start != 0
719 && view_start != -saveLines) 720 && view_start != -saveLines)
720 scr_page (UP, count); 721 scr_page (count);
721 722
722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
723 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));
724 } 725 }
725 else 726 else
… …
1011 } 1012 }
1012 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1013 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1014 { 1015 {
1015 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1016 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1017 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1018 } 1019 }
1019 else 1020 else
1020 continue; 1021 continue;
1021 1022
1022 linep->touch (); 1023 linep->touch ();
… …
1240 * direction should be UP or DN 1241 * direction should be UP or DN
1241 */ 1242 */
1242void 1243void
1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1244{ 1245{
1245 int dirn;
1246
1247 want_refresh = 1; 1246 want_refresh = 1;
1248 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1249 1248
1250 dirn = ((direction == UP) ? 1 : -1);
1251
1252 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1253 1250
1254 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1255 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1256 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1257 else 1254 else
1258 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1259 1256
1260 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1261 selection_check (0); 1258 selection_check (0);
1262} 1259}
1263 1260
… …
1901 * the top of the screen 1898 * the top of the screen
1902 */ 1899 */
1903void 1900void
1904rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1905{ 1902{
1906 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);
1907} 1905}
1908 1906
1909/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1910/* 1908/*
1911 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1912 * direction should be UP or DN 1910 * direction should be UP or DN
1913 */ 1911 */
1914bool 1912bool
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1916{ 1914{
1917 int new_view_start =
1918 direction == UP ? view_start - nlines
1919 : view_start + nlines;
1920
1921 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1922} 1916}
1923 1917
1924bool 1918bool
1925rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1920{
… …
2083 2077
2084 /* 2078 /*
2085 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2086 */ 2080 */
2087 { 2081 {
2088 bool setoldcursor;
2089
2090#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2091 if (hidden_cursor) 2083 if (hidden_cursor)
2092 showcursor = 0; 2084 showcursor = 0;
2093#endif 2085#endif
2094 2086
… …
2127 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2128#else 2120#else
2129 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2130#endif 2122#endif
2131 2123
2132 if (focus) 2124 if (focus && cursor_type == 0)
2133 { 2125 {
2134 rend_t rend = cur_rend; 2126 rend_t rend = cur_rend;
2135 2127
2136 if (option (Opt_cursorUnderline))
2137 rend ^= RS_Uline;
2138 else
2139 {
2140 rend ^= RS_RVid; 2128 rend ^= RS_RVid;
2141 rend = SET_FGCOLOR (rend, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2142 rend = SET_BGCOLOR (rend, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2143 }
2144 2131
2145 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2146 } 2133 }
2147 } 2134 }
2148 2135
2149 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2150 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2151 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)
2152 { 2145 {
2153 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2154 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2155 {
2156 if (ocrow < nrow
2157 && oldcursor.col < ncol)
2158 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2159
2160 if (focus || !showcursor)
2161 oldcursor.row = -1;
2162 else
2163 setoldcursor = 1;
2164 }
2165 } 2148 }
2166 else if (!focus) 2149 else
2167 setoldcursor = 1;
2168
2169 if (setoldcursor)
2170 {
2171 if (screen.cur.row - view_start >= nrow)
2172 oldcursor.row = -1; 2150 oldcursor.row = -1;
2173 else
2174 {
2175 oldcursor.row = screen.cur.row - view_start;
2176 oldcursor.col = screen.cur.col;
2177 }
2178 }
2179 } 2151 }
2180 2152
2181#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2182 /* 2154 /*
2183 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
2264 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2265 2237
2266 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2267 { 2239 {
2268 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2269 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2270 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2271 || (stp[col] == ' ' /* space w/ no background change */
2272 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2273 continue; 2242 continue;
2274 2243
2275 // redraw one or more characters 2244 // redraw one or more characters
2276 2245
2277 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2473 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2474 */ 2443 */
2475 if (showcursor) 2444 if (showcursor)
2476 { 2445 {
2477 if (focus) 2446 if (focus)
2447 {
2448 if (cursor_type == 0)
2478 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 }
2479 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2480 { 2468 {
2481 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2482 2470
2483 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
… …
2527 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2528 } 2516 }
2529} 2517}
2530 2518
2531void ecb_cold 2519void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2533{ 2521{
2534 bool transparent = false; 2522 bool transparent = false;
2535 2523
2536#ifdef HAVE_IMG 2524#ifdef HAVE_IMG
2537 if (bg_img != 0) 2525 if (bg_img != 0)
… …
2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 } 2547 }
2560 2548
2561 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2562 2550
2563 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2564 { 2552 {
2565 if (transparent) 2553 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2555 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2696 2684
2697void 2685void
2698rxvt_term::selection_changed () NOTHROW 2686rxvt_term::selection_changed () NOTHROW
2699{ 2687{
2700 line_t &r1 = ROW (selection.beg.row); 2688 line_t &r1 = ROW (selection.beg.row);
2701 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2702 --selection.beg.col; 2690 ++selection.beg.col;
2703 2691
2704 line_t &r2 = ROW (selection.end.row); 2692 line_t &r2 = ROW (selection.end.row);
2705 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2706 ++selection.end.col; 2694 ++selection.end.col;
2707 2695

Diff Legend

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