… | |
… | |
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 |
… | |
… | |
244 | |
254 | |
245 | scr_alloc (); |
255 | scr_alloc (); |
246 | |
256 | |
247 | if (!prev_row_buf) |
257 | if (!prev_row_buf) |
248 | { |
258 | { |
249 | /* |
|
|
250 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
|
|
251 | */ |
|
|
252 | top_row = 0; |
259 | top_row = 0; |
253 | term_start = 0; |
260 | term_start = 0; |
254 | |
261 | |
255 | memset (charsets, 'B', sizeof (charsets)); |
262 | memset (charsets, 'B', sizeof (charsets)); |
256 | rstyle = DEFAULT_RSTYLE; |
263 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
281 | { |
288 | { |
282 | /* |
289 | /* |
283 | * add or delete rows as appropriate |
290 | * add or delete rows as appropriate |
284 | */ |
291 | */ |
285 | |
292 | |
|
|
293 | int common_col = min (prev_ncol, ncol); |
|
|
294 | |
286 | for (int row = min (nrow, prev_nrow); row--; ) |
295 | for (int row = min (nrow, prev_nrow); row--; ) |
287 | { |
296 | { |
288 | 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 | |
289 | copy_line (swap_buf [row], prev_swap_buf [row]); |
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); |
… | |
… | |
2032 | rxvt_term::scr_refresh () NOTHROW |
2044 | rxvt_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; |
… | |
… | |
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 | |
… | |
… | |
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 | |
|
|
2702 | void |
|
|
2703 | rxvt_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 | |
3012 | void ecb_cold |
3030 | void ecb_cold |
3013 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3031 | rxvt_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 |
3333 | void ecb_cold |
3351 | void ecb_cold |
3334 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3352 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |