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.445 by sf-exg, Fri Apr 12 07:54:15 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
… …
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 ();
… …
2118 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2119#else 2120#else
2120 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2121#endif 2122#endif
2122 2123
2123 if (focus) 2124 if (focus && cursor_type == 0)
2124 { 2125 {
2125 rend_t rend = cur_rend; 2126 rend_t rend = cur_rend;
2126 2127
2127 if (option (Opt_cursorUnderline))
2128 rend ^= RS_Uline;
2129 else
2130 {
2131 rend ^= RS_RVid; 2128 rend ^= RS_RVid;
2132 rend = SET_FGCOLOR (rend, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2133 rend = SET_BGCOLOR (rend, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2134 }
2135 2131
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); 2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2137 } 2133 }
2138 } 2134 }
2139 2135
2140 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2141 if (ocrow != -1) 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2142 {
2143 if (screen.cur.row - view_start != ocrow
2144 || screen.cur.col != oldcursor.col)
2145 {
2146 if (ocrow < nrow
2147 && oldcursor.col < ncol)
2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2149 }
2150 }
2151 2139
2152 // save the current cursor coordinates if the cursor is visible 2140 // save the current cursor coordinates if the cursor is visible
2153 // 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
2154 // in the next refresh if the cursor moves 2143 // the next refresh if the cursor moves or becomes invisible
2155 if (showcursor && !focus && screen.cur.row - view_start < nrow) 2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2156 { 2145 {
2157 oldcursor.row = screen.cur.row - view_start; 2146 oldcursor.row = screen.cur.row - view_start;
2158 oldcursor.col = screen.cur.col; 2147 oldcursor.col = screen.cur.col;
2159 } 2148 }
2160 else 2149 else
… …
2247 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2248 2237
2249 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2250 { 2239 {
2251 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2252 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2253 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2254 || (stp[col] == ' ' /* space w/ no background change */
2255 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2256 continue; 2242 continue;
2257 2243
2258 // redraw one or more characters 2244 // redraw one or more characters
2259 2245
2260 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
… …
2456 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2457 */ 2443 */
2458 if (showcursor) 2444 if (showcursor)
2459 { 2445 {
2460 if (focus) 2446 if (focus)
2447 {
2448 if (cursor_type == 0)
2461 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 }
2462 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2463 { 2468 {
2464 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2465 2470
2466 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
… …
2510 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2511 } 2516 }
2512} 2517}
2513 2518
2514void ecb_cold 2519void ecb_cold
2515rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2516{ 2521{
2517 bool transparent = false; 2522 bool transparent = false;
2518 2523
2519#ifdef HAVE_IMG 2524#ifdef HAVE_IMG
2520 if (bg_img != 0) 2525 if (bg_img != 0)
… …
2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 } 2547 }
2543 2548
2544 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2545 2550
2546 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2547 { 2552 {
2548 if (transparent) 2553 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else 2555 else
2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);

Diff Legend

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