| … | |
… | |
| 2118 | ccol2 = bgcolor_of (rstyle); |
2118 | ccol2 = bgcolor_of (rstyle); |
| 2119 | #else |
2119 | #else |
| 2120 | ccol2 = Color_bg; |
2120 | ccol2 = Color_bg; |
| 2121 | #endif |
2121 | #endif |
| 2122 | |
2122 | |
| 2123 | if (focus) |
2123 | if (focus && cursor_type != 2) |
| 2124 | { |
2124 | { |
| 2125 | rend_t rend = cur_rend; |
2125 | rend_t rend = cur_rend; |
| 2126 | |
2126 | |
| 2127 | if (option (Opt_cursorUnderline)) |
2127 | if (cursor_type == 1) |
| 2128 | rend ^= RS_Uline; |
2128 | rend ^= RS_Uline; |
| 2129 | else |
2129 | else |
| 2130 | { |
2130 | { |
| 2131 | rend ^= RS_RVid; |
2131 | rend ^= RS_RVid; |
| 2132 | rend = SET_FGCOLOR (rend, ccol1); |
2132 | rend = SET_FGCOLOR (rend, ccol1); |
| … | |
… | |
| 2139 | |
2139 | |
| 2140 | /* make sure no outline cursor is left around */ |
2140 | /* make sure no outline cursor is left around */ |
| 2141 | if (ocrow != -1) |
2141 | if (ocrow != -1) |
| 2142 | { |
2142 | { |
| 2143 | if (screen.cur.row - view_start != ocrow |
2143 | if (screen.cur.row - view_start != ocrow |
| 2144 | || screen.cur.col != oldcursor.col) |
2144 | || screen.cur.col != oldcursor.col || !showcursor) |
| 2145 | { |
2145 | { |
| 2146 | if (ocrow < nrow |
2146 | if (ocrow < nrow |
| 2147 | && oldcursor.col < ncol) |
2147 | && oldcursor.col < ncol) |
| 2148 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2148 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
| 2149 | } |
2149 | } |
| 2150 | } |
2150 | } |
| 2151 | |
2151 | |
| 2152 | // save the current cursor coordinates if the cursor is visible |
2152 | // save the current cursor coordinates if the cursor is visible |
| 2153 | // and the window is unfocused, so as to clear the outline cursor |
2153 | // and either the window is unfocused or the cursor style is |
| 2154 | // in the next refresh if the cursor moves |
2154 | // vertical bar, so as to clear the outline cursor in the next |
|
|
2155 | // refresh if the cursor moves or becomes invisible |
| 2155 | if (showcursor && !focus && screen.cur.row - view_start < nrow) |
2156 | if (showcursor && (!focus || cursor_type == 2) && screen.cur.row - view_start < nrow) |
| 2156 | { |
2157 | { |
| 2157 | oldcursor.row = screen.cur.row - view_start; |
2158 | oldcursor.row = screen.cur.row - view_start; |
| 2158 | oldcursor.col = screen.cur.col; |
2159 | oldcursor.col = screen.cur.col; |
| 2159 | } |
2160 | } |
| 2160 | else |
2161 | else |
| … | |
… | |
| 2456 | * G: cleanup cursor and display outline cursor if necessary |
2457 | * G: cleanup cursor and display outline cursor if necessary |
| 2457 | */ |
2458 | */ |
| 2458 | if (showcursor) |
2459 | if (showcursor) |
| 2459 | { |
2460 | { |
| 2460 | if (focus) |
2461 | if (focus) |
|
|
2462 | { |
|
|
2463 | if (cursor_type != 2) |
| 2461 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2464 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
|
|
2465 | else if (oldcursor.row >= 0) |
|
|
2466 | { |
|
|
2467 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2468 | XFillRectangle (dpy, vt, gc, |
|
|
2469 | Col2Pixel (cur_col), |
|
|
2470 | Row2Pixel (oldcursor.row), |
|
|
2471 | 1, |
|
|
2472 | Height2Pixel (1)); |
|
|
2473 | } |
|
|
2474 | } |
| 2462 | else if (oldcursor.row >= 0) |
2475 | else if (oldcursor.row >= 0) |
| 2463 | { |
2476 | { |
| 2464 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2477 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
| 2465 | |
2478 | |
| 2466 | XDrawRectangle (dpy, vt, gc, |
2479 | XDrawRectangle (dpy, vt, gc, |
