… | |
… | |
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 |
|
|
156 | void |
|
|
157 | rxvt_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 | |
159 | void |
169 | void |
… | |
… | |
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 | |
|
|
203 | void |
|
|
204 | rxvt_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 | |
193 | void ecb_cold |
213 | void ecb_cold |
194 | rxvt_term::scr_reset () |
214 | rxvt_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 | |
300 | |
286 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
|
|
287 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
|
|
288 | swap_buf [row].l = min (prev_swap_buf [row].l, ncol); |
|
|
289 | swap_buf [row].f = prev_swap_buf [row].f; |
301 | copy_line (swap_buf [row], prev_swap_buf [row]); |
290 | } |
302 | } |
291 | |
303 | |
292 | 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 |
293 | int pend = MOD (term_start + top_row , prev_total_rows); |
305 | int pend = MOD (term_start + top_row , prev_total_rows); |
294 | int q = total_rows; // rewrapped row |
306 | int q = total_rows; // rewrapped row |
… | |
… | |
389 | for (int row = min (nrow, prev_nrow); row--; ) |
401 | for (int row = min (nrow, prev_nrow); row--; ) |
390 | { |
402 | { |
391 | 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)]; |
392 | line_t &dst = row_buf [row]; |
404 | line_t &dst = row_buf [row]; |
393 | |
405 | |
394 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
406 | copy_line (dst, src); |
395 | |
|
|
396 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
|
|
397 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
|
|
398 | dst.l = common_col; |
|
|
399 | } |
407 | } |
400 | |
408 | |
401 | for (int row = prev_nrow; row < nrow; row++) |
409 | for (int row = prev_nrow; row < nrow; row++) |
402 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
410 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
403 | |
411 | |
… | |
… | |
2036 | rxvt_term::scr_refresh () NOTHROW |
2044 | rxvt_term::scr_refresh () NOTHROW |
2037 | { |
2045 | { |
2038 | int16_t col, row, /* column/row we're processing */ |
2046 | int16_t col, row, /* column/row we're processing */ |
2039 | ocrow; /* old cursor row */ |
2047 | ocrow; /* old cursor row */ |
2040 | int i; /* tmp */ |
2048 | int i; /* tmp */ |
2041 | #ifndef NO_CURSORCOLOR |
|
|
2042 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2043 | #endif |
|
|
2044 | rend_t *crp; // cursor rendition pointer |
|
|
2045 | rend_t ccol1, /* Cursor colour */ |
2049 | rend_t ccol1, /* Cursor colour */ |
2046 | ccol2; /* Cursor colour2 */ |
2050 | ccol2; /* Cursor colour2 */ |
|
|
2051 | rend_t cur_rend; |
|
|
2052 | int cur_col; |
|
|
2053 | int cursorwidth; |
2047 | |
2054 | |
2048 | want_refresh = 0; /* screen is current */ |
2055 | want_refresh = 0; /* screen is current */ |
2049 | |
2056 | |
2050 | if (refresh_type == NO_REFRESH || !mapped) |
2057 | if (refresh_type == NO_REFRESH || !mapped) |
2051 | return; |
2058 | return; |
… | |
… | |
2090 | int col = screen.cur.col; |
2097 | int col = screen.cur.col; |
2091 | |
2098 | |
2092 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2099 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2093 | col--; |
2100 | col--; |
2094 | |
2101 | |
|
|
2102 | cursorwidth = 1; |
|
|
2103 | while (col + cursorwidth < ncol |
|
|
2104 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2105 | cursorwidth++; |
|
|
2106 | |
2095 | crp = &ROW(screen.cur.row).r[col]; |
2107 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2108 | cur_col = col; |
2096 | |
2109 | |
2097 | #ifndef NO_CURSORCOLOR |
2110 | #ifndef NO_CURSORCOLOR |
2098 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2099 | if (ISSET_PIXCOLOR (Color_cursor)) |
2111 | if (ISSET_PIXCOLOR (Color_cursor)) |
2100 | ccol1 = Color_cursor; |
2112 | ccol1 = Color_cursor; |
2101 | else |
2113 | else |
2102 | #endif |
2114 | #endif |
2103 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2115 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2117 | ccol2 = Color_bg; |
2129 | ccol2 = Color_bg; |
2118 | #endif |
2130 | #endif |
2119 | |
2131 | |
2120 | if (focus) |
2132 | if (focus) |
2121 | { |
2133 | { |
|
|
2134 | rend_t rend = cur_rend; |
|
|
2135 | |
2122 | if (option (Opt_cursorUnderline)) |
2136 | if (option (Opt_cursorUnderline)) |
2123 | *crp ^= RS_Uline; |
2137 | rend ^= RS_Uline; |
2124 | else |
2138 | else |
2125 | { |
2139 | { |
2126 | *crp ^= RS_RVid; |
2140 | rend ^= RS_RVid; |
2127 | *crp = SET_FGCOLOR (*crp, ccol1); |
2141 | rend = SET_FGCOLOR (rend, ccol1); |
2128 | *crp = SET_BGCOLOR (*crp, ccol2); |
2142 | rend = SET_BGCOLOR (rend, ccol2); |
2129 | } |
2143 | } |
|
|
2144 | |
|
|
2145 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2130 | } |
2146 | } |
2131 | } |
2147 | } |
2132 | |
2148 | |
2133 | /* make sure no outline cursor is left around */ |
2149 | /* make sure no outline cursor is left around */ |
2134 | setoldcursor = 0; |
2150 | setoldcursor = 0; |
… | |
… | |
2433 | else |
2449 | else |
2434 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2450 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2435 | |
2451 | |
2436 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2452 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2437 | { |
2453 | { |
|
|
2454 | if (showcursor && focus && row == screen.cur.row |
|
|
2455 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2456 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2457 | else |
2438 | #if ENABLE_FRILLS |
2458 | #if ENABLE_FRILLS |
2439 | if (ISSET_PIXCOLOR (Color_underline)) |
2459 | if (ISSET_PIXCOLOR (Color_underline)) |
2440 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2460 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2441 | else |
2461 | else |
2442 | #endif |
2462 | #endif |
… | |
… | |
2453 | * G: cleanup cursor and display outline cursor if necessary |
2473 | * G: cleanup cursor and display outline cursor if necessary |
2454 | */ |
2474 | */ |
2455 | if (showcursor) |
2475 | if (showcursor) |
2456 | { |
2476 | { |
2457 | if (focus) |
2477 | if (focus) |
2458 | { |
2478 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2459 | if (option (Opt_cursorUnderline)) |
|
|
2460 | *crp ^= RS_Uline; |
|
|
2461 | else |
|
|
2462 | { |
|
|
2463 | *crp ^= RS_RVid; |
|
|
2464 | #ifndef NO_CURSORCOLOR |
|
|
2465 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
|
|
2466 | #endif |
|
|
2467 | } |
|
|
2468 | } |
|
|
2469 | else if (oldcursor.row >= 0) |
2479 | else if (oldcursor.row >= 0) |
2470 | { |
2480 | { |
2471 | int cursorwidth = 1; |
|
|
2472 | int col = oldcursor.col; |
|
|
2473 | |
|
|
2474 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2475 | col--; |
|
|
2476 | |
|
|
2477 | while (col + cursorwidth < ncol |
|
|
2478 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2479 | cursorwidth++; |
|
|
2480 | |
|
|
2481 | #ifndef NO_CURSORCOLOR |
|
|
2482 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2483 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2484 | else |
|
|
2485 | #endif |
|
|
2486 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2481 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2487 | |
2482 | |
2488 | XDrawRectangle (dpy, vt, gc, |
2483 | XDrawRectangle (dpy, vt, gc, |
2489 | Col2Pixel (col), |
2484 | Col2Pixel (cur_col), |
2490 | Row2Pixel (oldcursor.row), |
2485 | Row2Pixel (oldcursor.row), |
2491 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2486 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2492 | (unsigned int) (Height2Pixel (1) - 1)); |
2487 | (unsigned int) (Height2Pixel (1) - 1)); |
2493 | } |
2488 | } |
2494 | } |
2489 | } |
… | |
… | |
2695 | || (check_more == 1 |
2690 | || (check_more == 1 |
2696 | && current_screen == selection.screen |
2691 | && current_screen == selection.screen |
2697 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2692 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2698 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2693 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2699 | CLEAR_ALL_SELECTION (); |
2694 | CLEAR_ALL_SELECTION (); |
|
|
2695 | } |
|
|
2696 | |
|
|
2697 | void |
|
|
2698 | rxvt_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; |
2700 | } |
2709 | } |
2701 | |
2710 | |
2702 | /* ------------------------------------------------------------------------- */ |
2711 | /* ------------------------------------------------------------------------- */ |
2703 | /* |
2712 | /* |
2704 | * Paste a selection direct to the command fd |
2713 | * Paste a selection direct to the command fd |
… | |
… | |
3007 | * Word select: select text for 2 clicks |
3016 | * Word select: select text for 2 clicks |
3008 | * We now only find out the boundary in one direction |
3017 | * We now only find out the boundary in one direction |
3009 | */ |
3018 | */ |
3010 | |
3019 | |
3011 | /* 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 */ |
3012 | #define DELIMIT_TEXT(x) \ |
3021 | #define DELIMIT_TEXT(x) \ |
3013 | (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))) |
3014 | #define DELIMIT_REND(x) 1 |
3023 | #define DELIMIT_REND(x) 1 |
3015 | |
3024 | |
3016 | void ecb_cold |
3025 | void ecb_cold |
3017 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3026 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
… | |
… | |
3138 | { |
3147 | { |
3139 | row_col_t pos; |
3148 | row_col_t pos; |
3140 | enum { |
3149 | enum { |
3141 | LEFT, RIGHT |
3150 | LEFT, RIGHT |
3142 | } closeto = RIGHT; |
3151 | } closeto = RIGHT; |
3143 | |
|
|
3144 | want_refresh = 1; |
|
|
3145 | |
3152 | |
3146 | switch (selection.op) |
3153 | switch (selection.op) |
3147 | { |
3154 | { |
3148 | case SELECTION_INIT: |
3155 | case SELECTION_INIT: |
3149 | CLEAR_SELECTION (); |
3156 | CLEAR_SELECTION (); |
… | |
… | |
3329 | |
3336 | |
3330 | #if !ENABLE_MINIMAL |
3337 | #if !ENABLE_MINIMAL |
3331 | if (selection.rect && selection.beg.col > selection.end.col) |
3338 | if (selection.rect && selection.beg.col > selection.end.col) |
3332 | ::swap (selection.beg.col, selection.end.col); |
3339 | ::swap (selection.beg.col, selection.end.col); |
3333 | #endif |
3340 | #endif |
|
|
3341 | |
|
|
3342 | selection_changed (); |
3334 | } |
3343 | } |
3335 | |
3344 | |
3336 | #if !ENABLE_MINIMAL |
3345 | #if !ENABLE_MINIMAL |
3337 | void ecb_cold |
3346 | void ecb_cold |
3338 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3347 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |