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.422 by root, Thu Jun 28 15:19:15 2012 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 ();
… …
225 245
226 screen.tscroll = 0; 246 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
228 248
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235 254
236 scr_alloc (); 255 scr_alloc ();
237 256
238 if (!prev_row_buf) 257 if (!prev_row_buf)
239 { 258 {
… …
272 { 291 {
273 /* 292 /*
274 * add or delete rows as appropriate 293 * add or delete rows as appropriate
275 */ 294 */
276 295
296 int common_col = min (prev_ncol, ncol);
297
277 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
278 { 299 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282 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);
283 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);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 303
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 304 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 305 }
287 306
288 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
289 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
386 { 405 {
387 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)];
388 line_t &dst = row_buf [row]; 407 line_t &dst = row_buf [row];
389 408
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 409 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 410 }
395 411
396 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 414
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 427 }
412 428
413 free (prev_chunk); 429 chunk_free (prev_chunk, prev_chunk_size);
414 430
415 free (tabs); 431 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 432 tabs = (char *)rxvt_malloc (ncol);
417 433
418 for (int col = ncol; col--; ) 434 for (int col = ncol; col--; )
… …
1705 if (rvideo_state != on) 1721 if (rvideo_state != on)
1706 { 1722 {
1707 rvideo_state = on; 1723 rvideo_state = on;
1708 1724
1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1710#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1711 if (bg_img == 0) 1727 if (bg_img == 0)
1712#endif 1728#endif
1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1714 1730
1715 XGCValues gcvalue; 1731 XGCValues gcvalue;
… …
2031rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
2032{ 2048{
2033 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2035 int i; /* tmp */ 2051 int i; /* tmp */
2036#ifndef NO_CURSORCOLOR
2037 rend_t cc1; /* store colours at cursor position (s) */
2038#endif
2039 rend_t *crp; // cursor rendition pointer
2040 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
2041 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2042 2056
2043 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2044 2058
2045 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2046 return; 2060 return;
… …
2050 */ 2064 */
2051 refresh_count = 0; 2065 refresh_count = 0;
2052 2066
2053 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2054 bool have_bg = 0; 2068 bool have_bg = 0;
2055#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2056 have_bg = bg_img != 0; 2070 have_bg = bg_img != 0;
2057#endif 2071#endif
2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059 2073
2060 /* 2074 /*
… …
2085 int col = screen.cur.col; 2099 int col = screen.cur.col;
2086 2100
2087 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2088 col--; 2102 col--;
2089 2103
2090 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2091 2106
2092#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2093 cc1 = *crp & (RS_fgMask | RS_bgMask);
2094 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2095 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2096 else 2110 else
2097#endif 2111#endif
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2112 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2113#endif 2127#endif
2114 2128
2115 if (focus) 2129 if (focus)
2116 { 2130 {
2131 rend_t rend = cur_rend;
2132
2117 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2118 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2119 else 2135 else
2120 { 2136 {
2121 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2122 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2123 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2124 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2125 } 2143 }
2126 } 2144 }
2127 2145
2128 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2129 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2448 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2449 */ 2467 */
2450 if (showcursor) 2468 if (showcursor)
2451 { 2469 {
2452 if (focus) 2470 if (focus)
2453 { 2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2454 if (option (Opt_cursorUnderline))
2455 *crp ^= RS_Uline;
2456 else
2457 {
2458 *crp ^= RS_RVid;
2459#ifndef NO_CURSORCOLOR
2460 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2461#endif
2462 }
2463 }
2464 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2465 { 2473 {
2466 int cursorwidth = 1; 2474 int cursorwidth = 1;
2467 int col = oldcursor.col; 2475 int col = oldcursor.col;
2468 2476
… …
2531void ecb_cold 2539void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2533{ 2541{
2534 bool transparent = false; 2542 bool transparent = false;
2535 2543
2536#ifdef HAVE_BG_PIXMAP 2544#ifdef HAVE_IMG
2537 if (bg_img != 0) 2545 if (bg_img != 0)
2538 { 2546 {
2539# if ENABLE_TRANSPARENCY 2547# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2548 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2549 {
… …
2563 if (scrollBar.win) 2571 if (scrollBar.win)
2564 { 2572 {
2565 if (transparent) 2573 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2575 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = SB_STATE_IDLE; 2577 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2578 scrollBar.show (0);
2571 } 2579 }
2572 2580
2573 if (refresh) 2581 if (refresh)
… …
2690 || (check_more == 1 2698 || (check_more == 1
2691 && current_screen == selection.screen 2699 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694 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;
2695} 2717}
2696 2718
2697/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2698/* 2720/*
2699 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
3002 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3003 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3004 */ 3026 */
3005 3027
3006/* 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 */
3007#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3008 (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)))
3009#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3010 3032
3011void ecb_cold 3033void ecb_cold
3012rxvt_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
… …
3133{ 3155{
3134 row_col_t pos; 3156 row_col_t pos;
3135 enum { 3157 enum {
3136 LEFT, RIGHT 3158 LEFT, RIGHT
3137 } closeto = RIGHT; 3159 } closeto = RIGHT;
3138
3139 want_refresh = 1;
3140 3160
3141 switch (selection.op) 3161 switch (selection.op)
3142 { 3162 {
3143 case SELECTION_INIT: 3163 case SELECTION_INIT:
3144 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3324 3344
3325#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3326 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3327 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3328#endif 3348#endif
3349
3350 selection_changed ();
3329} 3351}
3330 3352
3331#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3332void ecb_cold 3354void ecb_cold
3333rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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