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.427 by sf-exg, Sat Dec 29 15:59:51 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
… …
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 ();
… …
230 size_t prev_chunk_size = chunk_size; 250 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
234 254
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc (); 255 scr_alloc ();
238 256
239 if (!prev_row_buf) 257 if (!prev_row_buf)
240 { 258 {
241 /*
242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
243 */
244 top_row = 0; 259 top_row = 0;
245 term_start = 0; 260 term_start = 0;
246 261
247 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
248 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
… …
273 { 288 {
274 /* 289 /*
275 * add or delete rows as appropriate 290 * add or delete rows as appropriate
276 */ 291 */
277 292
293 int common_col = min (prev_ncol, ncol);
294
278 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
279 { 296 {
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 297 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); 298 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); 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 300
286 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]);
287 } 302 }
288 303
289 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
290 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
291 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
386 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
387 { 402 {
388 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)];
389 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
390 405
391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 copy_line (dst, src);
392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
395 } 407 }
396 408
397 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399 411
… …
703 715
704 // finally move the view window, if desired 716 // finally move the view window, if desired
705 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
706 && view_start != 0 718 && view_start != 0
707 && view_start != -saveLines) 719 && view_start != -saveLines)
708 scr_page (UP, count); 720 scr_page (count);
709 721
710 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
711 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));
712 } 724 }
713 else 725 else
… …
1898/* 1910/*
1899 * Page the screen up/down nlines 1911 * Page the screen up/down nlines
1900 * direction should be UP or DN 1912 * direction should be UP or DN
1901 */ 1913 */
1902bool 1914bool
1903rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1915rxvt_term::scr_page (int nlines) NOTHROW
1904{ 1916{
1905 int new_view_start =
1906 direction == UP ? view_start - nlines
1907 : view_start + nlines;
1908
1909 return scr_changeview (new_view_start); 1917 return scr_changeview (view_start - nlines);
1910} 1918}
1911 1919
1912bool 1920bool
1913rxvt_term::scr_changeview (int new_view_start) NOTHROW 1921rxvt_term::scr_changeview (int new_view_start) NOTHROW
1914{ 1922{
… …
2032rxvt_term::scr_refresh () NOTHROW 2040rxvt_term::scr_refresh () NOTHROW
2033{ 2041{
2034 int16_t col, row, /* column/row we're processing */ 2042 int16_t col, row, /* column/row we're processing */
2035 ocrow; /* old cursor row */ 2043 ocrow; /* old cursor row */
2036 int i; /* tmp */ 2044 int i; /* tmp */
2037#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */
2039#endif
2040 rend_t *crp; // cursor rendition pointer
2041 rend_t ccol1, /* Cursor colour */ 2045 rend_t ccol1, /* Cursor colour */
2042 ccol2; /* Cursor colour2 */ 2046 ccol2; /* Cursor colour2 */
2047 rend_t cur_rend;
2048 int cur_col;
2049 int cursorwidth;
2043 2050
2044 want_refresh = 0; /* screen is current */ 2051 want_refresh = 0; /* screen is current */
2045 2052
2046 if (refresh_type == NO_REFRESH || !mapped) 2053 if (refresh_type == NO_REFRESH || !mapped)
2047 return; 2054 return;
… …
2072 2079
2073 /* 2080 /*
2074 * C: set the cursor character (s) 2081 * C: set the cursor character (s)
2075 */ 2082 */
2076 { 2083 {
2077 bool setoldcursor;
2078
2079#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2080 if (hidden_cursor) 2085 if (hidden_cursor)
2081 showcursor = 0; 2086 showcursor = 0;
2082#endif 2087#endif
2083 2088
… …
2086 int col = screen.cur.col; 2091 int col = screen.cur.col;
2087 2092
2088 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2093 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2089 col--; 2094 col--;
2090 2095
2096 cursorwidth = 1;
2097 while (col + cursorwidth < ncol
2098 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2099 cursorwidth++;
2100
2091 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2092 2103
2093#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2094 cc1 = *crp & (RS_fgMask | RS_bgMask);
2095 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2096 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2097 else 2107 else
2098#endif 2108#endif
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2113 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2114#endif 2124#endif
2115 2125
2116 if (focus) 2126 if (focus)
2117 { 2127 {
2128 rend_t rend = cur_rend;
2129
2118 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2119 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2120 else 2132 else
2121 { 2133 {
2122 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2123 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2124 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2125 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2126 } 2140 }
2127 } 2141 }
2128 2142
2129 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2130 setoldcursor = 0;
2131 if (ocrow != -1) 2144 if (ocrow != -1)
2132 { 2145 {
2133 if (screen.cur.row - view_start != ocrow 2146 if (screen.cur.row - view_start != ocrow
2134 || screen.cur.col != oldcursor.col) 2147 || screen.cur.col != oldcursor.col)
2135 { 2148 {
2136 if (ocrow < nrow 2149 if (ocrow < nrow
2137 && oldcursor.col < ncol) 2150 && oldcursor.col < ncol)
2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2151 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 if (focus || !showcursor)
2141 oldcursor.row = -1;
2142 else
2143 setoldcursor = 1;
2144 } 2152 }
2145 } 2153 }
2146 else if (!focus)
2147 setoldcursor = 1;
2148 2154
2149 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)
2150 { 2159 {
2151 if (screen.cur.row - view_start >= nrow)
2152 oldcursor.row = -1;
2153 else
2154 {
2155 oldcursor.row = screen.cur.row - view_start; 2160 oldcursor.row = screen.cur.row - view_start;
2156 oldcursor.col = screen.cur.col; 2161 oldcursor.col = screen.cur.col;
2157 }
2158 } 2162 }
2163 else
2164 oldcursor.row = -1;
2159 } 2165 }
2160 2166
2161#ifndef NO_SLOW_LINK_SUPPORT 2167#ifndef NO_SLOW_LINK_SUPPORT
2162 /* 2168 /*
2163 * D: CopyArea pass - very useful for slower links 2169 * D: CopyArea pass - very useful for slower links
… …
2429 else 2435 else
2430 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2436 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2431 2437
2432 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2438 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2433 { 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
2434#if ENABLE_FRILLS 2444#if ENABLE_FRILLS
2435 if (ISSET_PIXCOLOR (Color_underline)) 2445 if (ISSET_PIXCOLOR (Color_underline))
2436 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2446 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2437 else 2447 else
2438#endif 2448#endif
… …
2449 * G: cleanup cursor and display outline cursor if necessary 2459 * G: cleanup cursor and display outline cursor if necessary
2450 */ 2460 */
2451 if (showcursor) 2461 if (showcursor)
2452 { 2462 {
2453 if (focus) 2463 if (focus)
2454 { 2464 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2455 if (option (Opt_cursorUnderline))
2456 *crp ^= RS_Uline;
2457 else
2458 {
2459 *crp ^= RS_RVid;
2460#ifndef NO_CURSORCOLOR
2461 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2462#endif
2463 }
2464 }
2465 else if (oldcursor.row >= 0) 2465 else if (oldcursor.row >= 0)
2466 { 2466 {
2467 int cursorwidth = 1;
2468 int col = oldcursor.col;
2469
2470 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2471 col--;
2472
2473 while (col + cursorwidth < ncol
2474 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2475 cursorwidth++;
2476
2477#ifndef NO_CURSORCOLOR
2478 if (ISSET_PIXCOLOR (Color_cursor))
2479 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2480 else
2481#endif
2482 XSetForeground (dpy, gc, pix_colors[ccol1]); 2467 XSetForeground (dpy, gc, pix_colors[ccol1]);
2483 2468
2484 XDrawRectangle (dpy, vt, gc, 2469 XDrawRectangle (dpy, vt, gc,
2485 Col2Pixel (col), 2470 Col2Pixel (cur_col),
2486 Row2Pixel (oldcursor.row), 2471 Row2Pixel (oldcursor.row),
2487 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2472 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2488 (unsigned int) (Height2Pixel (1) - 1)); 2473 (unsigned int) (Height2Pixel (1) - 1));
2489 } 2474 }
2490 } 2475 }
… …
2691 || (check_more == 1 2676 || (check_more == 1
2692 && current_screen == selection.screen 2677 && current_screen == selection.screen
2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2678 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2679 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2695 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;
2696} 2695}
2697 2696
2698/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2699/* 2698/*
2700 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
… …
3003 * Word select: select text for 2 clicks 3002 * Word select: select text for 2 clicks
3004 * We now only find out the boundary in one direction 3003 * We now only find out the boundary in one direction
3005 */ 3004 */
3006 3005
3007/* 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 */
3008#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3009 (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)))
3010#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3011 3010
3012void ecb_cold 3011void ecb_cold
3013rxvt_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
… …
3134{ 3133{
3135 row_col_t pos; 3134 row_col_t pos;
3136 enum { 3135 enum {
3137 LEFT, RIGHT 3136 LEFT, RIGHT
3138 } closeto = RIGHT; 3137 } closeto = RIGHT;
3139
3140 want_refresh = 1;
3141 3138
3142 switch (selection.op) 3139 switch (selection.op)
3143 { 3140 {
3144 case SELECTION_INIT: 3141 case SELECTION_INIT:
3145 CLEAR_SELECTION (); 3142 CLEAR_SELECTION ();
… …
3325 3322
3326#if !ENABLE_MINIMAL 3323#if !ENABLE_MINIMAL
3327 if (selection.rect && selection.beg.col > selection.end.col) 3324 if (selection.rect && selection.beg.col > selection.end.col)
3328 ::swap (selection.beg.col, selection.end.col); 3325 ::swap (selection.beg.col, selection.end.col);
3329#endif 3326#endif
3327
3328 selection_changed ();
3330} 3329}
3331 3330
3332#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3333void ecb_cold 3332void ecb_cold
3334rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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