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.429 by root, Sun Jan 13 20:11:21 2013 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 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
… …
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 ();
… …
230 size_t prev_chunk_size = chunk_size; 251 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf; 252 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf; 253 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf; 254 line_t *prev_row_buf = row_buf;
234 255
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc (); 256 scr_alloc ();
238 257
239 if (!prev_row_buf) 258 if (!prev_row_buf)
240 { 259 {
241 /*
242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
243 */
244 top_row = 0; 260 top_row = 0;
245 term_start = 0; 261 term_start = 0;
246 262
247 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
248 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
… …
273 { 289 {
274 /* 290 /*
275 * add or delete rows as appropriate 291 * add or delete rows as appropriate
276 */ 292 */
277 293
294 int common_col = min (prev_ncol, ncol);
295
278 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
279 { 297 {
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
282
283 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);
284 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);
285 301
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = prev_swap_buf [row].l; 302 copy_line (swap_buf [row], prev_swap_buf [row]);
289 } 303 }
290 304
291 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
292 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
293 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
… …
388 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
389 { 403 {
390 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)];
391 line_t &dst = row_buf [row]; 405 line_t &dst = row_buf [row];
392 406
393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 407 copy_line (dst, src);
394
395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
396 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397 dst.l = common_col;
398 } 408 }
399 409
400 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
402 412
… …
706 716
707 // finally move the view window, if desired 717 // finally move the view window, if desired
708 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
709 && view_start != 0 719 && view_start != 0
710 && view_start != -saveLines) 720 && view_start != -saveLines)
711 scr_page (UP, count); 721 scr_page (count);
712 722
713 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
714 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));
715 } 725 }
716 else 726 else
… …
1002 } 1012 }
1003 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1004 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1005 { 1015 {
1006 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1007 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1008 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1009 } 1019 }
1010 else 1020 else
1011 continue; 1021 continue;
1012 1022
1013 linep->touch (); 1023 linep->touch ();
… …
1231 * direction should be UP or DN 1241 * direction should be UP or DN
1232 */ 1242 */
1233void 1243void
1234rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1235{ 1245{
1236 int dirn;
1237
1238 want_refresh = 1; 1246 want_refresh = 1;
1239 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1240 1248
1241 dirn = ((direction == UP) ? 1 : -1);
1242
1243 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1244 1250
1245 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1246 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1247 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1248 else 1254 else
1249 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1250 1256
1251 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1252 selection_check (0); 1258 selection_check (0);
1253} 1259}
1254 1260
… …
1892 * the top of the screen 1898 * the top of the screen
1893 */ 1899 */
1894void 1900void
1895rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1896{ 1902{
1897 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1903 // lerp (y, 0, len, top_row, nrow - 1)
1904 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1898} 1905}
1899 1906
1900/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1901/* 1908/*
1902 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1903 * direction should be UP or DN 1910 * direction should be UP or DN
1904 */ 1911 */
1905bool 1912bool
1906rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1907{ 1914{
1908 int new_view_start =
1909 direction == UP ? view_start - nlines
1910 : view_start + nlines;
1911
1912 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1913} 1916}
1914 1917
1915bool 1918bool
1916rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1917{ 1920{
… …
2035rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2036{ 2039{
2037 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2038 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2039 int i; /* tmp */ 2042 int i; /* tmp */
2040#ifndef NO_CURSORCOLOR
2041 rend_t cc1; /* store colours at cursor position (s) */
2042#endif
2043 rend_t *crp; // cursor rendition pointer
2044 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2045 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2046 2048
2047 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2048 2050
2049 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2050 return; 2052 return;
… …
2075 2077
2076 /* 2078 /*
2077 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2078 */ 2080 */
2079 { 2081 {
2080 bool setoldcursor;
2081
2082#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2083 if (hidden_cursor) 2083 if (hidden_cursor)
2084 showcursor = 0; 2084 showcursor = 0;
2085#endif 2085#endif
2086 2086
… …
2089 int col = screen.cur.col; 2089 int col = screen.cur.col;
2090 2090
2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2092 col--; 2092 col--;
2093 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2094 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2095 2101
2096#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2097 cc1 = *crp & (RS_fgMask | RS_bgMask);
2098 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2099 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2100 else 2105 else
2101#endif 2106#endif
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2114 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2115#else 2120#else
2116 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2117#endif 2122#endif
2118 2123
2119 if (focus) 2124 if (focus && cursor_type == 0)
2120 { 2125 {
2121 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2122 *crp ^= RS_Uline; 2127
2123 else
2124 {
2125 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2126 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2127 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2128 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2129 } 2133 }
2130 } 2134 }
2131 2135
2132 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2133 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2134 if (ocrow != -1) 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 // save the current cursor coordinates if the cursor is visible
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
2143 // the next refresh if the cursor moves or becomes invisible
2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2135 { 2145 {
2136 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2137 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2138 {
2139 if (ocrow < nrow
2140 && oldcursor.col < ncol)
2141 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2142
2143 if (focus || !showcursor)
2144 oldcursor.row = -1;
2145 else
2146 setoldcursor = 1;
2147 }
2148 } 2148 }
2149 else if (!focus) 2149 else
2150 setoldcursor = 1;
2151
2152 if (setoldcursor)
2153 {
2154 if (screen.cur.row - view_start >= nrow)
2155 oldcursor.row = -1; 2150 oldcursor.row = -1;
2156 else
2157 {
2158 oldcursor.row = screen.cur.row - view_start;
2159 oldcursor.col = screen.cur.col;
2160 }
2161 }
2162 } 2151 }
2163 2152
2164#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2165 /* 2154 /*
2166 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
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
… …
2432 else 2418 else
2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2434 2420
2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2436 { 2422 {
2423 if (showcursor && focus && row == screen.cur.row
2424 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 else
2437#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2438 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2439 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2440 else 2430 else
2441#endif 2431#endif
… …
2453 */ 2443 */
2454 if (showcursor) 2444 if (showcursor)
2455 { 2445 {
2456 if (focus) 2446 if (focus)
2457 { 2447 {
2458 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2459 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2460 else 2450 else if (oldcursor.row >= 0)
2461 { 2451 {
2462 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2463#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2464 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2465#endif 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));
2466 } 2465 }
2467 } 2466 }
2468 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2469 { 2468 {
2470 int cursorwidth = 1;
2471 int col = oldcursor.col;
2472
2473 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2474 col--;
2475
2476 while (col + cursorwidth < ncol
2477 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2478 cursorwidth++;
2479
2480#ifndef NO_CURSORCOLOR
2481 if (ISSET_PIXCOLOR (Color_cursor))
2482 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2483 else
2484#endif
2485 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2486 2470
2487 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2488 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2489 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2490 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2491 (unsigned int) (Height2Pixel (1) - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2492 } 2476 }
2493 } 2477 }
… …
2531 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2532 } 2516 }
2533} 2517}
2534 2518
2535void ecb_cold 2519void ecb_cold
2536rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2537{ 2521{
2538 bool transparent = false; 2522 bool transparent = false;
2539 2523
2540#ifdef HAVE_IMG 2524#ifdef HAVE_IMG
2541 if (bg_img != 0) 2525 if (bg_img != 0)
… …
2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 } 2547 }
2564 2548
2565 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2566 2550
2567 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2568 { 2552 {
2569 if (transparent) 2553 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else 2555 else
2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
… …
2694 || (check_more == 1 2678 || (check_more == 1
2695 && current_screen == selection.screen 2679 && current_screen == selection.screen
2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2698 CLEAR_ALL_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2683}
2684
2685void
2686rxvt_term::selection_changed () NOTHROW
2687{
2688 line_t &r1 = ROW (selection.beg.row);
2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2690 ++selection.beg.col;
2691
2692 line_t &r2 = ROW (selection.end.row);
2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2694 ++selection.end.col;
2695
2696 want_refresh = 1;
2699} 2697}
2700 2698
2701/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2702/* 2700/*
2703 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
3006 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3007 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3008 */ 3006 */
3009 3007
3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3011#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3013#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3014 3012
3015void ecb_cold 3013void ecb_cold
3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3137{ 3135{
3138 row_col_t pos; 3136 row_col_t pos;
3139 enum { 3137 enum {
3140 LEFT, RIGHT 3138 LEFT, RIGHT
3141 } closeto = RIGHT; 3139 } closeto = RIGHT;
3142
3143 want_refresh = 1;
3144 3140
3145 switch (selection.op) 3141 switch (selection.op)
3146 { 3142 {
3147 case SELECTION_INIT: 3143 case SELECTION_INIT:
3148 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3328 3324
3329#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3330 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3331 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3332#endif 3328#endif
3329
3330 selection_changed ();
3333} 3331}
3334 3332
3335#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3336void ecb_cold 3334void ecb_cold
3337rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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