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.436 by sf-exg, Sun Mar 24 10:15:27 2013 UTC

… …
254 254
255 scr_alloc (); 255 scr_alloc ();
256 256
257 if (!prev_row_buf) 257 if (!prev_row_buf)
258 { 258 {
259 /*
260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
261 */
262 top_row = 0; 259 top_row = 0;
263 term_start = 0; 260 term_start = 0;
264 261
265 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
266 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
… …
291 { 288 {
292 /* 289 /*
293 * add or delete rows as appropriate 290 * add or delete rows as appropriate
294 */ 291 */
295 292
293 int common_col = min (prev_ncol, ncol);
294
296 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
297 { 296 {
298 copy_line (drawn_buf [row], prev_drawn_buf [row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
300
299 copy_line (swap_buf [row], prev_swap_buf [row]); 301 copy_line (swap_buf [row], prev_swap_buf [row]);
300 } 302 }
301 303
302 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
303 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
… …
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 CLEAR_ALL_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2698} 2700}
2699 2701
2702void
2703rxvt_term::selection_changed () NOTHROW
2704{
2705 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col;
2708
2709 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col;
2712
2713 want_refresh = 1;
2714}
2715
2700/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2701/* 2717/*
2702 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
2703 */ 2719 */
2704void 2720void
… …
3005 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3006 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3007 */ 3023 */
3008 3024
3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3010#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3012#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3013 3029
3014void ecb_cold 3030void ecb_cold
3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3136{ 3152{
3137 row_col_t pos; 3153 row_col_t pos;
3138 enum { 3154 enum {
3139 LEFT, RIGHT 3155 LEFT, RIGHT
3140 } closeto = RIGHT; 3156 } closeto = RIGHT;
3141
3142 want_refresh = 1;
3143 3157
3144 switch (selection.op) 3158 switch (selection.op)
3145 { 3159 {
3146 case SELECTION_INIT: 3160 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
… …
3327 3341
3328#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3329 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3330 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3331#endif 3345#endif
3346
3347 selection_changed ();
3332} 3348}
3333 3349
3334#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3335void ecb_cold 3351void ecb_cold
3336rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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