ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.363 by sf-exg, Thu Jan 20 14:02:35 2011 UTC vs.
Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC

2508 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2509 } 2509 }
2510} 2510}
2511 2511
2512void 2512void
2513rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2514{
2515 bool transparent = false;
2516
2515#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2518 if (bgPixmap.pixmap != None)
2517#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bgPixmap.flags & bgPixmap_t::isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2520 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2522 2543
2523 if (scrollBar.win) 2544 if (scrollBar.win)
2524 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2527 scrollBar.show (0); 2551 scrollBar.show (0);
2528 } 2552 }
2529 2553
2530#endif 2554 if (refresh)
2531 2555 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2556 scr_clear ();
2534 scr_touch (true); 2557 scr_touch (true);
2558 }
2535 want_refresh = 1; 2559 want_refresh = 1;
2536} 2560}
2537 2561
2538/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2539void 2563void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines