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.440 by root, Wed Mar 27 17:24:16 2013 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 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
… …
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
… …
2121 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2122#else 2120#else
2123 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2124#endif 2122#endif
2125 2123
2126 if (focus) 2124 if (focus && cursor_type == 0)
2127 { 2125 {
2128 rend_t rend = cur_rend; 2126 rend_t rend = cur_rend;
2129 2127
2130 if (option (Opt_cursorUnderline))
2131 rend ^= RS_Uline;
2132 else
2133 {
2134 rend ^= RS_RVid; 2128 rend ^= RS_RVid;
2135 rend = SET_FGCOLOR (rend, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2136 rend = SET_BGCOLOR (rend, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2137 }
2138 2131
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2140 } 2133 }
2141 } 2134 }
2142 2135
2143 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2144 if (ocrow != -1) 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2145 {
2146 if (screen.cur.row - view_start != ocrow
2147 || screen.cur.col != oldcursor.col)
2148 {
2149 if (ocrow < nrow
2150 && oldcursor.col < ncol)
2151 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2152 }
2153 }
2154 2139
2155 // save the current cursor coordinates if the cursor is visible 2140 // save the current cursor coordinates if the cursor is visible
2156 // and the window is unfocused, so as to clear the outline cursor 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
2157 // in the next refresh if the cursor moves 2143 // the next refresh if the cursor moves or becomes invisible
2158 if (showcursor && !focus && screen.cur.row - view_start < nrow) 2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2159 { 2145 {
2160 oldcursor.row = screen.cur.row - view_start; 2146 oldcursor.row = screen.cur.row - view_start;
2161 oldcursor.col = screen.cur.col; 2147 oldcursor.col = screen.cur.col;
2162 } 2148 }
2163 else 2149 else
… …
2250 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2251 2237
2252 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2253 { 2239 {
2254 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2255 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2256 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2257 || (stp[col] == ' ' /* space w/ no background change */
2258 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2259 continue; 2242 continue;
2260 2243
2261 // redraw one or more characters 2244 // redraw one or more characters
2262 2245
2263 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2459 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2460 */ 2443 */
2461 if (showcursor) 2444 if (showcursor)
2462 { 2445 {
2463 if (focus) 2446 if (focus)
2447 {
2448 if (cursor_type == 0)
2464 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 }
2465 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2466 { 2468 {
2467 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2468 2470
2469 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
… …
2513 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2514 } 2516 }
2515} 2517}
2516 2518
2517void ecb_cold 2519void ecb_cold
2518rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2519{ 2521{
2520 bool transparent = false; 2522 bool transparent = false;
2521 2523
2522#ifdef HAVE_IMG 2524#ifdef HAVE_IMG
2523 if (bg_img != 0) 2525 if (bg_img != 0)
… …
2544 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2545 } 2547 }
2546 2548
2547 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2548 2550
2549 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2550 { 2552 {
2551 if (transparent) 2553 if (transparent)
2552 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2553 else 2555 else
2554 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2682 2684
2683void 2685void
2684rxvt_term::selection_changed () NOTHROW 2686rxvt_term::selection_changed () NOTHROW
2685{ 2687{
2686 line_t &r1 = ROW (selection.beg.row); 2688 line_t &r1 = ROW (selection.beg.row);
2687 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2688 --selection.beg.col; 2690 ++selection.beg.col;
2689 2691
2690 line_t &r2 = ROW (selection.end.row); 2692 line_t &r2 = ROW (selection.end.row);
2691 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)
2692 ++selection.end.col; 2694 ++selection.end.col;
2693 2695

Diff Legend

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