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.436 by sf-exg, Sun Mar 24 10:15:27 2013 UTC vs.
Revision 1.448 by sf-exg, Thu Oct 30 09:53:05 2014 UTC

… …
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 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * 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 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
715 715
716 // finally move the view window, if desired 716 // finally move the view window, if desired
717 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
718 && view_start != 0 718 && view_start != 0
719 && view_start != -saveLines) 719 && view_start != -saveLines)
720 scr_page (UP, count); 720 scr_page (count);
721 721
722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
724 } 724 }
725 else 725 else
… …
1240 * direction should be UP or DN 1240 * direction should be UP or DN
1241 */ 1241 */
1242void 1242void
1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1244{ 1244{
1245 int dirn;
1246
1247 want_refresh = 1; 1245 want_refresh = 1;
1248 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1249 1247
1250 dirn = ((direction == UP) ? 1 : -1);
1251
1252 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1253 1249
1254 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1255 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1256 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1257 else 1253 else
1258 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1259 1255
1260 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1261 selection_check (0); 1257 selection_check (0);
1262} 1258}
1263 1259
… …
1901 * the top of the screen 1897 * the top of the screen
1902 */ 1898 */
1903void 1899void
1904rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1905{ 1901{
1906 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1902 // lerp (y, 0, len, top_row, nrow - 1)
1903 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1907} 1904}
1908 1905
1909/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1910/* 1907/*
1911 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1912 * direction should be UP or DN 1909 * direction should be UP or DN
1913 */ 1910 */
1914bool 1911bool
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1912rxvt_term::scr_page (int nlines) NOTHROW
1916{ 1913{
1917 int new_view_start =
1918 direction == UP ? view_start - nlines
1919 : view_start + nlines;
1920
1921 return scr_changeview (new_view_start); 1914 return scr_changeview (view_start - nlines);
1922} 1915}
1923 1916
1924bool 1917bool
1925rxvt_term::scr_changeview (int new_view_start) NOTHROW 1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1919{
… …
2048 int i; /* tmp */ 2041 int i; /* tmp */
2049 rend_t ccol1, /* Cursor colour */ 2042 rend_t ccol1, /* Cursor colour */
2050 ccol2; /* Cursor colour2 */ 2043 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend; 2044 rend_t cur_rend;
2052 int cur_col; 2045 int cur_col;
2046 int cursorwidth;
2053 2047
2054 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
2055 2049
2056 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
2057 return; 2051 return;
… …
2082 2076
2083 /* 2077 /*
2084 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2085 */ 2079 */
2086 { 2080 {
2087 bool setoldcursor;
2088
2089#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
2090 if (hidden_cursor) 2082 if (hidden_cursor)
2091 showcursor = 0; 2083 showcursor = 0;
2092#endif 2084#endif
2093 2085
… …
2095 { 2087 {
2096 int col = screen.cur.col; 2088 int col = screen.cur.col;
2097 2089
2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2099 col--; 2091 col--;
2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2100 2097
2101 cur_rend = ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col; 2099 cur_col = col;
2103 2100
2104#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
… …
2121 ccol2 = bgcolor_of (rstyle); 2118 ccol2 = bgcolor_of (rstyle);
2122#else 2119#else
2123 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2124#endif 2121#endif
2125 2122
2126 if (focus) 2123 if (focus && cursor_type != 2)
2127 { 2124 {
2128 rend_t rend = cur_rend; 2125 rend_t rend = cur_rend;
2129 2126
2130 if (option (Opt_cursorUnderline)) 2127 if (cursor_type == 1)
2131 rend ^= RS_Uline; 2128 rend ^= RS_Uline;
2132 else 2129 else
2133 { 2130 {
2134 rend ^= RS_RVid; 2131 rend ^= RS_RVid;
2135 rend = SET_FGCOLOR (rend, ccol1); 2132 rend = SET_FGCOLOR (rend, ccol1);
… …
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2140 } 2137 }
2141 } 2138 }
2142 2139
2143 /* make sure no outline cursor is left around */ 2140 /* make sure no outline cursor is left around */
2144 setoldcursor = 0;
2145 if (ocrow != -1) 2141 if (ocrow != -1)
2146 { 2142 {
2147 if (screen.cur.row - view_start != ocrow 2143 if (screen.cur.row - view_start != ocrow
2148 || screen.cur.col != oldcursor.col) 2144 || screen.cur.col != oldcursor.col || !showcursor)
2149 { 2145 {
2150 if (ocrow < nrow 2146 if (ocrow < nrow
2151 && oldcursor.col < ncol) 2147 && oldcursor.col < ncol)
2152 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2153
2154 if (focus || !showcursor)
2155 oldcursor.row = -1;
2156 else
2157 setoldcursor = 1;
2158 } 2149 }
2159 } 2150 }
2160 else if (!focus)
2161 setoldcursor = 1;
2162 2151
2163 if (setoldcursor) 2152 // save the current cursor coordinates if the cursor is visible
2153 // and either the window is unfocused or the cursor style is
2154 // vertical bar, so as to clear the outline cursor in the next
2155 // refresh if the cursor moves or becomes invisible
2156 if (showcursor && (!focus || cursor_type == 2) && screen.cur.row - view_start < nrow)
2164 { 2157 {
2165 if (screen.cur.row - view_start >= nrow)
2166 oldcursor.row = -1;
2167 else
2168 {
2169 oldcursor.row = screen.cur.row - view_start; 2158 oldcursor.row = screen.cur.row - view_start;
2170 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2171 }
2172 } 2160 }
2161 else
2162 oldcursor.row = -1;
2173 } 2163 }
2174 2164
2175#ifndef NO_SLOW_LINK_SUPPORT 2165#ifndef NO_SLOW_LINK_SUPPORT
2176 /* 2166 /*
2177 * D: CopyArea pass - very useful for slower links 2167 * D: CopyArea pass - very useful for slower links
… …
2261 { 2251 {
2262 /* compare new text with old - if exactly the same then continue */ 2252 /* compare new text with old - if exactly the same then continue */
2263 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2253 if (stp[col] == dtp[col] /* Must match characters to skip. */
2264 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2254 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2265 || (stp[col] == ' ' /* space w/ no background change */ 2255 || (stp[col] == ' ' /* space w/ no background change */
2266 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2256 && !((srp[col] ^ drp[col]) & (RS_attrMask | RS_bgMask)))))
2267 continue; 2257 continue;
2268 2258
2269 // redraw one or more characters 2259 // redraw one or more characters
2270 2260
2271 // seek to the beginning of wide characters 2261 // seek to the beginning of wide characters
… …
2443 else 2433 else
2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2445 2435
2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2447 { 2437 {
2438 if (showcursor && focus && row == screen.cur.row
2439 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2440 XSetForeground (dpy, gc, pix_colors[ccol1]);
2441 else
2448#if ENABLE_FRILLS 2442#if ENABLE_FRILLS
2449 if (ISSET_PIXCOLOR (Color_underline)) 2443 if (ISSET_PIXCOLOR (Color_underline))
2450 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2444 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2451 else 2445 else
2452#endif 2446#endif
… …
2463 * G: cleanup cursor and display outline cursor if necessary 2457 * G: cleanup cursor and display outline cursor if necessary
2464 */ 2458 */
2465 if (showcursor) 2459 if (showcursor)
2466 { 2460 {
2467 if (focus) 2461 if (focus)
2462 {
2463 if (cursor_type != 2)
2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2464 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2465 else if (oldcursor.row >= 0)
2466 {
2467 XSetForeground (dpy, gc, pix_colors[ccol1]);
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 1,
2472 Height2Pixel (1));
2473 }
2474 }
2469 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2470 { 2476 {
2471 int cursorwidth = 1;
2472 int col = oldcursor.col;
2473
2474 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2475 col--;
2476
2477 while (col + cursorwidth < ncol
2478 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2479 cursorwidth++;
2480
2481#ifndef NO_CURSORCOLOR
2482 if (ISSET_PIXCOLOR (Color_cursor))
2483 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2484 else
2485#endif
2486 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2487 2478
2488 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2489 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2490 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2491 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2492 (unsigned int) (Height2Pixel (1) - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2493 } 2484 }
2494 } 2485 }
… …
2701 2692
2702void 2693void
2703rxvt_term::selection_changed () NOTHROW 2694rxvt_term::selection_changed () NOTHROW
2704{ 2695{
2705 line_t &r1 = ROW (selection.beg.row); 2696 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col; 2698 ++selection.beg.col;
2708 2699
2709 line_t &r2 = ROW (selection.end.row); 2700 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col; 2702 ++selection.end.col;
2712 2703

Diff Legend

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