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.418 by sf-exg, Mon May 28 21:13:36 2012 UTC vs.
Revision 1.440 by root, Wed Mar 27 17:24:16 2013 UTC

… …
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 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--; )
… …
426 tt_winch (); 439 tt_winch ();
427 440
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 442}
430 443
431/* ------------------------------------------------------------------------- */
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void ecb_cold 444void ecb_cold
436rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
437{ 446{
438 free (chunk); 447 chunk_free (chunk, chunk_size);
448 chunk = 0;
449 row_buf = 0;
450
439 free (tabs); 451 free (tabs);
452 tabs = 0;
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
… …
446void ecb_cold 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
450 463
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 465 rvideo_mode = false;
455 scr_soft_reset (); 466 scr_soft_reset ();
456 scr_reset (); 467 scr_reset ();
457 468
… …
704 715
705 // finally move the view window, if desired 716 // finally move the view window, if desired
706 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
707 && view_start != 0 718 && view_start != 0
708 && view_start != -saveLines) 719 && view_start != -saveLines)
709 scr_page (UP, count); 720 scr_page (count);
710 721
711 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
712 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));
713 } 724 }
714 else 725 else
… …
1707 if (rvideo_state != on) 1718 if (rvideo_state != on)
1708 { 1719 {
1709 rvideo_state = on; 1720 rvideo_state = on;
1710 1721
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1713 if (bg_pixmap == None) 1724 if (bg_img == 0)
1714#endif 1725#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1727
1717 XGCValues gcvalue; 1728 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1899/* 1910/*
1900 * Page the screen up/down nlines 1911 * Page the screen up/down nlines
1901 * direction should be UP or DN 1912 * direction should be UP or DN
1902 */ 1913 */
1903bool 1914bool
1904rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1915rxvt_term::scr_page (int nlines) NOTHROW
1905{ 1916{
1906 int new_view_start =
1907 direction == UP ? view_start - nlines
1908 : view_start + nlines;
1909
1910 return scr_changeview (new_view_start); 1917 return scr_changeview (view_start - nlines);
1911} 1918}
1912 1919
1913bool 1920bool
1914rxvt_term::scr_changeview (int new_view_start) NOTHROW 1921rxvt_term::scr_changeview (int new_view_start) NOTHROW
1915{ 1922{
… …
2033rxvt_term::scr_refresh () NOTHROW 2040rxvt_term::scr_refresh () NOTHROW
2034{ 2041{
2035 int16_t col, row, /* column/row we're processing */ 2042 int16_t col, row, /* column/row we're processing */
2036 ocrow; /* old cursor row */ 2043 ocrow; /* old cursor row */
2037 int i; /* tmp */ 2044 int i; /* tmp */
2038#ifndef NO_CURSORCOLOR
2039 rend_t cc1; /* store colours at cursor position (s) */
2040#endif
2041 rend_t *crp; // cursor rendition pointer
2042 rend_t ccol1, /* Cursor colour */ 2045 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */ 2046 ccol2; /* Cursor colour2 */
2047 rend_t cur_rend;
2048 int cur_col;
2049 int cursorwidth;
2044 2050
2045 want_refresh = 0; /* screen is current */ 2051 want_refresh = 0; /* screen is current */
2046 2052
2047 if (refresh_type == NO_REFRESH || !mapped) 2053 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2054 return;
… …
2052 */ 2058 */
2053 refresh_count = 0; 2059 refresh_count = 0;
2054 2060
2055 unsigned int old_screen_flags = screen.flags; 2061 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2062 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2063#ifdef HAVE_IMG
2058 have_bg = bg_pixmap != None; 2064 have_bg = bg_img != 0;
2059#endif 2065#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2067
2062 /* 2068 /*
2063 * B: reverse any characters which are selected 2069 * B: reverse any characters which are selected
… …
2073 2079
2074 /* 2080 /*
2075 * C: set the cursor character (s) 2081 * C: set the cursor character (s)
2076 */ 2082 */
2077 { 2083 {
2078 bool setoldcursor;
2079
2080#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2081 if (hidden_cursor) 2085 if (hidden_cursor)
2082 showcursor = 0; 2086 showcursor = 0;
2083#endif 2087#endif
2084 2088
… …
2087 int col = screen.cur.col; 2091 int col = screen.cur.col;
2088 2092
2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2093 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2094 col--;
2091 2095
2096 cursorwidth = 1;
2097 while (col + cursorwidth < ncol
2098 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2099 cursorwidth++;
2100
2092 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2093 2103
2094#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2098 else 2107 else
2099#endif 2108#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2114 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2115#endif 2124#endif
2116 2125
2117 if (focus) 2126 if (focus)
2118 { 2127 {
2128 rend_t rend = cur_rend;
2129
2119 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2120 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2121 else 2132 else
2122 { 2133 {
2123 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2124 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2125 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2126 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127 } 2140 }
2128 } 2141 }
2129 2142
2130 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2131 setoldcursor = 0;
2132 if (ocrow != -1) 2144 if (ocrow != -1)
2133 { 2145 {
2134 if (screen.cur.row - view_start != ocrow 2146 if (screen.cur.row - view_start != ocrow
2135 || screen.cur.col != oldcursor.col) 2147 || screen.cur.col != oldcursor.col)
2136 { 2148 {
2137 if (ocrow < nrow 2149 if (ocrow < nrow
2138 && oldcursor.col < ncol) 2150 && oldcursor.col < ncol)
2139 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2151 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140
2141 if (focus || !showcursor)
2142 oldcursor.row = -1;
2143 else
2144 setoldcursor = 1;
2145 } 2152 }
2146 } 2153 }
2147 else if (!focus)
2148 setoldcursor = 1;
2149 2154
2150 if (setoldcursor) 2155 // save the current cursor coordinates if the cursor is visible
2156 // and the window is unfocused, so as to clear the outline cursor
2157 // in the next refresh if the cursor moves
2158 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2151 { 2159 {
2152 if (screen.cur.row - view_start >= nrow)
2153 oldcursor.row = -1;
2154 else
2155 {
2156 oldcursor.row = screen.cur.row - view_start; 2160 oldcursor.row = screen.cur.row - view_start;
2157 oldcursor.col = screen.cur.col; 2161 oldcursor.col = screen.cur.col;
2158 }
2159 } 2162 }
2163 else
2164 oldcursor.row = -1;
2160 } 2165 }
2161 2166
2162#ifndef NO_SLOW_LINK_SUPPORT 2167#ifndef NO_SLOW_LINK_SUPPORT
2163 /* 2168 /*
2164 * D: CopyArea pass - very useful for slower links 2169 * D: CopyArea pass - very useful for slower links
… …
2430 else 2435 else
2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2436 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432 2437
2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2438 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434 { 2439 {
2440 if (showcursor && focus && row == screen.cur.row
2441 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2442 XSetForeground (dpy, gc, pix_colors[ccol1]);
2443 else
2435#if ENABLE_FRILLS 2444#if ENABLE_FRILLS
2436 if (ISSET_PIXCOLOR (Color_underline)) 2445 if (ISSET_PIXCOLOR (Color_underline))
2437 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2446 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438 else 2447 else
2439#endif 2448#endif
… …
2450 * G: cleanup cursor and display outline cursor if necessary 2459 * G: cleanup cursor and display outline cursor if necessary
2451 */ 2460 */
2452 if (showcursor) 2461 if (showcursor)
2453 { 2462 {
2454 if (focus) 2463 if (focus)
2455 { 2464 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 if (option (Opt_cursorUnderline))
2457 *crp ^= RS_Uline;
2458 else
2459 {
2460 *crp ^= RS_RVid;
2461#ifndef NO_CURSORCOLOR
2462 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2463#endif
2464 }
2465 }
2466 else if (oldcursor.row >= 0) 2465 else if (oldcursor.row >= 0)
2467 { 2466 {
2468 int cursorwidth = 1;
2469 int col = oldcursor.col;
2470
2471 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2472 col--;
2473
2474 while (col + cursorwidth < ncol
2475 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2476 cursorwidth++;
2477
2478#ifndef NO_CURSORCOLOR
2479 if (ISSET_PIXCOLOR (Color_cursor))
2480 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2481 else
2482#endif
2483 XSetForeground (dpy, gc, pix_colors[ccol1]); 2467 XSetForeground (dpy, gc, pix_colors[ccol1]);
2484 2468
2485 XDrawRectangle (dpy, vt, gc, 2469 XDrawRectangle (dpy, vt, gc,
2486 Col2Pixel (col), 2470 Col2Pixel (cur_col),
2487 Row2Pixel (oldcursor.row), 2471 Row2Pixel (oldcursor.row),
2488 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2472 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2489 (unsigned int) (Height2Pixel (1) - 1)); 2473 (unsigned int) (Height2Pixel (1) - 1));
2490 } 2474 }
2491 } 2475 }
… …
2533void ecb_cold 2517void ecb_cold
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2518rxvt_term::scr_recolour (bool refresh) NOTHROW
2535{ 2519{
2536 bool transparent = false; 2520 bool transparent = false;
2537 2521
2538#ifdef HAVE_BG_PIXMAP 2522#ifdef HAVE_IMG
2539 if (bg_pixmap != None) 2523 if (bg_img != 0)
2540 { 2524 {
2541# ifdef ENABLE_TRANSPARENCY 2525# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2526 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2527 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2528 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2529 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2530
2547 transparent = true; 2531 transparent = true;
2548 } 2532 }
2549 else 2533 else
2550# endif 2534# endif
2551 { 2535 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2537 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2538 }
2555 } 2539 }
2556 else 2540 else
2557#endif 2541#endif
2558 { 2542 {
… …
2565 if (scrollBar.win) 2549 if (scrollBar.win)
2566 { 2550 {
2567 if (transparent) 2551 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2552 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2553 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2555 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2556 scrollBar.show (0);
2573 } 2557 }
2574 2558
2575 if (refresh) 2559 if (refresh)
… …
2692 || (check_more == 1 2676 || (check_more == 1
2693 && current_screen == selection.screen 2677 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2678 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2679 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 CLEAR_ALL_SELECTION (); 2680 CLEAR_ALL_SELECTION ();
2681}
2682
2683void
2684rxvt_term::selection_changed () NOTHROW
2685{
2686 line_t &r1 = ROW (selection.beg.row);
2687 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2688 --selection.beg.col;
2689
2690 line_t &r2 = ROW (selection.end.row);
2691 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2692 ++selection.end.col;
2693
2694 want_refresh = 1;
2697} 2695}
2698 2696
2699/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2700/* 2698/*
2701 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
… …
3004 * Word select: select text for 2 clicks 3002 * Word select: select text for 2 clicks
3005 * We now only find out the boundary in one direction 3003 * We now only find out the boundary in one direction
3006 */ 3004 */
3007 3005
3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3012 3010
3013void ecb_cold 3011void ecb_cold
3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3135{ 3133{
3136 row_col_t pos; 3134 row_col_t pos;
3137 enum { 3135 enum {
3138 LEFT, RIGHT 3136 LEFT, RIGHT
3139 } closeto = RIGHT; 3137 } closeto = RIGHT;
3140
3141 want_refresh = 1;
3142 3138
3143 switch (selection.op) 3139 switch (selection.op)
3144 { 3140 {
3145 case SELECTION_INIT: 3141 case SELECTION_INIT:
3146 CLEAR_SELECTION (); 3142 CLEAR_SELECTION ();
… …
3326 3322
3327#if !ENABLE_MINIMAL 3323#if !ENABLE_MINIMAL
3328 if (selection.rect && selection.beg.col > selection.end.col) 3324 if (selection.rect && selection.beg.col > selection.end.col)
3329 ::swap (selection.beg.col, selection.end.col); 3325 ::swap (selection.beg.col, selection.end.col);
3330#endif 3326#endif
3327
3328 selection_changed ();
3331} 3329}
3332 3330
3333#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3334void ecb_cold 3332void ecb_cold
3335rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
… …
3532 3530
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3532}
3535 3533
3536/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3535#if USE_XIM
3538void ecb_cold 3536void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3538{
3541 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3542 3540

Diff Legend

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