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.449 by sf-exg, Wed Nov 19 12:21:11 2014 UTC

… …
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 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * 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 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
150 l.r[col] = rend; 150 l.r[col] = rend;
151 col++; 151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
155/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
158 168
159void 169void
… …
169 tsize -= tsize % sizeof (rend_t); 179 tsize -= tsize % sizeof (rend_t);
170 180
171 int all_rows = total_rows + nrow + nrow; 181 int all_rows = total_rows + nrow + nrow;
172 182
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 184 chunk = chunk_alloc (chunk_size, 0);
175 185
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 187
178 for (int row = 0; row < all_rows; ++row) 188 for (int row = 0; row < all_rows; ++row)
179 { 189 {
… …
188 drawn_buf = (line_t *)chunk; 198 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow; 199 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 200 row_buf = swap_buf + nrow;
191} 201}
192 202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
193void ecb_cold 213void ecb_cold
194rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
195{ 215{
196#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
197 scr_overlay_off (); 217 scr_overlay_off ();
… …
225 245
226 screen.tscroll = 0; 246 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
228 248
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
233 254
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 255 scr_alloc ();
237 256
238 if (!prev_row_buf) 257 if (!prev_row_buf)
239 { 258 {
240 /*
241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
242 */
243 top_row = 0; 259 top_row = 0;
244 term_start = 0; 260 term_start = 0;
245 261
246 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
247 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
… …
272 { 288 {
273 /* 289 /*
274 * add or delete rows as appropriate 290 * add or delete rows as appropriate
275 */ 291 */
276 292
293 int common_col = min (prev_ncol, ncol);
294
277 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
278 { 296 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 297 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); 298 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); 299 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); 300
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 301 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 302 }
287 303
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
386 { 402 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
389 405
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 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 } 407 }
395 408
396 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 411
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 421 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); 422 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); 423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 424 }
412 425
413 free (prev_chunk); 426 chunk_free (prev_chunk, prev_chunk_size);
414 427
415 free (tabs); 428 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
417 430
418 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
… …
429} 442}
430 443
431void ecb_cold 444void ecb_cold
432rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
433{ 446{
434 free (chunk); chunk = 0; row_buf = 0; 447 chunk_free (chunk, chunk_size);
435 free (tabs); tabs = 0; 448 chunk = 0;
449 row_buf = 0;
450
451 free (tabs);
452 tabs = 0;
436} 453}
437 454
438/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
439/* 456/*
440 * Hard/Soft reset 457 * Hard/Soft reset
… …
698 715
699 // finally move the view window, if desired 716 // finally move the view window, if desired
700 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
701 && view_start != 0 718 && view_start != 0
702 && view_start != -saveLines) 719 && view_start != -saveLines)
703 scr_page (UP, count); 720 scr_page (count);
704 721
705 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
706 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
707 } 724 }
708 else 725 else
… …
1223 * direction should be UP or DN 1240 * direction should be UP or DN
1224 */ 1241 */
1225void 1242void
1226rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1227{ 1244{
1228 int dirn;
1229
1230 want_refresh = 1; 1245 want_refresh = 1;
1231 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1232 1247
1233 dirn = ((direction == UP) ? 1 : -1);
1234
1235 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1236 1249
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1240 else 1253 else
1241 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1242 1255
1243 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1244 selection_check (0); 1257 selection_check (0);
1245} 1258}
1246 1259
… …
1701 if (rvideo_state != on) 1714 if (rvideo_state != on)
1702 { 1715 {
1703 rvideo_state = on; 1716 rvideo_state = on;
1704 1717
1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1706#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1707 if (bg_img == 0) 1720 if (bg_img == 0)
1708#endif 1721#endif
1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1710 1723
1711 XGCValues gcvalue; 1724 XGCValues gcvalue;
… …
1884 * the top of the screen 1897 * the top of the screen
1885 */ 1898 */
1886void 1899void
1887rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1888{ 1901{
1889 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1902 // lerp (y, 0, len, top_row, nrow - 1)
1903 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1890} 1904}
1891 1905
1892/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1893/* 1907/*
1894 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1895 * direction should be UP or DN 1909 * direction should be UP or DN
1896 */ 1910 */
1897bool 1911bool
1898rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1912rxvt_term::scr_page (int nlines) NOTHROW
1899{ 1913{
1900 int new_view_start =
1901 direction == UP ? view_start - nlines
1902 : view_start + nlines;
1903
1904 return scr_changeview (new_view_start); 1914 return scr_changeview (view_start - nlines);
1905} 1915}
1906 1916
1907bool 1917bool
1908rxvt_term::scr_changeview (int new_view_start) NOTHROW 1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1909{ 1919{
… …
2027rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2028{ 2038{
2029 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2030 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2031 int i; /* tmp */ 2041 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 */ 2042 rend_t ccol1, /* Cursor colour */
2037 ccol2; /* Cursor colour2 */ 2043 ccol2; /* Cursor colour2 */
2044 rend_t cur_rend;
2045 int cur_col;
2046 int cursorwidth;
2038 2047
2039 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
2040 2049
2041 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
2042 return; 2051 return;
… …
2046 */ 2055 */
2047 refresh_count = 0; 2056 refresh_count = 0;
2048 2057
2049 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2050 bool have_bg = 0; 2059 bool have_bg = 0;
2051#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2052 have_bg = bg_img != 0; 2061 have_bg = bg_img != 0;
2053#endif 2062#endif
2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2055 2064
2056 /* 2065 /*
… …
2067 2076
2068 /* 2077 /*
2069 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2070 */ 2079 */
2071 { 2080 {
2072 bool setoldcursor;
2073
2074#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
2075 if (hidden_cursor) 2082 if (hidden_cursor)
2076 showcursor = 0; 2083 showcursor = 0;
2077#endif 2084#endif
2078 2085
… …
2081 int col = screen.cur.col; 2088 int col = screen.cur.col;
2082 2089
2083 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2084 col--; 2091 col--;
2085 2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2097
2086 crp = &ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2099 cur_col = col;
2087 2100
2088#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2089 cc1 = *crp & (RS_fgMask | RS_bgMask);
2090 if (ISSET_PIXCOLOR (Color_cursor)) 2102 if (ISSET_PIXCOLOR (Color_cursor))
2091 ccol1 = Color_cursor; 2103 ccol1 = Color_cursor;
2092 else 2104 else
2093#endif 2105#endif
2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2106 ccol2 = bgcolor_of (rstyle); 2118 ccol2 = bgcolor_of (rstyle);
2107#else 2119#else
2108 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2109#endif 2121#endif
2110 2122
2111 if (focus) 2123 if (focus && cursor_type != 2)
2112 { 2124 {
2113 if (option (Opt_cursorUnderline)) 2125 rend_t rend = cur_rend;
2126
2127 if (cursor_type == 1)
2114 *crp ^= RS_Uline; 2128 rend ^= RS_Uline;
2115 else 2129 else
2116 { 2130 {
2117 *crp ^= RS_RVid; 2131 rend ^= RS_RVid;
2118 *crp = SET_FGCOLOR (*crp, ccol1); 2132 rend = SET_FGCOLOR (rend, ccol1);
2119 *crp = SET_BGCOLOR (*crp, ccol2); 2133 rend = SET_BGCOLOR (rend, ccol2);
2120 } 2134 }
2135
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2121 } 2137 }
2122 } 2138 }
2123 2139
2124 /* make sure no outline cursor is left around */ 2140 /* make sure no outline cursor is left around */
2125 setoldcursor = 0;
2126 if (ocrow != -1) 2141 if (ocrow != -1)
2127 { 2142 {
2128 if (screen.cur.row - view_start != ocrow 2143 if (screen.cur.row - view_start != ocrow
2129 || screen.cur.col != oldcursor.col) 2144 || screen.cur.col != oldcursor.col || !showcursor)
2130 { 2145 {
2131 if (ocrow < nrow 2146 if (ocrow < nrow
2132 && oldcursor.col < ncol) 2147 && oldcursor.col < ncol)
2133 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2148 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 } 2149 }
2140 } 2150 }
2141 else if (!focus)
2142 setoldcursor = 1;
2143 2151
2144 if (setoldcursor) 2152 // save the current cursor coordinates if the cursor is visible
2153 // and either the window is unfocused or the cursor style is
2154 // vertical bar, so as to clear the outline cursor in the next
2155 // refresh if the cursor moves or becomes invisible
2156 if (showcursor && (!focus || cursor_type == 2) && screen.cur.row - view_start < nrow)
2145 { 2157 {
2146 if (screen.cur.row - view_start >= nrow)
2147 oldcursor.row = -1;
2148 else
2149 {
2150 oldcursor.row = screen.cur.row - view_start; 2158 oldcursor.row = screen.cur.row - view_start;
2151 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2152 }
2153 } 2160 }
2161 else
2162 oldcursor.row = -1;
2154 } 2163 }
2155 2164
2156#ifndef NO_SLOW_LINK_SUPPORT 2165#ifndef NO_SLOW_LINK_SUPPORT
2157 /* 2166 /*
2158 * D: CopyArea pass - very useful for slower links 2167 * D: CopyArea pass - very useful for slower links
… …
2239 int ypixel = (int)Row2Pixel (row); 2248 int ypixel = (int)Row2Pixel (row);
2240 2249
2241 for (col = 0; col < ncol; col++) 2250 for (col = 0; col < ncol; col++)
2242 { 2251 {
2243 /* compare new text with old - if exactly the same then continue */ 2252 /* compare new text with old - if exactly the same then continue */
2244 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2253 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; 2254 continue;
2249 2255
2250 // redraw one or more characters 2256 // redraw one or more characters
2251 2257
2252 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
… …
2424 else 2430 else
2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2426 2432
2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2428 { 2434 {
2435 if (showcursor && focus && row == screen.cur.row
2436 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2437 XSetForeground (dpy, gc, pix_colors[ccol1]);
2438 else
2429#if ENABLE_FRILLS 2439#if ENABLE_FRILLS
2430 if (ISSET_PIXCOLOR (Color_underline)) 2440 if (ISSET_PIXCOLOR (Color_underline))
2431 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2441 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2432 else 2442 else
2433#endif 2443#endif
… …
2445 */ 2455 */
2446 if (showcursor) 2456 if (showcursor)
2447 { 2457 {
2448 if (focus) 2458 if (focus)
2449 { 2459 {
2450 if (option (Opt_cursorUnderline)) 2460 if (cursor_type != 2)
2451 *crp ^= RS_Uline; 2461 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2452 else 2462 else if (oldcursor.row >= 0)
2453 { 2463 {
2454 *crp ^= RS_RVid; 2464 XSetForeground (dpy, gc, pix_colors[ccol1]);
2455#ifndef NO_CURSORCOLOR 2465 XFillRectangle (dpy, vt, gc,
2456 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2466 Col2Pixel (cur_col),
2457#endif 2467 Row2Pixel (oldcursor.row),
2468 1,
2469 Height2Pixel (1));
2458 } 2470 }
2459 } 2471 }
2460 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2461 { 2473 {
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]); 2474 XSetForeground (dpy, gc, pix_colors[ccol1]);
2478 2475
2479 XDrawRectangle (dpy, vt, gc, 2476 XDrawRectangle (dpy, vt, gc,
2480 Col2Pixel (col), 2477 Col2Pixel (cur_col),
2481 Row2Pixel (oldcursor.row), 2478 Row2Pixel (oldcursor.row),
2482 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2479 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2483 (unsigned int) (Height2Pixel (1) - 1)); 2480 (unsigned int) (Height2Pixel (1) - 1));
2484 } 2481 }
2485 } 2482 }
… …
2527void ecb_cold 2524void ecb_cold
2528rxvt_term::scr_recolour (bool refresh) NOTHROW 2525rxvt_term::scr_recolour (bool refresh) NOTHROW
2529{ 2526{
2530 bool transparent = false; 2527 bool transparent = false;
2531 2528
2532#ifdef HAVE_BG_PIXMAP 2529#ifdef HAVE_IMG
2533 if (bg_img != 0) 2530 if (bg_img != 0)
2534 { 2531 {
2535# if ENABLE_TRANSPARENCY 2532# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT) 2533 if (bg_flags & BG_IS_TRANSPARENT)
2537 { 2534 {
… …
2559 if (scrollBar.win) 2556 if (scrollBar.win)
2560 { 2557 {
2561 if (transparent) 2558 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else 2560 else
2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2565 scrollBar.state = SB_STATE_IDLE; 2562 scrollBar.state = SB_STATE_IDLE;
2566 scrollBar.show (0); 2563 scrollBar.show (0);
2567 } 2564 }
2568 2565
2569 if (refresh) 2566 if (refresh)
… …
2686 || (check_more == 1 2683 || (check_more == 1
2687 && current_screen == selection.screen 2684 && current_screen == selection.screen
2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2685 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2686 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2690 CLEAR_ALL_SELECTION (); 2687 CLEAR_ALL_SELECTION ();
2688}
2689
2690void
2691rxvt_term::selection_changed () NOTHROW
2692{
2693 line_t &r1 = ROW (selection.beg.row);
2694 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2695 ++selection.beg.col;
2696
2697 line_t &r2 = ROW (selection.end.row);
2698 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2699 ++selection.end.col;
2700
2701 want_refresh = 1;
2691} 2702}
2692 2703
2693/* ------------------------------------------------------------------------- */ 2704/* ------------------------------------------------------------------------- */
2694/* 2705/*
2695 * Paste a selection direct to the command fd 2706 * Paste a selection direct to the command fd
… …
2998 * Word select: select text for 2 clicks 3009 * Word select: select text for 2 clicks
2999 * We now only find out the boundary in one direction 3010 * We now only find out the boundary in one direction
3000 */ 3011 */
3001 3012
3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3013/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3003#define DELIMIT_TEXT(x) \ 3014#define DELIMIT_TEXT(x) \
3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3015 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3005#define DELIMIT_REND(x) 1 3016#define DELIMIT_REND(x) 1
3006 3017
3007void ecb_cold 3018void ecb_cold
3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3019rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3129{ 3140{
3130 row_col_t pos; 3141 row_col_t pos;
3131 enum { 3142 enum {
3132 LEFT, RIGHT 3143 LEFT, RIGHT
3133 } closeto = RIGHT; 3144 } closeto = RIGHT;
3134
3135 want_refresh = 1;
3136 3145
3137 switch (selection.op) 3146 switch (selection.op)
3138 { 3147 {
3139 case SELECTION_INIT: 3148 case SELECTION_INIT:
3140 CLEAR_SELECTION (); 3149 CLEAR_SELECTION ();
… …
3320 3329
3321#if !ENABLE_MINIMAL 3330#if !ENABLE_MINIMAL
3322 if (selection.rect && selection.beg.col > selection.end.col) 3331 if (selection.rect && selection.beg.col > selection.end.col)
3323 ::swap (selection.beg.col, selection.end.col); 3332 ::swap (selection.beg.col, selection.end.col);
3324#endif 3333#endif
3334
3335 selection_changed ();
3325} 3336}
3326 3337
3327#if !ENABLE_MINIMAL 3338#if !ENABLE_MINIMAL
3328void ecb_cold 3339void ecb_cold
3329rxvt_term::selection_remove_trailing_spaces () NOTHROW 3340rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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