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.437 by sf-exg, Mon Mar 25 12:28:04 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);
… …
2474 2476
2475 while (col + cursorwidth < ncol 2477 while (col + cursorwidth < ncol
2476 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2478 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2477 cursorwidth++; 2479 cursorwidth++;
2478 2480
2479#ifndef NO_CURSORCOLOR
2480 if (ISSET_PIXCOLOR (Color_cursor))
2481 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2482 else
2483#endif
2484 XSetForeground (dpy, gc, pix_colors[ccol1]); 2481 XSetForeground (dpy, gc, pix_colors[ccol1]);
2485 2482
2486 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2487 Col2Pixel (col), 2484 Col2Pixel (col),
2488 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2489 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
… …
2693 || (check_more == 1 2690 || (check_more == 1
2694 && current_screen == selection.screen 2691 && current_screen == selection.screen
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 CLEAR_ALL_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2695}
2696
2697void
2698rxvt_term::selection_changed () NOTHROW
2699{
2700 line_t &r1 = ROW (selection.beg.row);
2701 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2702 --selection.beg.col;
2703
2704 line_t &r2 = ROW (selection.end.row);
2705 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2706 ++selection.end.col;
2707
2708 want_refresh = 1;
2698} 2709}
2699 2710
2700/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2701/* 2712/*
2702 * Paste a selection direct to the command fd 2713 * Paste a selection direct to the command fd
… …
3005 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3006 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3007 */ 3018 */
3008 3019
3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3010#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3012#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3013 3024
3014void ecb_cold 3025void ecb_cold
3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
… …
3136{ 3147{
3137 row_col_t pos; 3148 row_col_t pos;
3138 enum { 3149 enum {
3139 LEFT, RIGHT 3150 LEFT, RIGHT
3140 } closeto = RIGHT; 3151 } closeto = RIGHT;
3141
3142 want_refresh = 1;
3143 3152
3144 switch (selection.op) 3153 switch (selection.op)
3145 { 3154 {
3146 case SELECTION_INIT: 3155 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3327 3336
3328#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3329 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3330 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3331#endif 3340#endif
3341
3342 selection_changed ();
3332} 3343}
3333 3344
3334#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3335void ecb_cold 3346void ecb_cold
3336rxvt_term::selection_remove_trailing_spaces () NOTHROW 3347rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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