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.435 by sf-exg, Sun Mar 24 10:12:04 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 ();
… …
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
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
235 int common_col = min (prev_ncol, ncol);
236 254
237 scr_alloc (); 255 scr_alloc ();
238 256
239 if (!prev_row_buf) 257 if (!prev_row_buf)
240 { 258 {
… …
273 { 291 {
274 /* 292 /*
275 * add or delete rows as appropriate 293 * add or delete rows as appropriate
276 */ 294 */
277 295
296 int common_col = min (prev_ncol, ncol);
297
278 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
279 { 299 {
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 300 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); 301 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); 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 303
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; 304 copy_line (swap_buf [row], prev_swap_buf [row]);
290 } 305 }
291 306
292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
293 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
294 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
… …
389 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
390 { 405 {
391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
392 line_t &dst = row_buf [row]; 407 line_t &dst = row_buf [row];
393 408
394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 409 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 } 410 }
400 411
401 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
403 414
… …
2036rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
2037{ 2048{
2038 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2039 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2040 int i; /* tmp */ 2051 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 */ 2052 rend_t ccol1, /* Cursor colour */
2046 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2047 2056
2048 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2049 2058
2050 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2051 return; 2060 return;
… …
2090 int col = screen.cur.col; 2099 int col = screen.cur.col;
2091 2100
2092 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2093 col--; 2102 col--;
2094 2103
2095 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2096 2106
2097#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2098 cc1 = *crp & (RS_fgMask | RS_bgMask);
2099 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2100 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2101 else 2110 else
2102#endif 2111#endif
2103#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2117 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2118#endif 2127#endif
2119 2128
2120 if (focus) 2129 if (focus)
2121 { 2130 {
2131 rend_t rend = cur_rend;
2132
2122 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2123 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2124 else 2135 else
2125 { 2136 {
2126 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2127 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2128 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2129 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2130 } 2143 }
2131 } 2144 }
2132 2145
2133 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2134 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2453 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2454 */ 2467 */
2455 if (showcursor) 2468 if (showcursor)
2456 { 2469 {
2457 if (focus) 2470 if (focus)
2458 { 2471 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) 2472 else if (oldcursor.row >= 0)
2470 { 2473 {
2471 int cursorwidth = 1; 2474 int cursorwidth = 1;
2472 int col = oldcursor.col; 2475 int col = oldcursor.col;
2473 2476
… …
2695 || (check_more == 1 2698 || (check_more == 1
2696 && current_screen == selection.screen 2699 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 CLEAR_ALL_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2700} 2717}
2701 2718
2702/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2703/* 2720/*
2704 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
3007 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3008 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3009 */ 3026 */
3010 3027
3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3012#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3014#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3015 3032
3016void ecb_cold 3033void ecb_cold
3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3138{ 3155{
3139 row_col_t pos; 3156 row_col_t pos;
3140 enum { 3157 enum {
3141 LEFT, RIGHT 3158 LEFT, RIGHT
3142 } closeto = RIGHT; 3159 } closeto = RIGHT;
3143
3144 want_refresh = 1;
3145 3160
3146 switch (selection.op) 3161 switch (selection.op)
3147 { 3162 {
3148 case SELECTION_INIT: 3163 case SELECTION_INIT:
3149 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3329 3344
3330#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3331 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3332 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3333#endif 3348#endif
3349
3350 selection_changed ();
3334} 3351}
3335 3352
3336#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3337void ecb_cold 3354void ecb_cold
3338rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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