| … | |
… | |
| 1903 | |
1903 | |
| 1904 | if (option (Opt_visualBell)) |
1904 | if (option (Opt_visualBell)) |
| 1905 | { |
1905 | { |
| 1906 | rvideo_bell = true; |
1906 | rvideo_bell = true; |
| 1907 | scr_rvideo_mode (rvideo_mode); |
1907 | scr_rvideo_mode (rvideo_mode); |
| 1908 | display->flush (); |
1908 | flush (); |
| 1909 | |
1909 | |
| 1910 | bell_ev.start (VISUAL_BELL_DURATION); |
1910 | bell_ev.start (VISUAL_BELL_DURATION); |
| 1911 | } |
1911 | } |
| 1912 | else |
1912 | else |
| 1913 | XBell (dpy, 0); |
1913 | XBell (dpy, 0); |
| … | |
… | |
| 2263 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2263 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
| 2264 | { |
2264 | { |
| 2265 | bool invert = rend & RS_RVid; |
2265 | bool invert = rend & RS_RVid; |
| 2266 | |
2266 | |
| 2267 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2267 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
| 2268 | if (rend & RS_Bold |
|
|
| 2269 | && fore == Color_fg) |
2268 | if (rend & RS_Bold && fore == Color_fg) |
| 2270 | { |
2269 | { |
| 2271 | if (ISSET_PIXCOLOR (Color_BD)) |
2270 | if (ISSET_PIXCOLOR (Color_BD)) |
| 2272 | fore = Color_BD; |
2271 | fore = Color_BD; |
| 2273 | # if !ENABLE_STYLES |
2272 | # if !ENABLE_STYLES |
| 2274 | else |
2273 | else |
| 2275 | invert = !invert; |
2274 | invert = !invert; |
| 2276 | # endif |
2275 | # endif |
| 2277 | } |
2276 | } |
| 2278 | |
2277 | |
| 2279 | if (rend & RS_Italic |
2278 | if (rend & RS_Italic && fore == Color_fg) |
| 2280 | && fore == Color_fg) |
|
|
| 2281 | { |
2279 | { |
| 2282 | if (ISSET_PIXCOLOR (Color_IT)) |
2280 | if (ISSET_PIXCOLOR (Color_IT)) |
| 2283 | fore = Color_IT; |
2281 | fore = Color_IT; |
| 2284 | # if !ENABLE_STYLES |
2282 | # if !ENABLE_STYLES |
| 2285 | else |
2283 | else |
| … | |
… | |
| 2475 | rxvt_term::scr_recolour () NOTHROW |
2473 | rxvt_term::scr_recolour () NOTHROW |
| 2476 | { |
2474 | { |
| 2477 | #ifdef HAVE_BG_PIXMAP |
2475 | #ifdef HAVE_BG_PIXMAP |
| 2478 | bgPixmap.apply (); |
2476 | bgPixmap.apply (); |
| 2479 | #else |
2477 | #else |
|
|
2478 | |
| 2480 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2479 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
| 2481 | XClearWindow (dpy, parent[0]); |
2480 | XClearWindow (dpy, parent[0]); |
| 2482 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2481 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2482 | |
| 2483 | # if HAVE_SCROLLBARS |
2483 | # if HAVE_SCROLLBARS |
| 2484 | if (scrollBar.win) |
2484 | if (scrollBar.win) |
| 2485 | { |
2485 | { |
| 2486 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2486 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
| 2487 | scrollBar.setIdle (); |
2487 | scrollBar.setIdle (); |
| 2488 | scrollbar_show (0); |
2488 | scrollbar_show (0); |
| 2489 | } |
2489 | } |
| 2490 | # endif |
2490 | # endif |
|
|
2491 | |
| 2491 | scr_clear (); |
2492 | scr_clear (); |
| 2492 | scr_touch (true); |
2493 | scr_touch (true); |
| 2493 | want_refresh = 1; |
2494 | want_refresh = 1; |
| 2494 | #endif |
|
|
| 2495 | |
2495 | |
|
|
2496 | #endif |
| 2496 | } |
2497 | } |
| 2497 | |
2498 | |
| 2498 | /* ------------------------------------------------------------------------- */ |
2499 | /* ------------------------------------------------------------------------- */ |
| 2499 | void |
2500 | void |
| 2500 | rxvt_term::scr_clear (bool really) NOTHROW |
2501 | rxvt_term::scr_clear (bool really) NOTHROW |
