… | |
… | |
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 (); |
… | |
… | |
229 | void *prev_chunk = chunk; |
249 | void *prev_chunk = chunk; |
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 | |
|
|
235 | int common_col = min (prev_ncol, ncol); |
|
|
236 | |
254 | |
237 | scr_alloc (); |
255 | scr_alloc (); |
238 | |
256 | |
239 | if (!prev_row_buf) |
257 | if (!prev_row_buf) |
240 | { |
258 | { |
… | |
… | |
275 | * add or delete rows as appropriate |
293 | * add or delete rows as appropriate |
276 | */ |
294 | */ |
277 | |
295 | |
278 | for (int row = min (nrow, prev_nrow); row--; ) |
296 | for (int row = min (nrow, prev_nrow); row--; ) |
279 | { |
297 | { |
280 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
298 | copy_line (drawn_buf [row], prev_drawn_buf [row]); |
281 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
299 | copy_line (swap_buf [row], prev_swap_buf [row]); |
282 | |
|
|
283 | 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); |
|
|
285 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
|
|
286 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
|
|
287 | } |
300 | } |
288 | |
301 | |
289 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
302 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
290 | int pend = MOD (term_start + top_row , prev_total_rows); |
303 | int pend = MOD (term_start + top_row , prev_total_rows); |
291 | int q = total_rows; // rewrapped row |
304 | int q = total_rows; // rewrapped row |
… | |
… | |
386 | for (int row = min (nrow, prev_nrow); row--; ) |
399 | for (int row = min (nrow, prev_nrow); row--; ) |
387 | { |
400 | { |
388 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
401 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
389 | line_t &dst = row_buf [row]; |
402 | line_t &dst = row_buf [row]; |
390 | |
403 | |
391 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
404 | 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 | } |
405 | } |
396 | |
406 | |
397 | for (int row = prev_nrow; row < nrow; row++) |
407 | for (int row = prev_nrow; row < nrow; row++) |
398 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
408 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
399 | |
409 | |
… | |
… | |
1706 | if (rvideo_state != on) |
1716 | if (rvideo_state != on) |
1707 | { |
1717 | { |
1708 | rvideo_state = on; |
1718 | rvideo_state = on; |
1709 | |
1719 | |
1710 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1720 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1711 | #ifdef HAVE_BG_PIXMAP |
1721 | #ifdef HAVE_IMG |
1712 | if (bg_img == 0) |
1722 | if (bg_img == 0) |
1713 | #endif |
1723 | #endif |
1714 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1724 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1715 | |
1725 | |
1716 | XGCValues gcvalue; |
1726 | XGCValues gcvalue; |
… | |
… | |
2032 | rxvt_term::scr_refresh () NOTHROW |
2042 | rxvt_term::scr_refresh () NOTHROW |
2033 | { |
2043 | { |
2034 | int16_t col, row, /* column/row we're processing */ |
2044 | int16_t col, row, /* column/row we're processing */ |
2035 | ocrow; /* old cursor row */ |
2045 | ocrow; /* old cursor row */ |
2036 | int i; /* tmp */ |
2046 | 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 */ |
2047 | rend_t ccol1, /* Cursor colour */ |
2042 | ccol2; /* Cursor colour2 */ |
2048 | ccol2; /* Cursor colour2 */ |
|
|
2049 | rend_t cur_rend; |
|
|
2050 | int cur_col; |
2043 | |
2051 | |
2044 | want_refresh = 0; /* screen is current */ |
2052 | want_refresh = 0; /* screen is current */ |
2045 | |
2053 | |
2046 | if (refresh_type == NO_REFRESH || !mapped) |
2054 | if (refresh_type == NO_REFRESH || !mapped) |
2047 | return; |
2055 | return; |
… | |
… | |
2051 | */ |
2059 | */ |
2052 | refresh_count = 0; |
2060 | refresh_count = 0; |
2053 | |
2061 | |
2054 | unsigned int old_screen_flags = screen.flags; |
2062 | unsigned int old_screen_flags = screen.flags; |
2055 | bool have_bg = 0; |
2063 | bool have_bg = 0; |
2056 | #ifdef HAVE_BG_PIXMAP |
2064 | #ifdef HAVE_IMG |
2057 | have_bg = bg_img != 0; |
2065 | have_bg = bg_img != 0; |
2058 | #endif |
2066 | #endif |
2059 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2067 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2060 | |
2068 | |
2061 | /* |
2069 | /* |
… | |
… | |
2086 | int col = screen.cur.col; |
2094 | int col = screen.cur.col; |
2087 | |
2095 | |
2088 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2096 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2089 | col--; |
2097 | col--; |
2090 | |
2098 | |
2091 | crp = &ROW(screen.cur.row).r[col]; |
2099 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2100 | cur_col = col; |
2092 | |
2101 | |
2093 | #ifndef NO_CURSORCOLOR |
2102 | #ifndef NO_CURSORCOLOR |
2094 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2095 | if (ISSET_PIXCOLOR (Color_cursor)) |
2103 | if (ISSET_PIXCOLOR (Color_cursor)) |
2096 | ccol1 = Color_cursor; |
2104 | ccol1 = Color_cursor; |
2097 | else |
2105 | else |
2098 | #endif |
2106 | #endif |
2099 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2107 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2113 | ccol2 = Color_bg; |
2121 | ccol2 = Color_bg; |
2114 | #endif |
2122 | #endif |
2115 | |
2123 | |
2116 | if (focus) |
2124 | if (focus) |
2117 | { |
2125 | { |
|
|
2126 | rend_t rend = cur_rend; |
|
|
2127 | |
2118 | if (option (Opt_cursorUnderline)) |
2128 | if (option (Opt_cursorUnderline)) |
2119 | *crp ^= RS_Uline; |
2129 | rend ^= RS_Uline; |
2120 | else |
2130 | else |
2121 | { |
2131 | { |
2122 | *crp ^= RS_RVid; |
2132 | rend ^= RS_RVid; |
2123 | *crp = SET_FGCOLOR (*crp, ccol1); |
2133 | rend = SET_FGCOLOR (rend, ccol1); |
2124 | *crp = SET_BGCOLOR (*crp, ccol2); |
2134 | rend = SET_BGCOLOR (rend, ccol2); |
2125 | } |
2135 | } |
|
|
2136 | |
|
|
2137 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2126 | } |
2138 | } |
2127 | } |
2139 | } |
2128 | |
2140 | |
2129 | /* make sure no outline cursor is left around */ |
2141 | /* make sure no outline cursor is left around */ |
2130 | setoldcursor = 0; |
2142 | setoldcursor = 0; |
… | |
… | |
2449 | * G: cleanup cursor and display outline cursor if necessary |
2461 | * G: cleanup cursor and display outline cursor if necessary |
2450 | */ |
2462 | */ |
2451 | if (showcursor) |
2463 | if (showcursor) |
2452 | { |
2464 | { |
2453 | if (focus) |
2465 | if (focus) |
2454 | { |
2466 | 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) |
2467 | else if (oldcursor.row >= 0) |
2466 | { |
2468 | { |
2467 | int cursorwidth = 1; |
2469 | int cursorwidth = 1; |
2468 | int col = oldcursor.col; |
2470 | int col = oldcursor.col; |
2469 | |
2471 | |
… | |
… | |
2532 | void ecb_cold |
2534 | void ecb_cold |
2533 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2535 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2534 | { |
2536 | { |
2535 | bool transparent = false; |
2537 | bool transparent = false; |
2536 | |
2538 | |
2537 | #ifdef HAVE_BG_PIXMAP |
2539 | #ifdef HAVE_IMG |
2538 | if (bg_img != 0) |
2540 | if (bg_img != 0) |
2539 | { |
2541 | { |
2540 | # if ENABLE_TRANSPARENCY |
2542 | # if ENABLE_TRANSPARENCY |
2541 | if (bg_flags & BG_IS_TRANSPARENT) |
2543 | if (bg_flags & BG_IS_TRANSPARENT) |
2542 | { |
2544 | { |