| … | |
… | |
| 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; |
| … | |
… | |
| 2051 | int i; /* tmp */ |
2048 | int i; /* tmp */ |
| 2052 | rend_t ccol1, /* Cursor colour */ |
2049 | rend_t ccol1, /* Cursor colour */ |
| 2053 | ccol2; /* Cursor colour2 */ |
2050 | ccol2; /* Cursor colour2 */ |
| 2054 | rend_t cur_rend; |
2051 | rend_t cur_rend; |
| 2055 | int cur_col; |
2052 | int cur_col; |
|
|
2053 | int cursorwidth; |
| 2056 | |
2054 | |
| 2057 | want_refresh = 0; /* screen is current */ |
2055 | want_refresh = 0; /* screen is current */ |
| 2058 | |
2056 | |
| 2059 | if (refresh_type == NO_REFRESH || !mapped) |
2057 | if (refresh_type == NO_REFRESH || !mapped) |
| 2060 | return; |
2058 | return; |
| … | |
… | |
| 2098 | { |
2096 | { |
| 2099 | int col = screen.cur.col; |
2097 | int col = screen.cur.col; |
| 2100 | |
2098 | |
| 2101 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2099 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
| 2102 | col--; |
2100 | col--; |
|
|
2101 | |
|
|
2102 | cursorwidth = 1; |
|
|
2103 | while (col + cursorwidth < ncol |
|
|
2104 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2105 | cursorwidth++; |
| 2103 | |
2106 | |
| 2104 | cur_rend = ROW(screen.cur.row).r[col]; |
2107 | cur_rend = ROW(screen.cur.row).r[col]; |
| 2105 | cur_col = col; |
2108 | cur_col = col; |
| 2106 | |
2109 | |
| 2107 | #ifndef NO_CURSORCOLOR |
2110 | #ifndef NO_CURSORCOLOR |
| … | |
… | |
| 2446 | else |
2449 | else |
| 2447 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2450 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
| 2448 | |
2451 | |
| 2449 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2452 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
| 2450 | { |
2453 | { |
|
|
2454 | if (showcursor && focus && row == screen.cur.row |
|
|
2455 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2456 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2457 | else |
| 2451 | #if ENABLE_FRILLS |
2458 | #if ENABLE_FRILLS |
| 2452 | if (ISSET_PIXCOLOR (Color_underline)) |
2459 | if (ISSET_PIXCOLOR (Color_underline)) |
| 2453 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2460 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
| 2454 | else |
2461 | else |
| 2455 | #endif |
2462 | #endif |
| … | |
… | |
| 2469 | { |
2476 | { |
| 2470 | if (focus) |
2477 | if (focus) |
| 2471 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2478 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
| 2472 | else if (oldcursor.row >= 0) |
2479 | else if (oldcursor.row >= 0) |
| 2473 | { |
2480 | { |
| 2474 | int cursorwidth = 1; |
|
|
| 2475 | int col = oldcursor.col; |
|
|
| 2476 | |
|
|
| 2477 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
| 2478 | col--; |
|
|
| 2479 | |
|
|
| 2480 | while (col + cursorwidth < ncol |
|
|
| 2481 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
| 2482 | cursorwidth++; |
|
|
| 2483 | |
|
|
| 2484 | #ifndef NO_CURSORCOLOR |
|
|
| 2485 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
| 2486 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
| 2487 | else |
|
|
| 2488 | #endif |
|
|
| 2489 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2481 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
| 2490 | |
2482 | |
| 2491 | XDrawRectangle (dpy, vt, gc, |
2483 | XDrawRectangle (dpy, vt, gc, |
| 2492 | Col2Pixel (col), |
2484 | Col2Pixel (cur_col), |
| 2493 | Row2Pixel (oldcursor.row), |
2485 | Row2Pixel (oldcursor.row), |
| 2494 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2486 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
| 2495 | (unsigned int) (Height2Pixel (1) - 1)); |
2487 | (unsigned int) (Height2Pixel (1) - 1)); |
| 2496 | } |
2488 | } |
| 2497 | } |
2489 | } |
