… | |
… | |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
|
|
7 | * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it> |
7 | * |
8 | * |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
10 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * the Free Software Foundation; either version 3 of the License, or |
11 | * (at your option) any later version. |
12 | * (at your option) any later version. |
12 | * |
13 | * |
13 | * This program is distributed in the hope that it will be useful, |
14 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
150 | l.r[col] = rend; |
151 | l.r[col] = rend; |
151 | col++; |
152 | col++; |
152 | } while (col < ncol && l.t[col] == NOCHAR); |
153 | } while (col < ncol && l.t[col] == NOCHAR); |
153 | } |
154 | } |
154 | |
155 | |
|
|
156 | // set the rendition of a single wide character beginning at the given column |
|
|
157 | void |
|
|
158 | rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend) |
|
|
159 | { |
|
|
160 | do { |
|
|
161 | l.r[col] = rend; |
|
|
162 | col++; |
|
|
163 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
164 | } |
|
|
165 | |
155 | /* ------------------------------------------------------------------------- * |
166 | /* ------------------------------------------------------------------------- * |
156 | * SCREEN INITIALISATION * |
167 | * SCREEN INITIALISATION * |
157 | * ------------------------------------------------------------------------- */ |
168 | * ------------------------------------------------------------------------- */ |
158 | |
169 | |
159 | void |
170 | void |
… | |
… | |
188 | drawn_buf = (line_t *)chunk; |
199 | drawn_buf = (line_t *)chunk; |
189 | swap_buf = drawn_buf + nrow; |
200 | swap_buf = drawn_buf + nrow; |
190 | row_buf = swap_buf + nrow; |
201 | row_buf = swap_buf + nrow; |
191 | } |
202 | } |
192 | |
203 | |
|
|
204 | void |
|
|
205 | rxvt_term::copy_line (line_t &dst, line_t &src) |
|
|
206 | { |
|
|
207 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
|
|
208 | dst.l = min (src.l, ncol); |
|
|
209 | memcpy (dst.t, src.t, sizeof (text_t) * dst.l); |
|
|
210 | memcpy (dst.r, src.r, sizeof (rend_t) * dst.l); |
|
|
211 | dst.f = src.f; |
|
|
212 | } |
|
|
213 | |
193 | void ecb_cold |
214 | void ecb_cold |
194 | rxvt_term::scr_reset () |
215 | rxvt_term::scr_reset () |
195 | { |
216 | { |
196 | #if ENABLE_OVERLAY |
217 | #if ENABLE_OVERLAY |
197 | scr_overlay_off (); |
218 | scr_overlay_off (); |
… | |
… | |
230 | size_t prev_chunk_size = chunk_size; |
251 | size_t prev_chunk_size = chunk_size; |
231 | line_t *prev_drawn_buf = drawn_buf; |
252 | line_t *prev_drawn_buf = drawn_buf; |
232 | line_t *prev_swap_buf = swap_buf; |
253 | line_t *prev_swap_buf = swap_buf; |
233 | line_t *prev_row_buf = row_buf; |
254 | line_t *prev_row_buf = row_buf; |
234 | |
255 | |
235 | int common_col = min (prev_ncol, ncol); |
|
|
236 | |
|
|
237 | scr_alloc (); |
256 | scr_alloc (); |
238 | |
257 | |
239 | if (!prev_row_buf) |
258 | if (!prev_row_buf) |
240 | { |
259 | { |
241 | /* |
|
|
242 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
|
|
243 | */ |
|
|
244 | top_row = 0; |
260 | top_row = 0; |
245 | term_start = 0; |
261 | term_start = 0; |
246 | |
262 | |
247 | memset (charsets, 'B', sizeof (charsets)); |
263 | memset (charsets, 'B', sizeof (charsets)); |
248 | rstyle = DEFAULT_RSTYLE; |
264 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
273 | { |
289 | { |
274 | /* |
290 | /* |
275 | * add or delete rows as appropriate |
291 | * add or delete rows as appropriate |
276 | */ |
292 | */ |
277 | |
293 | |
|
|
294 | int common_col = min (prev_ncol, ncol); |
|
|
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 | 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); |
299 | 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); |
300 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
285 | |
301 | |
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; |
302 | copy_line (swap_buf [row], prev_swap_buf [row]); |
290 | } |
303 | } |
291 | |
304 | |
292 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
305 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
293 | int pend = MOD (term_start + top_row , prev_total_rows); |
306 | int pend = MOD (term_start + top_row , prev_total_rows); |
294 | int q = total_rows; // rewrapped row |
307 | int q = total_rows; // rewrapped row |
… | |
… | |
389 | for (int row = min (nrow, prev_nrow); row--; ) |
402 | for (int row = min (nrow, prev_nrow); row--; ) |
390 | { |
403 | { |
391 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
404 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
392 | line_t &dst = row_buf [row]; |
405 | line_t &dst = row_buf [row]; |
393 | |
406 | |
394 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
407 | 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 = min (src.l, ncol); |
|
|
399 | dst.f = src.f; |
|
|
400 | } |
408 | } |
401 | |
409 | |
402 | for (int row = prev_nrow; row < nrow; row++) |
410 | for (int row = prev_nrow; row < nrow; row++) |
403 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
411 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
404 | |
412 | |
… | |
… | |
607 | * Change the colour for following text |
615 | * Change the colour for following text |
608 | */ |
616 | */ |
609 | void |
617 | void |
610 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
618 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
611 | { |
619 | { |
612 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
620 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24)) |
613 | color = fgbg; |
621 | color = fgbg; |
614 | |
622 | |
615 | if (fgbg == Color_fg) |
623 | if (fgbg == Color_fg) |
616 | rstyle = SET_FGCOLOR (rstyle, color); |
624 | rstyle = SET_FGCOLOR (rstyle, color); |
617 | else |
625 | else |
… | |
… | |
708 | |
716 | |
709 | // finally move the view window, if desired |
717 | // finally move the view window, if desired |
710 | if (option (Opt_scrollWithBuffer) |
718 | if (option (Opt_scrollWithBuffer) |
711 | && view_start != 0 |
719 | && view_start != 0 |
712 | && view_start != -saveLines) |
720 | && view_start != -saveLines) |
713 | scr_page (UP, count); |
721 | scr_page (count); |
714 | |
722 | |
715 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
723 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
716 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
724 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
717 | } |
725 | } |
718 | else |
726 | else |
… | |
… | |
1004 | } |
1012 | } |
1005 | else if (screen.cur.row > 0 |
1013 | else if (screen.cur.row > 0 |
1006 | && ROW(screen.cur.row - 1).is_longer ()) |
1014 | && ROW(screen.cur.row - 1).is_longer ()) |
1007 | { |
1015 | { |
1008 | linep = &ROW(screen.cur.row - 1); |
1016 | linep = &ROW(screen.cur.row - 1); |
1009 | tp = line->t + ncol - 1; |
1017 | tp = linep->t + ncol - 1; |
1010 | rp = line->r + ncol - 1; |
1018 | rp = linep->r + ncol - 1; |
1011 | } |
1019 | } |
1012 | else |
1020 | else |
1013 | continue; |
1021 | continue; |
1014 | |
1022 | |
1015 | linep->touch (); |
1023 | linep->touch (); |
… | |
… | |
1233 | * direction should be UP or DN |
1241 | * direction should be UP or DN |
1234 | */ |
1242 | */ |
1235 | void |
1243 | void |
1236 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1244 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1237 | { |
1245 | { |
1238 | int dirn; |
|
|
1239 | |
|
|
1240 | want_refresh = 1; |
1246 | want_refresh = 1; |
1241 | ZERO_SCROLLBACK (); |
1247 | ZERO_SCROLLBACK (); |
1242 | |
1248 | |
1243 | dirn = ((direction == UP) ? 1 : -1); |
|
|
1244 | |
|
|
1245 | screen.flags &= ~Screen_WrapNext; |
1249 | screen.flags &= ~Screen_WrapNext; |
1246 | |
1250 | |
1247 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1251 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1248 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1252 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1249 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1253 | scr_scroll_text (screen.tscroll, screen.bscroll, direction); |
1250 | else |
1254 | else |
1251 | screen.cur.row += dirn; |
1255 | screen.cur.row += direction; |
1252 | |
1256 | |
1253 | clamp_it (screen.cur.row, 0, nrow - 1); |
1257 | clamp_it (screen.cur.row, 0, nrow - 1); |
1254 | selection_check (0); |
1258 | selection_check (0); |
1255 | } |
1259 | } |
1256 | |
1260 | |
… | |
… | |
1710 | |
1714 | |
1711 | if (rvideo_state != on) |
1715 | if (rvideo_state != on) |
1712 | { |
1716 | { |
1713 | rvideo_state = on; |
1717 | rvideo_state = on; |
1714 | |
1718 | |
|
|
1719 | #if OFF_FOCUS_FADING |
|
|
1720 | if (rs[Rs_fade]) |
|
|
1721 | { |
|
|
1722 | ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]); |
|
|
1723 | ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]); |
|
|
1724 | } |
|
|
1725 | else |
|
|
1726 | #endif |
1715 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1727 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1716 | #ifdef HAVE_IMG |
1728 | #ifdef HAVE_IMG |
1717 | if (bg_img == 0) |
1729 | if (bg_img == 0) |
1718 | #endif |
1730 | #endif |
1719 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1731 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
… | |
… | |
1894 | * the top of the screen |
1906 | * the top of the screen |
1895 | */ |
1907 | */ |
1896 | void |
1908 | void |
1897 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1909 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1898 | { |
1910 | { |
1899 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1911 | // lerp (y, 0, len, top_row, nrow - 1) |
|
|
1912 | scr_changeview (top_row + (nrow - 1 - top_row) * y / len); |
1900 | } |
1913 | } |
1901 | |
1914 | |
1902 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1903 | /* |
1916 | /* |
1904 | * Page the screen up/down nlines |
1917 | * Page the screen up/down nlines |
1905 | * direction should be UP or DN |
1918 | * direction should be UP or DN |
1906 | */ |
1919 | */ |
1907 | bool |
1920 | bool |
1908 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1921 | rxvt_term::scr_page (int nlines) NOTHROW |
1909 | { |
1922 | { |
1910 | int new_view_start = |
|
|
1911 | direction == UP ? view_start - nlines |
|
|
1912 | : view_start + nlines; |
|
|
1913 | |
|
|
1914 | return scr_changeview (new_view_start); |
1923 | return scr_changeview (view_start - nlines); |
1915 | } |
1924 | } |
1916 | |
1925 | |
1917 | bool |
1926 | bool |
1918 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1927 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1919 | { |
1928 | { |
… | |
… | |
2037 | rxvt_term::scr_refresh () NOTHROW |
2046 | rxvt_term::scr_refresh () NOTHROW |
2038 | { |
2047 | { |
2039 | int16_t col, row, /* column/row we're processing */ |
2048 | int16_t col, row, /* column/row we're processing */ |
2040 | ocrow; /* old cursor row */ |
2049 | ocrow; /* old cursor row */ |
2041 | int i; /* tmp */ |
2050 | int i; /* tmp */ |
2042 | #ifndef NO_CURSORCOLOR |
|
|
2043 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2044 | #endif |
|
|
2045 | rend_t *crp; // cursor rendition pointer |
|
|
2046 | rend_t ccol1, /* Cursor colour */ |
2051 | rend_t ccol1, /* Cursor colour */ |
2047 | ccol2; /* Cursor colour2 */ |
2052 | ccol2; /* Cursor colour2 */ |
|
|
2053 | rend_t cur_rend; |
|
|
2054 | int cur_col; |
|
|
2055 | int cursorwidth; |
2048 | |
2056 | |
2049 | want_refresh = 0; /* screen is current */ |
2057 | want_refresh = 0; /* screen is current */ |
2050 | |
2058 | |
2051 | if (refresh_type == NO_REFRESH || !mapped) |
2059 | if (refresh_type == NO_REFRESH || !mapped) |
2052 | return; |
2060 | return; |
… | |
… | |
2077 | |
2085 | |
2078 | /* |
2086 | /* |
2079 | * C: set the cursor character (s) |
2087 | * C: set the cursor character (s) |
2080 | */ |
2088 | */ |
2081 | { |
2089 | { |
2082 | bool setoldcursor; |
|
|
2083 | |
|
|
2084 | #ifdef CURSOR_BLINK |
2090 | #ifdef CURSOR_BLINK |
2085 | if (hidden_cursor) |
2091 | if (hidden_cursor) |
2086 | showcursor = 0; |
2092 | showcursor = 0; |
2087 | #endif |
2093 | #endif |
2088 | |
2094 | |
… | |
… | |
2091 | int col = screen.cur.col; |
2097 | int col = screen.cur.col; |
2092 | |
2098 | |
2093 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2099 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2094 | col--; |
2100 | col--; |
2095 | |
2101 | |
|
|
2102 | cursorwidth = 1; |
|
|
2103 | while (col + cursorwidth < ncol |
|
|
2104 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2105 | cursorwidth++; |
|
|
2106 | |
2096 | crp = &ROW(screen.cur.row).r[col]; |
2107 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2108 | cur_col = col; |
2097 | |
2109 | |
2098 | #ifndef NO_CURSORCOLOR |
2110 | #ifndef NO_CURSORCOLOR |
2099 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2100 | if (ISSET_PIXCOLOR (Color_cursor)) |
2111 | if (ISSET_PIXCOLOR (Color_cursor)) |
2101 | ccol1 = Color_cursor; |
2112 | ccol1 = Color_cursor; |
2102 | else |
2113 | else |
2103 | #endif |
2114 | #endif |
2104 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2115 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2116 | ccol2 = bgcolor_of (rstyle); |
2127 | ccol2 = bgcolor_of (rstyle); |
2117 | #else |
2128 | #else |
2118 | ccol2 = Color_bg; |
2129 | ccol2 = Color_bg; |
2119 | #endif |
2130 | #endif |
2120 | |
2131 | |
2121 | if (focus) |
2132 | if (focus && cursor_type == 0) |
2122 | { |
2133 | { |
2123 | if (option (Opt_cursorUnderline)) |
2134 | rend_t rend = cur_rend; |
2124 | *crp ^= RS_Uline; |
2135 | |
2125 | else |
|
|
2126 | { |
|
|
2127 | *crp ^= RS_RVid; |
2136 | rend ^= RS_RVid; |
2128 | *crp = SET_FGCOLOR (*crp, ccol1); |
2137 | rend = SET_FGCOLOR (rend, ccol1); |
2129 | *crp = SET_BGCOLOR (*crp, ccol2); |
2138 | rend = SET_BGCOLOR (rend, ccol2); |
2130 | } |
2139 | |
|
|
2140 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2131 | } |
2141 | } |
2132 | } |
2142 | } |
2133 | |
2143 | |
2134 | /* make sure no outline cursor is left around */ |
2144 | /* make sure no outline cursor is left around */ |
2135 | setoldcursor = 0; |
2145 | if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol) |
2136 | if (ocrow != -1) |
2146 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
|
|
2147 | |
|
|
2148 | // save the current cursor coordinates if the cursor is visible |
|
|
2149 | // and either the window is unfocused or the cursor style is |
|
|
2150 | // underline or vertical bar, so as to clear the outline cursor in |
|
|
2151 | // the next refresh if the cursor moves or becomes invisible |
|
|
2152 | if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow) |
2137 | { |
2153 | { |
2138 | if (screen.cur.row - view_start != ocrow |
2154 | oldcursor.row = screen.cur.row - view_start; |
2139 | || screen.cur.col != oldcursor.col) |
2155 | oldcursor.col = screen.cur.col; |
2140 | { |
|
|
2141 | if (ocrow < nrow |
|
|
2142 | && oldcursor.col < ncol) |
|
|
2143 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
|
|
2144 | |
|
|
2145 | if (focus || !showcursor) |
|
|
2146 | oldcursor.row = -1; |
|
|
2147 | else |
|
|
2148 | setoldcursor = 1; |
|
|
2149 | } |
|
|
2150 | } |
2156 | } |
2151 | else if (!focus) |
2157 | else |
2152 | setoldcursor = 1; |
|
|
2153 | |
|
|
2154 | if (setoldcursor) |
|
|
2155 | { |
|
|
2156 | if (screen.cur.row - view_start >= nrow) |
|
|
2157 | oldcursor.row = -1; |
2158 | oldcursor.row = -1; |
2158 | else |
|
|
2159 | { |
|
|
2160 | oldcursor.row = screen.cur.row - view_start; |
|
|
2161 | oldcursor.col = screen.cur.col; |
|
|
2162 | } |
|
|
2163 | } |
|
|
2164 | } |
2159 | } |
2165 | |
2160 | |
2166 | #ifndef NO_SLOW_LINK_SUPPORT |
2161 | #ifndef NO_SLOW_LINK_SUPPORT |
2167 | /* |
2162 | /* |
2168 | * D: CopyArea pass - very useful for slower links |
2163 | * D: CopyArea pass - very useful for slower links |
… | |
… | |
2249 | int ypixel = (int)Row2Pixel (row); |
2244 | int ypixel = (int)Row2Pixel (row); |
2250 | |
2245 | |
2251 | for (col = 0; col < ncol; col++) |
2246 | for (col = 0; col < ncol; col++) |
2252 | { |
2247 | { |
2253 | /* compare new text with old - if exactly the same then continue */ |
2248 | /* compare new text with old - if exactly the same then continue */ |
2254 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2249 | if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col])) |
2255 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
|
|
2256 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2257 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
|
|
2258 | continue; |
2250 | continue; |
2259 | |
2251 | |
2260 | // redraw one or more characters |
2252 | // redraw one or more characters |
2261 | |
2253 | |
2262 | // seek to the beginning of wide characters |
2254 | // seek to the beginning of wide characters |
… | |
… | |
2434 | else |
2426 | else |
2435 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2427 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2436 | |
2428 | |
2437 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2429 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2438 | { |
2430 | { |
|
|
2431 | if (showcursor && focus && row == screen.cur.row |
|
|
2432 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2433 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2434 | else |
2439 | #if ENABLE_FRILLS |
2435 | #if ENABLE_FRILLS |
2440 | if (ISSET_PIXCOLOR (Color_underline)) |
2436 | if (ISSET_PIXCOLOR (Color_underline)) |
2441 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2437 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2442 | else |
2438 | else |
2443 | #endif |
2439 | #endif |
… | |
… | |
2455 | */ |
2451 | */ |
2456 | if (showcursor) |
2452 | if (showcursor) |
2457 | { |
2453 | { |
2458 | if (focus) |
2454 | if (focus) |
2459 | { |
2455 | { |
2460 | if (option (Opt_cursorUnderline)) |
2456 | if (cursor_type == 0) |
2461 | *crp ^= RS_Uline; |
2457 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2462 | else |
2458 | else if (oldcursor.row >= 0) |
2463 | { |
2459 | { |
2464 | *crp ^= RS_RVid; |
2460 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2465 | #ifndef NO_CURSORCOLOR |
2461 | if (cursor_type == 1) |
2466 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2462 | XFillRectangle (dpy, vt, gc, |
2467 | #endif |
2463 | Col2Pixel (cur_col), |
|
|
2464 | Row2Pixel (oldcursor.row + 1) - 2, |
|
|
2465 | Width2Pixel (1), |
|
|
2466 | 2); |
|
|
2467 | else |
|
|
2468 | XFillRectangle (dpy, vt, gc, |
|
|
2469 | Col2Pixel (cur_col), |
|
|
2470 | Row2Pixel (oldcursor.row), |
|
|
2471 | 2, |
|
|
2472 | Height2Pixel (1)); |
2468 | } |
2473 | } |
2469 | } |
2474 | } |
2470 | else if (oldcursor.row >= 0) |
2475 | else if (oldcursor.row >= 0) |
2471 | { |
2476 | { |
2472 | int cursorwidth = 1; |
|
|
2473 | int col = oldcursor.col; |
|
|
2474 | |
|
|
2475 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2476 | col--; |
|
|
2477 | |
|
|
2478 | while (col + cursorwidth < ncol |
|
|
2479 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2480 | cursorwidth++; |
|
|
2481 | |
|
|
2482 | #ifndef NO_CURSORCOLOR |
|
|
2483 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2484 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2485 | else |
|
|
2486 | #endif |
|
|
2487 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2477 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2488 | |
2478 | |
2489 | XDrawRectangle (dpy, vt, gc, |
2479 | XDrawRectangle (dpy, vt, gc, |
2490 | Col2Pixel (col), |
2480 | Col2Pixel (cur_col), |
2491 | Row2Pixel (oldcursor.row), |
2481 | Row2Pixel (oldcursor.row), |
2492 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2482 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2493 | (unsigned int) (Height2Pixel (1) - 1)); |
2483 | (unsigned int) (Height2Pixel (1) - 1)); |
2494 | } |
2484 | } |
2495 | } |
2485 | } |
… | |
… | |
2533 | scr_remap_chars (swap_buf [i]); |
2523 | scr_remap_chars (swap_buf [i]); |
2534 | } |
2524 | } |
2535 | } |
2525 | } |
2536 | |
2526 | |
2537 | void ecb_cold |
2527 | void ecb_cold |
2538 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2528 | rxvt_term::scr_recolor (bool refresh) NOTHROW |
2539 | { |
2529 | { |
2540 | bool transparent = false; |
2530 | bool transparent = false; |
2541 | |
2531 | |
2542 | #ifdef HAVE_IMG |
2532 | #ifdef HAVE_IMG |
2543 | if (bg_img != 0) |
2533 | if (bg_img != 0) |
… | |
… | |
2564 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2554 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2565 | } |
2555 | } |
2566 | |
2556 | |
2567 | XClearWindow (dpy, parent); |
2557 | XClearWindow (dpy, parent); |
2568 | |
2558 | |
2569 | if (scrollBar.win) |
2559 | if (scrollBar.state && scrollBar.win) |
2570 | { |
2560 | { |
2571 | if (transparent) |
2561 | if (transparent) |
2572 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2562 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2573 | else |
2563 | else |
2574 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2564 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
… | |
… | |
2696 | || (check_more == 1 |
2686 | || (check_more == 1 |
2697 | && current_screen == selection.screen |
2687 | && current_screen == selection.screen |
2698 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2688 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2699 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2689 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2700 | CLEAR_ALL_SELECTION (); |
2690 | CLEAR_ALL_SELECTION (); |
|
|
2691 | } |
|
|
2692 | |
|
|
2693 | void |
|
|
2694 | rxvt_term::selection_changed () NOTHROW |
|
|
2695 | { |
|
|
2696 | line_t &r1 = ROW (selection.beg.row); |
|
|
2697 | while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR) |
|
|
2698 | ++selection.beg.col; |
|
|
2699 | |
|
|
2700 | line_t &r2 = ROW (selection.end.row); |
|
|
2701 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2702 | ++selection.end.col; |
|
|
2703 | |
|
|
2704 | want_refresh = 1; |
2701 | } |
2705 | } |
2702 | |
2706 | |
2703 | /* ------------------------------------------------------------------------- */ |
2707 | /* ------------------------------------------------------------------------- */ |
2704 | /* |
2708 | /* |
2705 | * Paste a selection direct to the command fd |
2709 | * Paste a selection direct to the command fd |
… | |
… | |
3008 | * Word select: select text for 2 clicks |
3012 | * Word select: select text for 2 clicks |
3009 | * We now only find out the boundary in one direction |
3013 | * We now only find out the boundary in one direction |
3010 | */ |
3014 | */ |
3011 | |
3015 | |
3012 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3016 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3013 | #define DELIMIT_TEXT(x) \ |
3017 | #define DELIMIT_TEXT(x) \ |
3014 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3018 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3015 | #define DELIMIT_REND(x) 1 |
3019 | #define DELIMIT_REND(x) 1 |
3016 | |
3020 | |
3017 | void ecb_cold |
3021 | void ecb_cold |
3018 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3022 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
… | |
… | |
3139 | { |
3143 | { |
3140 | row_col_t pos; |
3144 | row_col_t pos; |
3141 | enum { |
3145 | enum { |
3142 | LEFT, RIGHT |
3146 | LEFT, RIGHT |
3143 | } closeto = RIGHT; |
3147 | } closeto = RIGHT; |
3144 | |
|
|
3145 | want_refresh = 1; |
|
|
3146 | |
3148 | |
3147 | switch (selection.op) |
3149 | switch (selection.op) |
3148 | { |
3150 | { |
3149 | case SELECTION_INIT: |
3151 | case SELECTION_INIT: |
3150 | CLEAR_SELECTION (); |
3152 | CLEAR_SELECTION (); |
… | |
… | |
3330 | |
3332 | |
3331 | #if !ENABLE_MINIMAL |
3333 | #if !ENABLE_MINIMAL |
3332 | if (selection.rect && selection.beg.col > selection.end.col) |
3334 | if (selection.rect && selection.beg.col > selection.end.col) |
3333 | ::swap (selection.beg.col, selection.end.col); |
3335 | ::swap (selection.beg.col, selection.end.col); |
3334 | #endif |
3336 | #endif |
|
|
3337 | |
|
|
3338 | selection_changed (); |
3335 | } |
3339 | } |
3336 | |
3340 | |
3337 | #if !ENABLE_MINIMAL |
3341 | #if !ENABLE_MINIMAL |
3338 | void ecb_cold |
3342 | void ecb_cold |
3339 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3343 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
… | |
… | |
3496 | cl = selection.clip_text; |
3500 | cl = selection.clip_text; |
3497 | selectlen = selection.clip_len; |
3501 | selectlen = selection.clip_len; |
3498 | } |
3502 | } |
3499 | else |
3503 | else |
3500 | { |
3504 | { |
3501 | cl = L""; |
3505 | cl = (wchar_t *)L""; |
3502 | selectlen = 0; |
3506 | selectlen = 0; |
3503 | } |
3507 | } |
3504 | |
3508 | |
3505 | #if !ENABLE_MINIMAL |
3509 | #if !ENABLE_MINIMAL |
3506 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3510 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |