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.430 by root, Sun Jan 13 20:16:40 2013 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 12 07:54:15 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 300
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 = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f; 301 copy_line (swap_buf [row], prev_swap_buf [row]);
290 } 302 }
291 303
292 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
293 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
294 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
389 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
390 { 402 {
391 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)];
392 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
393 405
394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 copy_line (dst, src);
395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
399 } 407 }
400 408
401 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
403 411
… …
707 715
708 // finally move the view window, if desired 716 // finally move the view window, if desired
709 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
710 && view_start != 0 718 && view_start != 0
711 && view_start != -saveLines) 719 && view_start != -saveLines)
712 scr_page (UP, count); 720 scr_page (count);
713 721
714 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
715 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));
716 } 724 }
717 else 725 else
… …
1232 * direction should be UP or DN 1240 * direction should be UP or DN
1233 */ 1241 */
1234void 1242void
1235rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1236{ 1244{
1237 int dirn;
1238
1239 want_refresh = 1; 1245 want_refresh = 1;
1240 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1241 1247
1242 dirn = ((direction == UP) ? 1 : -1);
1243
1244 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1245 1249
1246 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1247 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1248 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1249 else 1253 else
1250 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1251 1255
1252 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1253 selection_check (0); 1257 selection_check (0);
1254} 1258}
1255 1259
… …
1893 * the top of the screen 1897 * the top of the screen
1894 */ 1898 */
1895void 1899void
1896rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1897{ 1901{
1898 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);
1899} 1904}
1900 1905
1901/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1902/* 1907/*
1903 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1904 * direction should be UP or DN 1909 * direction should be UP or DN
1905 */ 1910 */
1906bool 1911bool
1907rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1912rxvt_term::scr_page (int nlines) NOTHROW
1908{ 1913{
1909 int new_view_start =
1910 direction == UP ? view_start - nlines
1911 : view_start + nlines;
1912
1913 return scr_changeview (new_view_start); 1914 return scr_changeview (view_start - nlines);
1914} 1915}
1915 1916
1916bool 1917bool
1917rxvt_term::scr_changeview (int new_view_start) NOTHROW 1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1918{ 1919{
… …
2036rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2037{ 2038{
2038 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2039 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2040 int i; /* tmp */ 2041 int i; /* tmp */
2041#ifndef NO_CURSORCOLOR
2042 rend_t cc1; /* store colours at cursor position (s) */
2043#endif
2044 rend_t *crp; // cursor rendition pointer
2045 rend_t ccol1, /* Cursor colour */ 2042 rend_t ccol1, /* Cursor colour */
2046 ccol2; /* Cursor colour2 */ 2043 ccol2; /* Cursor colour2 */
2044 rend_t cur_rend;
2045 int cur_col;
2046 int cursorwidth;
2047 2047
2048 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
2049 2049
2050 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 2051 return;
… …
2076 2076
2077 /* 2077 /*
2078 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2079 */ 2079 */
2080 { 2080 {
2081 bool setoldcursor;
2082
2083#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
2084 if (hidden_cursor) 2082 if (hidden_cursor)
2085 showcursor = 0; 2083 showcursor = 0;
2086#endif 2084#endif
2087 2085
… …
2090 int col = screen.cur.col; 2088 int col = screen.cur.col;
2091 2089
2092 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2093 col--; 2091 col--;
2094 2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2097
2095 crp = &ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2099 cur_col = col;
2096 2100
2097#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2098 cc1 = *crp & (RS_fgMask | RS_bgMask);
2099 if (ISSET_PIXCOLOR (Color_cursor)) 2102 if (ISSET_PIXCOLOR (Color_cursor))
2100 ccol1 = Color_cursor; 2103 ccol1 = Color_cursor;
2101 else 2104 else
2102#endif 2105#endif
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2117 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2118#endif 2121#endif
2119 2122
2120 if (focus) 2123 if (focus)
2121 { 2124 {
2125 rend_t rend = cur_rend;
2126
2122 if (option (Opt_cursorUnderline)) 2127 if (option (Opt_cursorUnderline))
2123 *crp ^= RS_Uline; 2128 rend ^= RS_Uline;
2124 else 2129 else
2125 { 2130 {
2126 *crp ^= RS_RVid; 2131 rend ^= RS_RVid;
2127 *crp = SET_FGCOLOR (*crp, ccol1); 2132 rend = SET_FGCOLOR (rend, ccol1);
2128 *crp = SET_BGCOLOR (*crp, ccol2); 2133 rend = SET_BGCOLOR (rend, ccol2);
2129 } 2134 }
2135
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2130 } 2137 }
2131 } 2138 }
2132 2139
2133 /* make sure no outline cursor is left around */ 2140 /* make sure no outline cursor is left around */
2134 setoldcursor = 0;
2135 if (ocrow != -1) 2141 if (ocrow != -1)
2136 { 2142 {
2137 if (screen.cur.row - view_start != ocrow 2143 if (screen.cur.row - view_start != ocrow
2138 || screen.cur.col != oldcursor.col) 2144 || screen.cur.col != oldcursor.col)
2139 { 2145 {
2140 if (ocrow < nrow 2146 if (ocrow < nrow
2141 && oldcursor.col < ncol) 2147 && oldcursor.col < ncol)
2142 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2143
2144 if (focus || !showcursor)
2145 oldcursor.row = -1;
2146 else
2147 setoldcursor = 1;
2148 } 2149 }
2149 } 2150 }
2150 else if (!focus)
2151 setoldcursor = 1;
2152 2151
2153 if (setoldcursor) 2152 // save the current cursor coordinates if the cursor is visible
2153 // and the window is unfocused, so as to clear the outline cursor
2154 // in the next refresh if the cursor moves
2155 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2154 { 2156 {
2155 if (screen.cur.row - view_start >= nrow)
2156 oldcursor.row = -1;
2157 else
2158 {
2159 oldcursor.row = screen.cur.row - view_start; 2157 oldcursor.row = screen.cur.row - view_start;
2160 oldcursor.col = screen.cur.col; 2158 oldcursor.col = screen.cur.col;
2161 }
2162 } 2159 }
2160 else
2161 oldcursor.row = -1;
2163 } 2162 }
2164 2163
2165#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2166 /* 2165 /*
2167 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
… …
2433 else 2432 else
2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2435 2434
2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2437 { 2436 {
2437 if (showcursor && focus && row == screen.cur.row
2438 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2439 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 else
2438#if ENABLE_FRILLS 2441#if ENABLE_FRILLS
2439 if (ISSET_PIXCOLOR (Color_underline)) 2442 if (ISSET_PIXCOLOR (Color_underline))
2440 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2443 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2441 else 2444 else
2442#endif 2445#endif
… …
2453 * G: cleanup cursor and display outline cursor if necessary 2456 * G: cleanup cursor and display outline cursor if necessary
2454 */ 2457 */
2455 if (showcursor) 2458 if (showcursor)
2456 { 2459 {
2457 if (focus) 2460 if (focus)
2458 { 2461 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2459 if (option (Opt_cursorUnderline))
2460 *crp ^= RS_Uline;
2461 else
2462 {
2463 *crp ^= RS_RVid;
2464#ifndef NO_CURSORCOLOR
2465 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2466#endif
2467 }
2468 }
2469 else if (oldcursor.row >= 0) 2462 else if (oldcursor.row >= 0)
2470 { 2463 {
2471 int cursorwidth = 1;
2472 int col = oldcursor.col;
2473
2474 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2475 col--;
2476
2477 while (col + cursorwidth < ncol
2478 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2479 cursorwidth++;
2480
2481#ifndef NO_CURSORCOLOR
2482 if (ISSET_PIXCOLOR (Color_cursor))
2483 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2484 else
2485#endif
2486 XSetForeground (dpy, gc, pix_colors[ccol1]); 2464 XSetForeground (dpy, gc, pix_colors[ccol1]);
2487 2465
2488 XDrawRectangle (dpy, vt, gc, 2466 XDrawRectangle (dpy, vt, gc,
2489 Col2Pixel (col), 2467 Col2Pixel (cur_col),
2490 Row2Pixel (oldcursor.row), 2468 Row2Pixel (oldcursor.row),
2491 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2469 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2492 (unsigned int) (Height2Pixel (1) - 1)); 2470 (unsigned int) (Height2Pixel (1) - 1));
2493 } 2471 }
2494 } 2472 }
… …
2695 || (check_more == 1 2673 || (check_more == 1
2696 && current_screen == selection.screen 2674 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2675 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2676 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 CLEAR_ALL_SELECTION (); 2677 CLEAR_ALL_SELECTION ();
2678}
2679
2680void
2681rxvt_term::selection_changed () NOTHROW
2682{
2683 line_t &r1 = ROW (selection.beg.row);
2684 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2685 ++selection.beg.col;
2686
2687 line_t &r2 = ROW (selection.end.row);
2688 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2689 ++selection.end.col;
2690
2691 want_refresh = 1;
2700} 2692}
2701 2693
2702/* ------------------------------------------------------------------------- */ 2694/* ------------------------------------------------------------------------- */
2703/* 2695/*
2704 * Paste a selection direct to the command fd 2696 * Paste a selection direct to the command fd
… …
3007 * Word select: select text for 2 clicks 2999 * Word select: select text for 2 clicks
3008 * We now only find out the boundary in one direction 3000 * We now only find out the boundary in one direction
3009 */ 3001 */
3010 3002
3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3003/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3012#define DELIMIT_TEXT(x) \ 3004#define DELIMIT_TEXT(x) \
3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3005 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3014#define DELIMIT_REND(x) 1 3006#define DELIMIT_REND(x) 1
3015 3007
3016void ecb_cold 3008void ecb_cold
3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3009rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3138{ 3130{
3139 row_col_t pos; 3131 row_col_t pos;
3140 enum { 3132 enum {
3141 LEFT, RIGHT 3133 LEFT, RIGHT
3142 } closeto = RIGHT; 3134 } closeto = RIGHT;
3143
3144 want_refresh = 1;
3145 3135
3146 switch (selection.op) 3136 switch (selection.op)
3147 { 3137 {
3148 case SELECTION_INIT: 3138 case SELECTION_INIT:
3149 CLEAR_SELECTION (); 3139 CLEAR_SELECTION ();
… …
3329 3319
3330#if !ENABLE_MINIMAL 3320#if !ENABLE_MINIMAL
3331 if (selection.rect && selection.beg.col > selection.end.col) 3321 if (selection.rect && selection.beg.col > selection.end.col)
3332 ::swap (selection.beg.col, selection.end.col); 3322 ::swap (selection.beg.col, selection.end.col);
3333#endif 3323#endif
3324
3325 selection_changed ();
3334} 3326}
3335 3327
3336#if !ENABLE_MINIMAL 3328#if !ENABLE_MINIMAL
3337void ecb_cold 3329void ecb_cold
3338rxvt_term::selection_remove_trailing_spaces () NOTHROW 3330rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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