… | |
… | |
409 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
411 | |
411 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | |
413 | |
414 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
416 | |
416 | |
417 | if (current_screen != PRIMARY) |
417 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
418 | scr_swap_screen (); |
419 | |
419 | |
… | |
… | |
1978 | int i; /* tmp */ |
1978 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1979 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1981 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1982 | rend_t *crp; // cursor rendition pointer |
|
|
1983 | rend_t ccol1, /* Cursor colour */ |
|
|
1984 | ccol2; /* Cursor colour2 */ |
1983 | |
1985 | |
1984 | want_refresh = 0; /* screen is current */ |
1986 | want_refresh = 0; /* screen is current */ |
1985 | |
1987 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
1988 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
1989 | return; |
… | |
… | |
2008 | /* |
2010 | /* |
2009 | * C: set the cursor character (s) |
2011 | * C: set the cursor character (s) |
2010 | */ |
2012 | */ |
2011 | { |
2013 | { |
2012 | unsigned char setoldcursor; |
2014 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2015 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2017 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2018 | if (hidden_cursor) |
2019 | showcursor = 0; |
2019 | showcursor = 0; |
… | |
… | |
2025 | |
2025 | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2027 | col--; |
2028 | |
2028 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2029 | crp = &ROW(screen.cur.row).r[col]; |
|
|
2030 | |
|
|
2031 | #ifndef NO_CURSORCOLOR |
|
|
2032 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2033 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2034 | ccol1 = Color_cursor; |
|
|
2035 | else |
|
|
2036 | #endif |
|
|
2037 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2038 | ccol1 = fgcolor_of (rstyle); |
|
|
2039 | #else |
|
|
2040 | ccol1 = Color_fg; |
|
|
2041 | #endif |
|
|
2042 | |
|
|
2043 | #ifndef NO_CURSORCOLOR |
|
|
2044 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2045 | ccol2 = Color_cursor2; |
|
|
2046 | else |
|
|
2047 | #endif |
|
|
2048 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2049 | ccol2 = bgcolor_of (rstyle); |
|
|
2050 | #else |
|
|
2051 | ccol2 = Color_bg; |
|
|
2052 | #endif |
2030 | |
2053 | |
2031 | if (showcursor && focus) |
2054 | if (showcursor && focus) |
2032 | { |
2055 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2056 | if (OPTION (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2057 | *crp ^= RS_Uline; |
2035 | else |
2058 | else |
2036 | { |
2059 | { |
2037 | *crp ^= RS_RVid; |
2060 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2061 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2062 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2063 | } |
2061 | } |
2064 | } |
2062 | } |
2065 | } |
2063 | |
2066 | |
2064 | /* make sure no outline cursor is left around */ |
2067 | /* make sure no outline cursor is left around */ |
… | |
… | |
2253 | int back = bgcolor_of (rend); // desired background |
2256 | int back = bgcolor_of (rend); // desired background |
2254 | |
2257 | |
2255 | // only do special processing if any attributes are set, which is unlikely |
2258 | // only do special processing if any attributes are set, which is unlikely |
2256 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2257 | { |
2260 | { |
2258 | #if ENABLE_STYLES |
|
|
2259 | // "careful" (too wide) character handling |
|
|
2260 | |
|
|
2261 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2262 | while (text > stp |
|
|
2263 | && srp[text - stp - 1] & RS_Careful |
|
|
2264 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2265 | text--, count++, xpixel -= fwidth; |
|
|
2266 | |
|
|
2267 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2268 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2269 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2270 | |
|
|
2271 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2272 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2273 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2274 | #endif |
|
|
2275 | |
|
|
2276 | bool invert = rend & RS_RVid; |
2261 | bool invert = rend & RS_RVid; |
2277 | |
2262 | |
2278 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2279 | if (rend & RS_Bold |
2264 | if (rend & RS_Bold |
2280 | && fore == Color_fg) |
2265 | && fore == Color_fg) |
… | |
… | |
2296 | else |
2281 | else |
2297 | invert = !invert; |
2282 | invert = !invert; |
2298 | # endif |
2283 | # endif |
2299 | } |
2284 | } |
2300 | |
2285 | |
2301 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2286 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2302 | fore = Color_UL; |
2287 | fore = Color_UL; |
2303 | #endif |
2288 | #endif |
2304 | |
2289 | |
2305 | if (invert) |
2290 | if (invert) |
2306 | { |
2291 | { |
|
|
2292 | #ifdef OPTION_HC |
|
|
2293 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2294 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2295 | #endif |
|
|
2296 | /* invert the column if no highlightColor is set or it is the |
|
|
2297 | * current cursor column */ |
2307 | ::swap (fore, back); |
2298 | ::swap (fore, back); |
|
|
2299 | #ifdef OPTION_HC |
|
|
2300 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2301 | back = Color_HC; |
|
|
2302 | #endif |
2308 | |
2303 | |
2309 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2304 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2305 | # ifndef OPTION_HC |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
2306 | if (ISSET_PIXCOLOR (Color_RV)) |
2311 | back = Color_RV; |
2307 | back = Color_RV; |
2312 | |
2308 | # endif |
2313 | if (fore == back) |
2309 | if (fore == back) |
2314 | { |
2310 | { |
2315 | fore = Color_bg; |
2311 | fore = Color_bg; |
2316 | back = Color_fg; |
2312 | back = Color_fg; |
2317 | } |
2313 | } |
… | |
… | |
2328 | } |
2324 | } |
2329 | else if (hidden_text) |
2325 | else if (hidden_text) |
2330 | fore = back; |
2326 | fore = back; |
2331 | } |
2327 | } |
2332 | #endif |
2328 | #endif |
|
|
2329 | |
|
|
2330 | #if ENABLE_STYLES |
|
|
2331 | // "careful" (too wide) character handling |
|
|
2332 | |
|
|
2333 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2334 | while (text > stp |
|
|
2335 | && srp[text - stp - 1] & RS_Careful |
|
|
2336 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2337 | text--, count++, xpixel -= fwidth; |
|
|
2338 | |
|
|
2339 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2340 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2341 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2342 | |
|
|
2343 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2344 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2345 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2346 | #endif |
2333 | } |
2347 | } |
2334 | |
2348 | |
2335 | /* |
2349 | /* |
2336 | * Actually do the drawing of the string here |
2350 | * Actually do the drawing of the string here |
2337 | */ |
2351 | */ |
2338 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2352 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2339 | |
2353 | |
2340 | if (back == fore) |
2354 | if (have_bg && back == Color_bg) |
2341 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2342 | else if (back == Color_bg && have_bg) |
|
|
2343 | { |
2355 | { |
2344 | // this is very ugly, maybe push it into ->draw? |
2356 | // this is very ugly, maybe push it into ->draw? |
2345 | |
2357 | |
2346 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2358 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2347 | if (text[i] != ' ') |
2359 | if (text[i] != ' ') |
2348 | { |
2360 | { |
2349 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2361 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2350 | goto did_clear; |
2362 | goto did_clear; |
2351 | } |
2363 | } |
2352 | |
2364 | |
2353 | CLEAR_CHARS (xpixel, ypixel, count); |
2365 | CLEAR_CHARS (xpixel, ypixel, count); |
2354 | did_clear: ; |
2366 | did_clear: ; |
… | |
… | |
2407 | cursorwidth++; |
2419 | cursorwidth++; |
2408 | |
2420 | |
2409 | #ifndef NO_CURSORCOLOR |
2421 | #ifndef NO_CURSORCOLOR |
2410 | if (ISSET_PIXCOLOR (Color_cursor)) |
2422 | if (ISSET_PIXCOLOR (Color_cursor)) |
2411 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2423 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2424 | else |
2412 | #endif |
2425 | #endif |
|
|
2426 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2413 | |
2427 | |
2414 | XDrawRectangle (dpy, drawBuffer, gc, |
2428 | XDrawRectangle (dpy, drawBuffer, gc, |
2415 | Col2Pixel (col), |
2429 | Col2Pixel (col), |
2416 | Row2Pixel (oldcursor.row), |
2430 | Row2Pixel (oldcursor.row), |
2417 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2431 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |