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.450 by mikachu, Sat Dec 6 09:20:13 2014 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 3 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.
… …
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
… …
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 ();
… …
1713 1714
1714 if (rvideo_state != on) 1715 if (rvideo_state != on)
1715 { 1716 {
1716 rvideo_state = on; 1717 rvideo_state = on;
1717 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
1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1719#ifdef HAVE_IMG 1728#ifdef HAVE_IMG
1720 if (bg_img == 0) 1729 if (bg_img == 0)
1721#endif 1730#endif
1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
… …
2118 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2119#else 2128#else
2120 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2121#endif 2130#endif
2122 2131
2123 if (focus && cursor_type != 2) 2132 if (focus && cursor_type == 0)
2124 { 2133 {
2125 rend_t rend = cur_rend; 2134 rend_t rend = cur_rend;
2126 2135
2127 if (cursor_type == 1)
2128 rend ^= RS_Uline;
2129 else
2130 {
2131 rend ^= RS_RVid; 2136 rend ^= RS_RVid;
2132 rend = SET_FGCOLOR (rend, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2133 rend = SET_BGCOLOR (rend, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2134 }
2135 2139
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2137 } 2141 }
2138 } 2142 }
2139 2143
2140 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2141 if (ocrow != -1) 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2142 {
2143 if (screen.cur.row - view_start != ocrow
2144 || screen.cur.col != oldcursor.col || !showcursor)
2145 {
2146 if (ocrow < nrow
2147 && oldcursor.col < ncol)
2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2149 }
2150 }
2151 2147
2152 // save the current cursor coordinates if the cursor is visible 2148 // save the current cursor coordinates if the cursor is visible
2153 // and either the window is unfocused or the cursor style is 2149 // and either the window is unfocused or the cursor style is
2154 // vertical bar, so as to clear the outline cursor in the next 2150 // underline or vertical bar, so as to clear the outline cursor in
2155 // refresh if the cursor moves or becomes invisible 2151 // the next refresh if the cursor moves or becomes invisible
2156 if (showcursor && (!focus || cursor_type == 2) && screen.cur.row - view_start < nrow) 2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2157 { 2153 {
2158 oldcursor.row = screen.cur.row - view_start; 2154 oldcursor.row = screen.cur.row - view_start;
2159 oldcursor.col = screen.cur.col; 2155 oldcursor.col = screen.cur.col;
2160 } 2156 }
2161 else 2157 else
… …
2455 */ 2451 */
2456 if (showcursor) 2452 if (showcursor)
2457 { 2453 {
2458 if (focus) 2454 if (focus)
2459 { 2455 {
2460 if (cursor_type != 2) 2456 if (cursor_type == 0)
2461 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);
2462 else if (oldcursor.row >= 0) 2458 else if (oldcursor.row >= 0)
2463 { 2459 {
2464 XSetForeground (dpy, gc, pix_colors[ccol1]); 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 if (cursor_type == 1)
2465 XFillRectangle (dpy, vt, gc, 2462 XFillRectangle (dpy, vt, gc,
2466 Col2Pixel (cur_col), 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),
2467 Row2Pixel (oldcursor.row), 2470 Row2Pixel (oldcursor.row),
2468 1, 2471 2,
2469 Height2Pixel (1)); 2472 Height2Pixel (1));
2470 } 2473 }
2471 } 2474 }
2472 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2473 { 2476 {
2474 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
… …
2520 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2521 } 2524 }
2522} 2525}
2523 2526
2524void ecb_cold 2527void ecb_cold
2525rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) NOTHROW
2526{ 2529{
2527 bool transparent = false; 2530 bool transparent = false;
2528 2531
2529#ifdef HAVE_IMG 2532#ifdef HAVE_IMG
2530 if (bg_img != 0) 2533 if (bg_img != 0)
… …
2551 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2552 } 2555 }
2553 2556
2554 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2555 2558
2556 if (scrollBar.state) 2559 if (scrollBar.state && scrollBar.win)
2557 { 2560 {
2558 if (transparent) 2561 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else 2563 else
2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
3497 cl = selection.clip_text; 3500 cl = selection.clip_text;
3498 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3499 } 3502 }
3500 else 3503 else
3501 { 3504 {
3502 cl = L""; 3505 cl = (wchar_t *)L"";
3503 selectlen = 0; 3506 selectlen = 0;
3504 } 3507 }
3505 3508
3506#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3507 // 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