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.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

291 { 291 {
292 /* 292 /*
293 * add or delete rows as appropriate 293 * add or delete rows as appropriate
294 */ 294 */
295 295
296 int common_col = min (prev_ncol, ncol);
297
296 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
297 { 299 {
298 copy_line (drawn_buf [row], prev_drawn_buf [row]); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
303
299 copy_line (swap_buf [row], prev_swap_buf [row]); 304 copy_line (swap_buf [row], prev_swap_buf [row]);
300 } 305 }
301 306
302 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
303 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 CLEAR_ALL_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2698} 2703}
2699 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;
2717}
2718
2700/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2701/* 2720/*
2702 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2703 */ 2722 */
2704void 2723void
3005 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3006 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3007 */ 3026 */
3008 3027
3009/* 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 */
3010#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3011 (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)))
3012#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3013 3032
3014void ecb_cold 3033void ecb_cold
3015rxvt_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
3136{ 3155{
3137 row_col_t pos; 3156 row_col_t pos;
3138 enum { 3157 enum {
3139 LEFT, RIGHT 3158 LEFT, RIGHT
3140 } closeto = RIGHT; 3159 } closeto = RIGHT;
3141
3142 want_refresh = 1;
3143 3160
3144 switch (selection.op) 3161 switch (selection.op)
3145 { 3162 {
3146 case SELECTION_INIT: 3163 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
3327 3344
3328#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3329 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3330 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3331#endif 3348#endif
3349
3350 selection_changed ();
3332} 3351}
3333 3352
3334#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3335void ecb_cold 3354void ecb_cold
3336rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines