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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC vs.
Revision 1.97 by sf-exg, Fri Oct 22 18:03:10 2010 UTC

428 { 428 {
429 flags = new_flags; 429 flags = new_flags;
430 changed++; 430 changed++;
431 } 431 }
432 432
433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 433 return (changed > 0);
436} 434}
437 435
438void 436void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
1540void 1538void
1541bgPixmap_t::apply () 1539bgPixmap_t::apply ()
1542{ 1540{
1543 if (target) 1541 if (target)
1544 { 1542 {
1545 flags &= ~isVtOrigin;
1546
1547 if (pixmap != None) 1543 if (pixmap != None)
1548 { 1544 {
1549 /* set target's background to pixmap */ 1545 /* set target's background to pixmap */
1550# ifdef ENABLE_TRANSPARENCY 1546# ifdef ENABLE_TRANSPARENCY
1551 if (flags & isTransparent) 1547 if (flags & isTransparent)
1557 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1553 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1558 } 1554 }
1559 else 1555 else
1560# endif 1556# endif
1561 { 1557 {
1562 flags |= isVtOrigin;
1563 /* force old pixmap dereference in case it was transparent before :*/ 1558 /* force old pixmap dereference in case it was transparent before :*/
1564 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1559 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1565 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1560 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1566 /* do we also need to set scrollbar's background here ? */ 1561 /* do we also need to set scrollbar's background here ? */
1567 1562

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines