… | |
… | |
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 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * 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 |
9 | * 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 |
10 | * the Free Software Foundation; either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
1897 | * the top of the screen |
1897 | * the top of the screen |
1898 | */ |
1898 | */ |
1899 | void |
1899 | void |
1900 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1900 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1901 | { |
1901 | { |
1902 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1902 | // lerp (y, 0, len, top_row, nrow - 1) |
|
|
1903 | scr_changeview (top_row + (nrow - 1 - top_row) * y / len); |
1903 | } |
1904 | } |
1904 | |
1905 | |
1905 | /* ------------------------------------------------------------------------- */ |
1906 | /* ------------------------------------------------------------------------- */ |
1906 | /* |
1907 | /* |
1907 | * Page the screen up/down nlines |
1908 | * Page the screen up/down nlines |
… | |
… | |
2117 | ccol2 = bgcolor_of (rstyle); |
2118 | ccol2 = bgcolor_of (rstyle); |
2118 | #else |
2119 | #else |
2119 | ccol2 = Color_bg; |
2120 | ccol2 = Color_bg; |
2120 | #endif |
2121 | #endif |
2121 | |
2122 | |
2122 | if (focus) |
2123 | if (focus && cursor_type == 0) |
2123 | { |
2124 | { |
2124 | rend_t rend = cur_rend; |
2125 | rend_t rend = cur_rend; |
2125 | |
2126 | |
2126 | if (option (Opt_cursorUnderline)) |
|
|
2127 | rend ^= RS_Uline; |
|
|
2128 | else |
|
|
2129 | { |
|
|
2130 | rend ^= RS_RVid; |
2127 | rend ^= RS_RVid; |
2131 | rend = SET_FGCOLOR (rend, ccol1); |
2128 | rend = SET_FGCOLOR (rend, ccol1); |
2132 | rend = SET_BGCOLOR (rend, ccol2); |
2129 | rend = SET_BGCOLOR (rend, ccol2); |
2133 | } |
|
|
2134 | |
2130 | |
2135 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2131 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2136 | } |
2132 | } |
2137 | } |
2133 | } |
2138 | |
2134 | |
2139 | /* make sure no outline cursor is left around */ |
2135 | /* make sure no outline cursor is left around */ |
2140 | if (ocrow != -1) |
2136 | if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol) |
2141 | { |
|
|
2142 | if (screen.cur.row - view_start != ocrow |
|
|
2143 | || screen.cur.col != oldcursor.col) |
|
|
2144 | { |
|
|
2145 | if (ocrow < nrow |
|
|
2146 | && oldcursor.col < ncol) |
|
|
2147 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2137 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2148 | } |
|
|
2149 | } |
|
|
2150 | |
2138 | |
2151 | // save the current cursor coordinates if the cursor is visible |
2139 | // save the current cursor coordinates if the cursor is visible |
2152 | // and the window is unfocused, so as to clear the outline cursor |
2140 | // and either the window is unfocused or the cursor style is |
|
|
2141 | // underline or vertical bar, so as to clear the outline cursor in |
2153 | // in the next refresh if the cursor moves |
2142 | // the next refresh if the cursor moves or becomes invisible |
2154 | if (showcursor && !focus && screen.cur.row - view_start < nrow) |
2143 | if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow) |
2155 | { |
2144 | { |
2156 | oldcursor.row = screen.cur.row - view_start; |
2145 | oldcursor.row = screen.cur.row - view_start; |
2157 | oldcursor.col = screen.cur.col; |
2146 | oldcursor.col = screen.cur.col; |
2158 | } |
2147 | } |
2159 | else |
2148 | else |
… | |
… | |
2246 | int ypixel = (int)Row2Pixel (row); |
2235 | int ypixel = (int)Row2Pixel (row); |
2247 | |
2236 | |
2248 | for (col = 0; col < ncol; col++) |
2237 | for (col = 0; col < ncol; col++) |
2249 | { |
2238 | { |
2250 | /* compare new text with old - if exactly the same then continue */ |
2239 | /* compare new text with old - if exactly the same then continue */ |
2251 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2240 | if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col])) |
2252 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
|
|
2253 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2254 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
|
|
2255 | continue; |
2241 | continue; |
2256 | |
2242 | |
2257 | // redraw one or more characters |
2243 | // redraw one or more characters |
2258 | |
2244 | |
2259 | // seek to the beginning of wide characters |
2245 | // seek to the beginning of wide characters |
… | |
… | |
2455 | * G: cleanup cursor and display outline cursor if necessary |
2441 | * G: cleanup cursor and display outline cursor if necessary |
2456 | */ |
2442 | */ |
2457 | if (showcursor) |
2443 | if (showcursor) |
2458 | { |
2444 | { |
2459 | if (focus) |
2445 | if (focus) |
|
|
2446 | { |
|
|
2447 | if (cursor_type == 0) |
2460 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2448 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
|
|
2449 | else if (oldcursor.row >= 0) |
|
|
2450 | { |
|
|
2451 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2452 | if (cursor_type == 1) |
|
|
2453 | XFillRectangle (dpy, vt, gc, |
|
|
2454 | Col2Pixel (cur_col), |
|
|
2455 | Row2Pixel (oldcursor.row + 1) - 2, |
|
|
2456 | Width2Pixel (1), |
|
|
2457 | 2); |
|
|
2458 | else |
|
|
2459 | XFillRectangle (dpy, vt, gc, |
|
|
2460 | Col2Pixel (cur_col), |
|
|
2461 | Row2Pixel (oldcursor.row), |
|
|
2462 | 2, |
|
|
2463 | Height2Pixel (1)); |
|
|
2464 | } |
|
|
2465 | } |
2461 | else if (oldcursor.row >= 0) |
2466 | else if (oldcursor.row >= 0) |
2462 | { |
2467 | { |
2463 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2468 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2464 | |
2469 | |
2465 | XDrawRectangle (dpy, vt, gc, |
2470 | XDrawRectangle (dpy, vt, gc, |
… | |
… | |
2509 | scr_remap_chars (swap_buf [i]); |
2514 | scr_remap_chars (swap_buf [i]); |
2510 | } |
2515 | } |
2511 | } |
2516 | } |
2512 | |
2517 | |
2513 | void ecb_cold |
2518 | void ecb_cold |
2514 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2519 | rxvt_term::scr_recolor (bool refresh) NOTHROW |
2515 | { |
2520 | { |
2516 | bool transparent = false; |
2521 | bool transparent = false; |
2517 | |
2522 | |
2518 | #ifdef HAVE_IMG |
2523 | #ifdef HAVE_IMG |
2519 | if (bg_img != 0) |
2524 | if (bg_img != 0) |
… | |
… | |
2540 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2545 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2541 | } |
2546 | } |
2542 | |
2547 | |
2543 | XClearWindow (dpy, parent); |
2548 | XClearWindow (dpy, parent); |
2544 | |
2549 | |
2545 | if (scrollBar.win) |
2550 | if (scrollBar.state && scrollBar.win) |
2546 | { |
2551 | { |
2547 | if (transparent) |
2552 | if (transparent) |
2548 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2553 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2549 | else |
2554 | else |
2550 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2555 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
… | |
… | |
2678 | |
2683 | |
2679 | void |
2684 | void |
2680 | rxvt_term::selection_changed () NOTHROW |
2685 | rxvt_term::selection_changed () NOTHROW |
2681 | { |
2686 | { |
2682 | line_t &r1 = ROW (selection.beg.row); |
2687 | line_t &r1 = ROW (selection.beg.row); |
2683 | while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) |
2688 | while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR) |
2684 | --selection.beg.col; |
2689 | ++selection.beg.col; |
2685 | |
2690 | |
2686 | line_t &r2 = ROW (selection.end.row); |
2691 | line_t &r2 = ROW (selection.end.row); |
2687 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
2692 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
2688 | ++selection.end.col; |
2693 | ++selection.end.col; |
2689 | |
2694 | |
… | |
… | |
3072 | break; |
3077 | break; |
3073 | } |
3078 | } |
3074 | |
3079 | |
3075 | if (dirn == DN) |
3080 | if (dirn == DN) |
3076 | col++; /* put us on one past the end */ |
3081 | col++; /* put us on one past the end */ |
3077 | else |
|
|
3078 | { |
|
|
3079 | // if the delimiter on the left has width > 1 col points to the |
|
|
3080 | // first NOCHAR in the delimiter cell and so we must move it to the |
|
|
3081 | // beginning of the next cell. |
|
|
3082 | while (ROW(row).t[col] == NOCHAR) |
|
|
3083 | col++; |
|
|
3084 | } |
|
|
3085 | |
3082 | |
3086 | /* Poke the values back in */ |
3083 | /* Poke the values back in */ |
3087 | ret->row = row; |
3084 | ret->row = row; |
3088 | ret->col = col; |
3085 | ret->col = col; |
3089 | } |
3086 | } |