… | |
… | |
254 | |
254 | |
255 | scr_alloc (); |
255 | scr_alloc (); |
256 | |
256 | |
257 | if (!prev_row_buf) |
257 | if (!prev_row_buf) |
258 | { |
258 | { |
259 | /* |
|
|
260 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
|
|
261 | */ |
|
|
262 | top_row = 0; |
259 | top_row = 0; |
263 | term_start = 0; |
260 | term_start = 0; |
264 | |
261 | |
265 | memset (charsets, 'B', sizeof (charsets)); |
262 | memset (charsets, 'B', sizeof (charsets)); |
266 | rstyle = DEFAULT_RSTYLE; |
263 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
291 | { |
288 | { |
292 | /* |
289 | /* |
293 | * add or delete rows as appropriate |
290 | * add or delete rows as appropriate |
294 | */ |
291 | */ |
295 | |
292 | |
|
|
293 | int common_col = min (prev_ncol, ncol); |
|
|
294 | |
296 | for (int row = min (nrow, prev_nrow); row--; ) |
295 | for (int row = min (nrow, prev_nrow); row--; ) |
297 | { |
296 | { |
298 | 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 | |
299 | copy_line (swap_buf [row], prev_swap_buf [row]); |
301 | copy_line (swap_buf [row], prev_swap_buf [row]); |
300 | } |
302 | } |
301 | |
303 | |
302 | 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 |
303 | int pend = MOD (term_start + top_row , prev_total_rows); |
305 | int pend = MOD (term_start + top_row , prev_total_rows); |
… | |
… | |
713 | |
715 | |
714 | // finally move the view window, if desired |
716 | // finally move the view window, if desired |
715 | if (option (Opt_scrollWithBuffer) |
717 | if (option (Opt_scrollWithBuffer) |
716 | && view_start != 0 |
718 | && view_start != 0 |
717 | && view_start != -saveLines) |
719 | && view_start != -saveLines) |
718 | scr_page (UP, count); |
720 | scr_page (count); |
719 | |
721 | |
720 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
722 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
721 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
723 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
722 | } |
724 | } |
723 | else |
725 | else |
… | |
… | |
1238 | * direction should be UP or DN |
1240 | * direction should be UP or DN |
1239 | */ |
1241 | */ |
1240 | void |
1242 | void |
1241 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1243 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1242 | { |
1244 | { |
1243 | int dirn; |
|
|
1244 | |
|
|
1245 | want_refresh = 1; |
1245 | want_refresh = 1; |
1246 | ZERO_SCROLLBACK (); |
1246 | ZERO_SCROLLBACK (); |
1247 | |
1247 | |
1248 | dirn = ((direction == UP) ? 1 : -1); |
|
|
1249 | |
|
|
1250 | screen.flags &= ~Screen_WrapNext; |
1248 | screen.flags &= ~Screen_WrapNext; |
1251 | |
1249 | |
1252 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1250 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1253 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1251 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1254 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1252 | scr_scroll_text (screen.tscroll, screen.bscroll, direction); |
1255 | else |
1253 | else |
1256 | screen.cur.row += dirn; |
1254 | screen.cur.row += direction; |
1257 | |
1255 | |
1258 | clamp_it (screen.cur.row, 0, nrow - 1); |
1256 | clamp_it (screen.cur.row, 0, nrow - 1); |
1259 | selection_check (0); |
1257 | selection_check (0); |
1260 | } |
1258 | } |
1261 | |
1259 | |
… | |
… | |
1908 | /* |
1906 | /* |
1909 | * Page the screen up/down nlines |
1907 | * Page the screen up/down nlines |
1910 | * direction should be UP or DN |
1908 | * direction should be UP or DN |
1911 | */ |
1909 | */ |
1912 | bool |
1910 | bool |
1913 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1911 | rxvt_term::scr_page (int nlines) NOTHROW |
1914 | { |
1912 | { |
1915 | int new_view_start = |
|
|
1916 | direction == UP ? view_start - nlines |
|
|
1917 | : view_start + nlines; |
|
|
1918 | |
|
|
1919 | return scr_changeview (new_view_start); |
1913 | return scr_changeview (view_start - nlines); |
1920 | } |
1914 | } |
1921 | |
1915 | |
1922 | bool |
1916 | bool |
1923 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1917 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1924 | { |
1918 | { |
… | |
… | |
2046 | int i; /* tmp */ |
2040 | int i; /* tmp */ |
2047 | rend_t ccol1, /* Cursor colour */ |
2041 | rend_t ccol1, /* Cursor colour */ |
2048 | ccol2; /* Cursor colour2 */ |
2042 | ccol2; /* Cursor colour2 */ |
2049 | rend_t cur_rend; |
2043 | rend_t cur_rend; |
2050 | int cur_col; |
2044 | int cur_col; |
|
|
2045 | int cursorwidth; |
2051 | |
2046 | |
2052 | want_refresh = 0; /* screen is current */ |
2047 | want_refresh = 0; /* screen is current */ |
2053 | |
2048 | |
2054 | if (refresh_type == NO_REFRESH || !mapped) |
2049 | if (refresh_type == NO_REFRESH || !mapped) |
2055 | return; |
2050 | return; |
… | |
… | |
2080 | |
2075 | |
2081 | /* |
2076 | /* |
2082 | * C: set the cursor character (s) |
2077 | * C: set the cursor character (s) |
2083 | */ |
2078 | */ |
2084 | { |
2079 | { |
2085 | bool setoldcursor; |
|
|
2086 | |
|
|
2087 | #ifdef CURSOR_BLINK |
2080 | #ifdef CURSOR_BLINK |
2088 | if (hidden_cursor) |
2081 | if (hidden_cursor) |
2089 | showcursor = 0; |
2082 | showcursor = 0; |
2090 | #endif |
2083 | #endif |
2091 | |
2084 | |
… | |
… | |
2093 | { |
2086 | { |
2094 | int col = screen.cur.col; |
2087 | int col = screen.cur.col; |
2095 | |
2088 | |
2096 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2089 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2097 | col--; |
2090 | col--; |
|
|
2091 | |
|
|
2092 | cursorwidth = 1; |
|
|
2093 | while (col + cursorwidth < ncol |
|
|
2094 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2095 | cursorwidth++; |
2098 | |
2096 | |
2099 | cur_rend = ROW(screen.cur.row).r[col]; |
2097 | cur_rend = ROW(screen.cur.row).r[col]; |
2100 | cur_col = col; |
2098 | cur_col = col; |
2101 | |
2099 | |
2102 | #ifndef NO_CURSORCOLOR |
2100 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2137 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2135 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2138 | } |
2136 | } |
2139 | } |
2137 | } |
2140 | |
2138 | |
2141 | /* make sure no outline cursor is left around */ |
2139 | /* make sure no outline cursor is left around */ |
2142 | setoldcursor = 0; |
|
|
2143 | if (ocrow != -1) |
2140 | if (ocrow != -1) |
2144 | { |
2141 | { |
2145 | if (screen.cur.row - view_start != ocrow |
2142 | if (screen.cur.row - view_start != ocrow |
2146 | || screen.cur.col != oldcursor.col) |
2143 | || screen.cur.col != oldcursor.col) |
2147 | { |
2144 | { |
2148 | if (ocrow < nrow |
2145 | if (ocrow < nrow |
2149 | && oldcursor.col < ncol) |
2146 | && oldcursor.col < ncol) |
2150 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2147 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2151 | |
|
|
2152 | if (focus || !showcursor) |
|
|
2153 | oldcursor.row = -1; |
|
|
2154 | else |
|
|
2155 | setoldcursor = 1; |
|
|
2156 | } |
2148 | } |
2157 | } |
2149 | } |
2158 | else if (!focus) |
|
|
2159 | setoldcursor = 1; |
|
|
2160 | |
2150 | |
2161 | if (setoldcursor) |
2151 | // save the current cursor coordinates if the cursor is visible |
|
|
2152 | // and the window is unfocused, so as to clear the outline cursor |
|
|
2153 | // in the next refresh if the cursor moves |
|
|
2154 | if (showcursor && !focus && screen.cur.row - view_start < nrow) |
2162 | { |
2155 | { |
2163 | if (screen.cur.row - view_start >= nrow) |
|
|
2164 | oldcursor.row = -1; |
|
|
2165 | else |
|
|
2166 | { |
|
|
2167 | oldcursor.row = screen.cur.row - view_start; |
2156 | oldcursor.row = screen.cur.row - view_start; |
2168 | oldcursor.col = screen.cur.col; |
2157 | oldcursor.col = screen.cur.col; |
2169 | } |
|
|
2170 | } |
2158 | } |
|
|
2159 | else |
|
|
2160 | oldcursor.row = -1; |
2171 | } |
2161 | } |
2172 | |
2162 | |
2173 | #ifndef NO_SLOW_LINK_SUPPORT |
2163 | #ifndef NO_SLOW_LINK_SUPPORT |
2174 | /* |
2164 | /* |
2175 | * D: CopyArea pass - very useful for slower links |
2165 | * D: CopyArea pass - very useful for slower links |
… | |
… | |
2441 | else |
2431 | else |
2442 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2432 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2443 | |
2433 | |
2444 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2434 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2445 | { |
2435 | { |
|
|
2436 | if (showcursor && focus && row == screen.cur.row |
|
|
2437 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2438 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2439 | else |
2446 | #if ENABLE_FRILLS |
2440 | #if ENABLE_FRILLS |
2447 | if (ISSET_PIXCOLOR (Color_underline)) |
2441 | if (ISSET_PIXCOLOR (Color_underline)) |
2448 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2442 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2449 | else |
2443 | else |
2450 | #endif |
2444 | #endif |
… | |
… | |
2464 | { |
2458 | { |
2465 | if (focus) |
2459 | if (focus) |
2466 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2460 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2467 | else if (oldcursor.row >= 0) |
2461 | else if (oldcursor.row >= 0) |
2468 | { |
2462 | { |
2469 | int cursorwidth = 1; |
|
|
2470 | int col = oldcursor.col; |
|
|
2471 | |
|
|
2472 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2473 | col--; |
|
|
2474 | |
|
|
2475 | while (col + cursorwidth < ncol |
|
|
2476 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2477 | cursorwidth++; |
|
|
2478 | |
|
|
2479 | #ifndef NO_CURSORCOLOR |
|
|
2480 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2481 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2482 | else |
|
|
2483 | #endif |
|
|
2484 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2463 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2485 | |
2464 | |
2486 | XDrawRectangle (dpy, vt, gc, |
2465 | XDrawRectangle (dpy, vt, gc, |
2487 | Col2Pixel (col), |
2466 | Col2Pixel (cur_col), |
2488 | Row2Pixel (oldcursor.row), |
2467 | Row2Pixel (oldcursor.row), |
2489 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2468 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2490 | (unsigned int) (Height2Pixel (1) - 1)); |
2469 | (unsigned int) (Height2Pixel (1) - 1)); |
2491 | } |
2470 | } |
2492 | } |
2471 | } |
… | |
… | |
2699 | |
2678 | |
2700 | void |
2679 | void |
2701 | rxvt_term::selection_changed () NOTHROW |
2680 | rxvt_term::selection_changed () NOTHROW |
2702 | { |
2681 | { |
2703 | line_t &r1 = ROW (selection.beg.row); |
2682 | line_t &r1 = ROW (selection.beg.row); |
2704 | while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) |
2683 | while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR) |
2705 | --selection.beg.col; |
2684 | ++selection.beg.col; |
2706 | |
2685 | |
2707 | line_t &r2 = ROW (selection.end.row); |
2686 | line_t &r2 = ROW (selection.end.row); |
2708 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
2687 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
2709 | ++selection.end.col; |
2688 | ++selection.end.col; |
2710 | |
2689 | |