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.439 by sf-exg, Mon Mar 25 16:24:18 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 = prev_swap_buf [row].l; 301 copy_line (swap_buf [row], prev_swap_buf [row]);
289 } 302 }
290 303
291 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
292 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
293 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
388 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
389 { 402 {
390 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)];
391 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
392 405
393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 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 } 407 }
399 408
400 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
402 411
… …
2035rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2036{ 2045{
2037 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2038 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2039 int i; /* tmp */ 2048 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 */ 2049 rend_t ccol1, /* Cursor colour */
2045 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2046 2054
2047 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2048 2056
2049 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2050 return; 2058 return;
… …
2075 2083
2076 /* 2084 /*
2077 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2078 */ 2086 */
2079 { 2087 {
2080 bool setoldcursor;
2081
2082#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2083 if (hidden_cursor) 2089 if (hidden_cursor)
2084 showcursor = 0; 2090 showcursor = 0;
2085#endif 2091#endif
2086 2092
… …
2089 int col = screen.cur.col; 2095 int col = screen.cur.col;
2090 2096
2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2092 col--; 2098 col--;
2093 2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2104
2094 crp = &ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2106 cur_col = col;
2095 2107
2096#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
2097 cc1 = *crp & (RS_fgMask | RS_bgMask);
2098 if (ISSET_PIXCOLOR (Color_cursor)) 2109 if (ISSET_PIXCOLOR (Color_cursor))
2099 ccol1 = Color_cursor; 2110 ccol1 = Color_cursor;
2100 else 2111 else
2101#endif 2112#endif
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2116 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2117#endif 2128#endif
2118 2129
2119 if (focus) 2130 if (focus)
2120 { 2131 {
2132 rend_t rend = cur_rend;
2133
2121 if (option (Opt_cursorUnderline)) 2134 if (option (Opt_cursorUnderline))
2122 *crp ^= RS_Uline; 2135 rend ^= RS_Uline;
2123 else 2136 else
2124 { 2137 {
2125 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2126 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2127 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2128 } 2141 }
2142
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2129 } 2144 }
2130 } 2145 }
2131 2146
2132 /* make sure no outline cursor is left around */ 2147 /* make sure no outline cursor is left around */
2133 setoldcursor = 0;
2134 if (ocrow != -1) 2148 if (ocrow != -1)
2135 { 2149 {
2136 if (screen.cur.row - view_start != ocrow 2150 if (screen.cur.row - view_start != ocrow
2137 || screen.cur.col != oldcursor.col) 2151 || screen.cur.col != oldcursor.col)
2138 { 2152 {
2139 if (ocrow < nrow 2153 if (ocrow < nrow
2140 && oldcursor.col < ncol) 2154 && oldcursor.col < ncol)
2141 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2155 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 } 2156 }
2148 } 2157 }
2149 else if (!focus)
2150 setoldcursor = 1;
2151 2158
2152 if (setoldcursor) 2159 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor
2161 // in the next refresh if the cursor moves
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2153 { 2163 {
2154 if (screen.cur.row - view_start >= nrow)
2155 oldcursor.row = -1;
2156 else
2157 {
2158 oldcursor.row = screen.cur.row - view_start; 2164 oldcursor.row = screen.cur.row - view_start;
2159 oldcursor.col = screen.cur.col; 2165 oldcursor.col = screen.cur.col;
2160 }
2161 } 2166 }
2167 else
2168 oldcursor.row = -1;
2162 } 2169 }
2163 2170
2164#ifndef NO_SLOW_LINK_SUPPORT 2171#ifndef NO_SLOW_LINK_SUPPORT
2165 /* 2172 /*
2166 * D: CopyArea pass - very useful for slower links 2173 * D: CopyArea pass - very useful for slower links
… …
2432 else 2439 else
2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2440 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2434 2441
2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2442 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2436 { 2443 {
2444 if (showcursor && focus && row == screen.cur.row
2445 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 else
2437#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2438 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2439 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2440 else 2451 else
2441#endif 2452#endif
… …
2452 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2453 */ 2464 */
2454 if (showcursor) 2465 if (showcursor)
2455 { 2466 {
2456 if (focus) 2467 if (focus)
2457 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458 if (option (Opt_cursorUnderline))
2459 *crp ^= RS_Uline;
2460 else
2461 {
2462 *crp ^= RS_RVid;
2463#ifndef NO_CURSORCOLOR
2464 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2465#endif
2466 }
2467 }
2468 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2469 { 2470 {
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]); 2471 XSetForeground (dpy, gc, pix_colors[ccol1]);
2486 2472
2487 XDrawRectangle (dpy, vt, gc, 2473 XDrawRectangle (dpy, vt, gc,
2488 Col2Pixel (col), 2474 Col2Pixel (cur_col),
2489 Row2Pixel (oldcursor.row), 2475 Row2Pixel (oldcursor.row),
2490 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2476 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2491 (unsigned int) (Height2Pixel (1) - 1)); 2477 (unsigned int) (Height2Pixel (1) - 1));
2492 } 2478 }
2493 } 2479 }
… …
2694 || (check_more == 1 2680 || (check_more == 1
2695 && current_screen == selection.screen 2681 && current_screen == selection.screen
2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2682 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2683 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2698 CLEAR_ALL_SELECTION (); 2684 CLEAR_ALL_SELECTION ();
2685}
2686
2687void
2688rxvt_term::selection_changed () NOTHROW
2689{
2690 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col;
2693
2694 line_t &r2 = ROW (selection.end.row);
2695 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2696 ++selection.end.col;
2697
2698 want_refresh = 1;
2699} 2699}
2700 2700
2701/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2702/* 2702/*
2703 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
… …
3006 * Word select: select text for 2 clicks 3006 * Word select: select text for 2 clicks
3007 * We now only find out the boundary in one direction 3007 * We now only find out the boundary in one direction
3008 */ 3008 */
3009 3009
3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3011#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3013#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3014 3014
3015void ecb_cold 3015void ecb_cold
3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3137{ 3137{
3138 row_col_t pos; 3138 row_col_t pos;
3139 enum { 3139 enum {
3140 LEFT, RIGHT 3140 LEFT, RIGHT
3141 } closeto = RIGHT; 3141 } closeto = RIGHT;
3142
3143 want_refresh = 1;
3144 3142
3145 switch (selection.op) 3143 switch (selection.op)
3146 { 3144 {
3147 case SELECTION_INIT: 3145 case SELECTION_INIT:
3148 CLEAR_SELECTION (); 3146 CLEAR_SELECTION ();
… …
3328 3326
3329#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3330 if (selection.rect && selection.beg.col > selection.end.col) 3328 if (selection.rect && selection.beg.col > selection.end.col)
3331 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3332#endif 3330#endif
3331
3332 selection_changed ();
3333} 3333}
3334 3334
3335#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3336void ecb_cold 3336void ecb_cold
3337rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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