| … | |
… | |
| 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); |
| … | |
… | |
| 2046 | int i; /* tmp */ |
2048 | int i; /* tmp */ |
| 2047 | rend_t ccol1, /* Cursor colour */ |
2049 | rend_t ccol1, /* Cursor colour */ |
| 2048 | ccol2; /* Cursor colour2 */ |
2050 | ccol2; /* Cursor colour2 */ |
| 2049 | rend_t cur_rend; |
2051 | rend_t cur_rend; |
| 2050 | int cur_col; |
2052 | int cur_col; |
|
|
2053 | int cursorwidth; |
| 2051 | |
2054 | |
| 2052 | want_refresh = 0; /* screen is current */ |
2055 | want_refresh = 0; /* screen is current */ |
| 2053 | |
2056 | |
| 2054 | if (refresh_type == NO_REFRESH || !mapped) |
2057 | if (refresh_type == NO_REFRESH || !mapped) |
| 2055 | return; |
2058 | return; |
| … | |
… | |
| 2093 | { |
2096 | { |
| 2094 | int col = screen.cur.col; |
2097 | int col = screen.cur.col; |
| 2095 | |
2098 | |
| 2096 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2099 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
| 2097 | col--; |
2100 | col--; |
|
|
2101 | |
|
|
2102 | cursorwidth = 1; |
|
|
2103 | while (col + cursorwidth < ncol |
|
|
2104 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2105 | cursorwidth++; |
| 2098 | |
2106 | |
| 2099 | cur_rend = ROW(screen.cur.row).r[col]; |
2107 | cur_rend = ROW(screen.cur.row).r[col]; |
| 2100 | cur_col = col; |
2108 | cur_col = col; |
| 2101 | |
2109 | |
| 2102 | #ifndef NO_CURSORCOLOR |
2110 | #ifndef NO_CURSORCOLOR |
| … | |
… | |
| 2441 | else |
2449 | else |
| 2442 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2450 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
| 2443 | |
2451 | |
| 2444 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2452 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
| 2445 | { |
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 |
| 2446 | #if ENABLE_FRILLS |
2458 | #if ENABLE_FRILLS |
| 2447 | if (ISSET_PIXCOLOR (Color_underline)) |
2459 | if (ISSET_PIXCOLOR (Color_underline)) |
| 2448 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2460 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
| 2449 | else |
2461 | else |
| 2450 | #endif |
2462 | #endif |
| … | |
… | |
| 2464 | { |
2476 | { |
| 2465 | if (focus) |
2477 | if (focus) |
| 2466 | 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); |
| 2467 | else if (oldcursor.row >= 0) |
2479 | else if (oldcursor.row >= 0) |
| 2468 | { |
2480 | { |
| 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]); |
2481 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
| 2485 | |
2482 | |
| 2486 | XDrawRectangle (dpy, vt, gc, |
2483 | XDrawRectangle (dpy, vt, gc, |
| 2487 | Col2Pixel (col), |
2484 | Col2Pixel (cur_col), |
| 2488 | Row2Pixel (oldcursor.row), |
2485 | Row2Pixel (oldcursor.row), |
| 2489 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2486 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
| 2490 | (unsigned int) (Height2Pixel (1) - 1)); |
2487 | (unsigned int) (Height2Pixel (1) - 1)); |
| 2491 | } |
2488 | } |
| 2492 | } |
2489 | } |
