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.421 by sf-exg, Sun Jun 10 13:07:56 2012 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
… …
150 l.r[col] = rend; 151 l.r[col] = rend;
151 col++; 152 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
… …
169 tsize -= tsize % sizeof (rend_t); 180 tsize -= tsize % sizeof (rend_t);
170 181
171 int all_rows = total_rows + nrow + nrow; 182 int all_rows = total_rows + nrow + nrow;
172 183
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 185 chunk = chunk_alloc (chunk_size, 0);
175 186
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 188
178 for (int row = 0; row < all_rows; ++row) 189 for (int row = 0; row < all_rows; ++row)
179 { 190 {
… …
188 drawn_buf = (line_t *)chunk; 199 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 200 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 201 row_buf = swap_buf + nrow;
191} 202}
192 203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
193void ecb_cold 214void ecb_cold
194rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
195{ 216{
196#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
197 scr_overlay_off (); 218 scr_overlay_off ();
… …
225 246
226 screen.tscroll = 0; 247 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
228 249
229 void *prev_chunk = chunk; 250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 252 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 253 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 254 line_t *prev_row_buf = row_buf;
233 255
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 256 scr_alloc ();
237 257
238 if (!prev_row_buf) 258 if (!prev_row_buf)
239 { 259 {
240 /*
241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
242 */
243 top_row = 0; 260 top_row = 0;
244 term_start = 0; 261 term_start = 0;
245 262
246 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
247 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
… …
272 { 289 {
273 /* 290 /*
274 * add or delete rows as appropriate 291 * add or delete rows as appropriate
275 */ 292 */
276 293
294 int common_col = min (prev_ncol, ncol);
295
277 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
278 { 297 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 301
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 302 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 303 }
287 304
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
386 { 403 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 405 line_t &dst = row_buf [row];
389 406
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 407 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 408 }
395 409
396 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 412
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 425 }
412 426
413 free (prev_chunk); 427 chunk_free (prev_chunk, prev_chunk_size);
414 428
415 free (tabs); 429 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
417 431
418 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
… …
429} 443}
430 444
431void ecb_cold 445void ecb_cold
432rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
433{ 447{
434 free (chunk); chunk = 0; row_buf = 0; 448 chunk_free (chunk, chunk_size);
435 free (tabs); tabs = 0; 449 chunk = 0;
450 row_buf = 0;
451
452 free (tabs);
453 tabs = 0;
436} 454}
437 455
438/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
439/* 457/*
440 * Hard/Soft reset 458 * Hard/Soft reset
… …
597 * Change the colour for following text 615 * Change the colour for following text
598 */ 616 */
599void 617void
600rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
601{ 619{
602 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
603 color = fgbg; 621 color = fgbg;
604 622
605 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
606 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
607 else 625 else
… …
698 716
699 // finally move the view window, if desired 717 // finally move the view window, if desired
700 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
701 && view_start != 0 719 && view_start != 0
702 && view_start != -saveLines) 720 && view_start != -saveLines)
703 scr_page (UP, count); 721 scr_page (count);
704 722
705 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
706 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));
707 } 725 }
708 else 726 else
… …
994 } 1012 }
995 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
996 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
997 { 1015 {
998 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
999 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1000 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1001 } 1019 }
1002 else 1020 else
1003 continue; 1021 continue;
1004 1022
1005 linep->touch (); 1023 linep->touch ();
… …
1223 * direction should be UP or DN 1241 * direction should be UP or DN
1224 */ 1242 */
1225void 1243void
1226rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1227{ 1245{
1228 int dirn;
1229
1230 want_refresh = 1; 1246 want_refresh = 1;
1231 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1232 1248
1233 dirn = ((direction == UP) ? 1 : -1);
1234
1235 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1236 1250
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1240 else 1254 else
1241 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1242 1256
1243 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1244 selection_check (0); 1258 selection_check (0);
1245} 1259}
1246 1260
… …
1700 1714
1701 if (rvideo_state != on) 1715 if (rvideo_state != on)
1702 { 1716 {
1703 rvideo_state = on; 1717 rvideo_state = on;
1704 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
1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1706#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1707 if (bg_img == 0) 1729 if (bg_img == 0)
1708#endif 1730#endif
1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1710 1732
1711 XGCValues gcvalue; 1733 XGCValues gcvalue;
… …
1884 * the top of the screen 1906 * the top of the screen
1885 */ 1907 */
1886void 1908void
1887rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) NOTHROW
1888{ 1910{
1889 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);
1890} 1913}
1891 1914
1892/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1893/* 1916/*
1894 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1895 * direction should be UP or DN 1918 * direction should be UP or DN
1896 */ 1919 */
1897bool 1920bool
1898rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) NOTHROW
1899{ 1922{
1900 int new_view_start =
1901 direction == UP ? view_start - nlines
1902 : view_start + nlines;
1903
1904 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1905} 1924}
1906 1925
1907bool 1926bool
1908rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) NOTHROW
1909{ 1928{
… …
2027rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () NOTHROW
2028{ 2047{
2029 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2030 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2031 int i; /* tmp */ 2050 int i; /* tmp */
2032#ifndef NO_CURSORCOLOR
2033 rend_t cc1; /* store colours at cursor position (s) */
2034#endif
2035 rend_t *crp; // cursor rendition pointer
2036 rend_t ccol1, /* Cursor colour */ 2051 rend_t ccol1, /* Cursor colour */
2037 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2038 2056
2039 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2040 2058
2041 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2042 return; 2060 return;
… …
2046 */ 2064 */
2047 refresh_count = 0; 2065 refresh_count = 0;
2048 2066
2049 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2050 bool have_bg = 0; 2068 bool have_bg = 0;
2051#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2052 have_bg = bg_img != 0; 2070 have_bg = bg_img != 0;
2053#endif 2071#endif
2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2055 2073
2056 /* 2074 /*
… …
2067 2085
2068 /* 2086 /*
2069 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2070 */ 2088 */
2071 { 2089 {
2072 bool setoldcursor;
2073
2074#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2075 if (hidden_cursor) 2091 if (hidden_cursor)
2076 showcursor = 0; 2092 showcursor = 0;
2077#endif 2093#endif
2078 2094
… …
2081 int col = screen.cur.col; 2097 int col = screen.cur.col;
2082 2098
2083 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2084 col--; 2100 col--;
2085 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2086 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2087 2109
2088#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2089 cc1 = *crp & (RS_fgMask | RS_bgMask);
2090 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2091 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2092 else 2113 else
2093#endif 2114#endif
2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2106 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2107#else 2128#else
2108 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2109#endif 2130#endif
2110 2131
2111 if (focus) 2132 if (focus && cursor_type == 0)
2112 { 2133 {
2113 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2114 *crp ^= RS_Uline; 2135
2115 else
2116 {
2117 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2118 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2119 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2120 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2121 } 2141 }
2122 } 2142 }
2123 2143
2124 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2125 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2126 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
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
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2127 { 2153 {
2128 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2129 || screen.cur.col != oldcursor.col) 2155 oldcursor.col = screen.cur.col;
2130 {
2131 if (ocrow < nrow
2132 && oldcursor.col < ncol)
2133 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2134
2135 if (focus || !showcursor)
2136 oldcursor.row = -1;
2137 else
2138 setoldcursor = 1;
2139 }
2140 } 2156 }
2141 else if (!focus) 2157 else
2142 setoldcursor = 1;
2143
2144 if (setoldcursor)
2145 {
2146 if (screen.cur.row - view_start >= nrow)
2147 oldcursor.row = -1; 2158 oldcursor.row = -1;
2148 else
2149 {
2150 oldcursor.row = screen.cur.row - view_start;
2151 oldcursor.col = screen.cur.col;
2152 }
2153 }
2154 } 2159 }
2155 2160
2156#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2157 /* 2162 /*
2158 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2239 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2240 2245
2241 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2242 { 2247 {
2243 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2244 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2245 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2246 || (stp[col] == ' ' /* space w/ no background change */
2247 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2248 continue; 2250 continue;
2249 2251
2250 // redraw one or more characters 2252 // redraw one or more characters
2251 2253
2252 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2424 else 2426 else
2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2426 2428
2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2428 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2429#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2430 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2431 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2432 else 2438 else
2433#endif 2439#endif
… …
2445 */ 2451 */
2446 if (showcursor) 2452 if (showcursor)
2447 { 2453 {
2448 if (focus) 2454 if (focus)
2449 { 2455 {
2450 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2451 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2452 else 2458 else if (oldcursor.row >= 0)
2453 { 2459 {
2454 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2455#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2456 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2457#endif 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));
2458 } 2473 }
2459 } 2474 }
2460 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2461 { 2476 {
2462 int cursorwidth = 1;
2463 int col = oldcursor.col;
2464
2465 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2466 col--;
2467
2468 while (col + cursorwidth < ncol
2469 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2470 cursorwidth++;
2471
2472#ifndef NO_CURSORCOLOR
2473 if (ISSET_PIXCOLOR (Color_cursor))
2474 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2475 else
2476#endif
2477 XSetForeground (dpy, gc, pix_colors[ccol1]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2478 2478
2479 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2480 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2481 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2482 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2483 (unsigned int) (Height2Pixel (1) - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2484 } 2484 }
2485 } 2485 }
… …
2523 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2524 } 2524 }
2525} 2525}
2526 2526
2527void ecb_cold 2527void ecb_cold
2528rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolor (bool refresh) NOTHROW
2529{ 2529{
2530 bool transparent = false; 2530 bool transparent = false;
2531 2531
2532#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_IMG
2533 if (bg_img != 0) 2533 if (bg_img != 0)
2534 { 2534 {
2535# if ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 { 2537 {
… …
2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 } 2555 }
2556 2556
2557 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2558 2558
2559 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2560 { 2560 {
2561 if (transparent) 2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else 2563 else
2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2565 scrollBar.state = SB_STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2566 scrollBar.show (0); 2566 scrollBar.show (0);
2567 } 2567 }
2568 2568
2569 if (refresh) 2569 if (refresh)
… …
2686 || (check_more == 1 2686 || (check_more == 1
2687 && current_screen == selection.screen 2687 && current_screen == selection.screen
2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2690 CLEAR_ALL_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () NOTHROW
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2691} 2705}
2692 2706
2693/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2694/* 2708/*
2695 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
… …
2998 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
2999 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3000 */ 3014 */
3001 3015
3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3003#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3005#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3006 3020
3007void ecb_cold 3021void ecb_cold
3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3129{ 3143{
3130 row_col_t pos; 3144 row_col_t pos;
3131 enum { 3145 enum {
3132 LEFT, RIGHT 3146 LEFT, RIGHT
3133 } closeto = RIGHT; 3147 } closeto = RIGHT;
3134
3135 want_refresh = 1;
3136 3148
3137 switch (selection.op) 3149 switch (selection.op)
3138 { 3150 {
3139 case SELECTION_INIT: 3151 case SELECTION_INIT:
3140 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
… …
3320 3332
3321#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3322 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3323 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3324#endif 3336#endif
3337
3338 selection_changed ();
3325} 3339}
3326 3340
3327#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3328void ecb_cold 3342void ecb_cold
3329rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () NOTHROW
… …
3486 cl = selection.clip_text; 3500 cl = selection.clip_text;
3487 selectlen = selection.clip_len; 3501 selectlen = selection.clip_len;
3488 } 3502 }
3489 else 3503 else
3490 { 3504 {
3491 cl = L""; 3505 cl = (wchar_t *)L"";
3492 selectlen = 0; 3506 selectlen = 0;
3493 } 3507 }
3494 3508
3495#if !ENABLE_MINIMAL 3509#if !ENABLE_MINIMAL
3496 // 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