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.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC vs.
Revision 1.436 by sf-exg, Sun Mar 24 10:15:27 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 ();
… …
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 254
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc (); 255 scr_alloc ();
238 256
239 if (!prev_row_buf) 257 if (!prev_row_buf)
240 { 258 {
241 /*
242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
243 */
244 top_row = 0; 259 top_row = 0;
245 term_start = 0; 260 term_start = 0;
246 261
247 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
248 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
… …
273 { 288 {
274 /* 289 /*
275 * add or delete rows as appropriate 290 * add or delete rows as appropriate
276 */ 291 */
277 292
293 int common_col = min (prev_ncol, ncol);
294
278 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
279 { 296 {
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 297 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); 298 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); 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 300
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 301 copy_line (swap_buf [row], prev_swap_buf [row]);
287 } 302 }
288 303
289 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
290 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
291 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
386 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
387 { 402 {
388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
389 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
390 405
391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 copy_line (dst, src);
392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
395 } 407 }
396 408
397 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399 411
… …
1706 if (rvideo_state != on) 1718 if (rvideo_state != on)
1707 { 1719 {
1708 rvideo_state = on; 1720 rvideo_state = on;
1709 1721
1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1712 if (bg_img == 0) 1724 if (bg_img == 0)
1713#endif 1725#endif
1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715 1727
1716 XGCValues gcvalue; 1728 XGCValues gcvalue;
… …
2032rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2033{ 2045{
2034 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2035 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2036 int i; /* tmp */ 2048 int i; /* tmp */
2037#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */
2039#endif
2040 rend_t *crp; // cursor rendition pointer
2041 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2042 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2043 2053
2044 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
2045 2055
2046 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
2047 return; 2057 return;
… …
2051 */ 2061 */
2052 refresh_count = 0; 2062 refresh_count = 0;
2053 2063
2054 unsigned int old_screen_flags = screen.flags; 2064 unsigned int old_screen_flags = screen.flags;
2055 bool have_bg = 0; 2065 bool have_bg = 0;
2056#ifdef HAVE_BG_PIXMAP 2066#ifdef HAVE_IMG
2057 have_bg = bg_img != 0; 2067 have_bg = bg_img != 0;
2058#endif 2068#endif
2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060 2070
2061 /* 2071 /*
… …
2086 int col = screen.cur.col; 2096 int col = screen.cur.col;
2087 2097
2088 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2089 col--; 2099 col--;
2090 2100
2091 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2092 2103
2093#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2094 cc1 = *crp & (RS_fgMask | RS_bgMask);
2095 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2096 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2097 else 2107 else
2098#endif 2108#endif
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2113 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2114#endif 2124#endif
2115 2125
2116 if (focus) 2126 if (focus)
2117 { 2127 {
2128 rend_t rend = cur_rend;
2129
2118 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2119 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2120 else 2132 else
2121 { 2133 {
2122 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2123 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2124 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2125 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2126 } 2140 }
2127 } 2141 }
2128 2142
2129 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2130 setoldcursor = 0; 2144 setoldcursor = 0;
… …
2449 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2450 */ 2464 */
2451 if (showcursor) 2465 if (showcursor)
2452 { 2466 {
2453 if (focus) 2467 if (focus)
2454 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2455 if (option (Opt_cursorUnderline))
2456 *crp ^= RS_Uline;
2457 else
2458 {
2459 *crp ^= RS_RVid;
2460#ifndef NO_CURSORCOLOR
2461 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2462#endif
2463 }
2464 }
2465 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2466 { 2470 {
2467 int cursorwidth = 1; 2471 int cursorwidth = 1;
2468 int col = oldcursor.col; 2472 int col = oldcursor.col;
2469 2473
… …
2532void ecb_cold 2536void ecb_cold
2533rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2534{ 2538{
2535 bool transparent = false; 2539 bool transparent = false;
2536 2540
2537#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2538 if (bg_img != 0) 2542 if (bg_img != 0)
2539 { 2543 {
2540# if ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2542 { 2546 {
… …
2691 || (check_more == 1 2695 || (check_more == 1
2692 && current_screen == selection.screen 2696 && current_screen == selection.screen
2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2695 CLEAR_ALL_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2700}
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;
2696} 2714}
2697 2715
2698/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2699/* 2717/*
2700 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
… …
3003 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3004 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3005 */ 3023 */
3006 3024
3007/* 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 */
3008#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3009 (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)))
3010#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3011 3029
3012void ecb_cold 3030void ecb_cold
3013rxvt_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
… …
3134{ 3152{
3135 row_col_t pos; 3153 row_col_t pos;
3136 enum { 3154 enum {
3137 LEFT, RIGHT 3155 LEFT, RIGHT
3138 } closeto = RIGHT; 3156 } closeto = RIGHT;
3139
3140 want_refresh = 1;
3141 3157
3142 switch (selection.op) 3158 switch (selection.op)
3143 { 3159 {
3144 case SELECTION_INIT: 3160 case SELECTION_INIT:
3145 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
… …
3325 3341
3326#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3327 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3328 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3329#endif 3345#endif
3346
3347 selection_changed ();
3330} 3348}
3331 3349
3332#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3333void ecb_cold 3351void ecb_cold
3334rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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