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.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC vs.
Revision 1.459 by root, Tue Jun 25 03:35:01 2019 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
… …
1717 1714
1718 if (rvideo_state != on) 1715 if (rvideo_state != on)
1719 { 1716 {
1720 rvideo_state = on; 1717 rvideo_state = on;
1721 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1723#ifdef HAVE_IMG 1728#ifdef HAVE_IMG
1724 if (bg_img == 0) 1729 if (bg_img == 0)
1725#endif 1730#endif
1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
1901 * the top of the screen 1906 * the top of the screen
1902 */ 1907 */
1903void 1908void
1904rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) NOTHROW
1905{ 1910{
1906 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1907} 1913}
1908 1914
1909/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1910/* 1916/*
1911 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1912 * direction should be UP or DN 1918 * direction should be UP or DN
1913 */ 1919 */
1914bool 1920bool
1915rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) NOTHROW
1916{ 1922{
1917 int new_view_start =
1918 direction == UP ? view_start - nlines
1919 : view_start + nlines;
1920
1921 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1922} 1924}
1923 1925
1924bool 1926bool
1925rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1928{
… …
2125 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2126#else 2128#else
2127 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2128#endif 2130#endif
2129 2131
2130 if (focus) 2132 if (focus && cursor_type == 0)
2131 { 2133 {
2132 rend_t rend = cur_rend; 2134 rend_t rend = cur_rend;
2133 2135
2134 if (option (Opt_cursorUnderline))
2135 rend ^= RS_Uline;
2136 else
2137 {
2138 rend ^= RS_RVid; 2136 rend ^= RS_RVid;
2139 rend = SET_FGCOLOR (rend, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2140 rend = SET_BGCOLOR (rend, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2141 }
2142 2139
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2144 } 2141 }
2145 } 2142 }
2146 2143
2147 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2148 if (ocrow != -1) 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2149 {
2150 if (screen.cur.row - view_start != ocrow
2151 || screen.cur.col != oldcursor.col)
2152 {
2153 if (ocrow < nrow
2154 && oldcursor.col < ncol)
2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2156 }
2157 }
2158 2147
2159 // save the current cursor coordinates if the cursor is visible 2148 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor 2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2161 // in the next refresh if the cursor moves 2151 // the next refresh if the cursor moves or becomes invisible
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow) 2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2163 { 2153 {
2164 oldcursor.row = screen.cur.row - view_start; 2154 oldcursor.row = screen.cur.row - view_start;
2165 oldcursor.col = screen.cur.col; 2155 oldcursor.col = screen.cur.col;
2166 } 2156 }
2167 else 2157 else
… …
2254 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2255 2245
2256 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2257 { 2247 {
2258 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2259 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2260 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2261 || (stp[col] == ' ' /* space w/ no background change */
2262 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2263 continue; 2250 continue;
2264 2251
2265 // redraw one or more characters 2252 // redraw one or more characters
2266 2253
2267 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2463 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2464 */ 2451 */
2465 if (showcursor) 2452 if (showcursor)
2466 { 2453 {
2467 if (focus) 2454 if (focus)
2455 {
2456 if (cursor_type == 0)
2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458 else if (oldcursor.row >= 0)
2459 {
2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 if (cursor_type == 1)
2462 XFillRectangle (dpy, vt, gc,
2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2473 }
2474 }
2469 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2470 { 2476 {
2471 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2472 2478
2473 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
… …
2517 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2518 } 2524 }
2519} 2525}
2520 2526
2521void ecb_cold 2527void ecb_cold
2522rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) NOTHROW
2523{ 2529{
2524 bool transparent = false; 2530 bool transparent = false;
2525 2531
2526#ifdef HAVE_IMG 2532#ifdef HAVE_IMG
2527 if (bg_img != 0) 2533 if (bg_img != 0)
… …
2548 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2549 } 2555 }
2550 2556
2551 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2552 2558
2553 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2554 { 2560 {
2555 if (transparent) 2561 if (transparent)
2556 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2557 else 2563 else
2558 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2686 2692
2687void 2693void
2688rxvt_term::selection_changed () NOTHROW 2694rxvt_term::selection_changed () NOTHROW
2689{ 2695{
2690 line_t &r1 = ROW (selection.beg.row); 2696 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col; 2698 ++selection.beg.col;
2693 2699
2694 line_t &r2 = ROW (selection.end.row); 2700 line_t &r2 = ROW (selection.end.row);
2695 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)
2696 ++selection.end.col; 2702 ++selection.end.col;
2697 2703
… …
3494 cl = selection.clip_text; 3500 cl = selection.clip_text;
3495 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3496 } 3502 }
3497 else 3503 else
3498 { 3504 {
3499 cl = L""; 3505 cl = (wchar_t *)L"";
3500 selectlen = 0; 3506 selectlen = 0;
3501 } 3507 }
3502 3508
3503#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3504 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3510 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it

Diff Legend

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