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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.288 by ayin, Tue Dec 18 01:36:24 2007 UTC vs.
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC

… …
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif 179#endif
180#ifdef USE_XIM 180#ifdef USE_XIM
… …
521 521
522#ifdef ENABLE_TRANSPARENCY 522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent)) 523 if (option (Opt_transparent))
524 { 524 {
525 bgPixmap.set_transparent (); 525 bgPixmap.set_transparent ();
526
526#ifdef HAVE_AFTERIMAGE 527#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius]) 528 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif 530#endif
530 if (ISSET_PIXCOLOR (Color_tint)) 531 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
532 if (rs [Rs_shade]) 534 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]); 535 bgPixmap.set_shade (rs [Rs_shade]);
534 536
535 bgPixmap.set_root_pixmap (); 537 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask); 538 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root); 539 rootwin_ev.start (display, display->root);
538 } 540 }
539#endif 541#endif
540 542
541#ifdef BG_IMAGE_FROM_FILE 543#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL) 544 if (rs[Rs_backgroundPixmap])
543 { 545 {
544 const char *p = rs[Rs_backgroundPixmap]; 546 const char *p = rs[Rs_backgroundPixmap];
545 547
546 if ((p = strchr (p, ';')) != NULL) 548 if ((p = strchr (p, ';')) != 0)
547 { 549 {
548 p++; 550 p++;
549 bgPixmap.set_geometry (p); 551 bgPixmap.set_geometry (p);
550 } 552 }
551 else 553 else
… …
1677void 1679void
1678rxvt_term::get_window_origin (int &x, int &y) 1680rxvt_term::get_window_origin (int &x, int &y)
1679{ 1681{
1680 Window cr; 1682 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683} 1685}
1684 1686
1685Pixmap 1687Pixmap
1686rxvt_term::get_pixmap_property (int prop_id) 1688rxvt_term::get_pixmap_property (int prop_id)
1687{ 1689{
… …
1694 unsigned char *prop = NULL; 1696 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1697 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1698 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop); 1699 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP) 1700 if (result == Success && prop && atype == XA_PIXMAP)
1699 {
1700 return *(Pixmap *)prop; 1701 return *(Pixmap *)prop;
1701 }
1702 } 1702 }
1703
1703 return None; 1704 return None;
1704} 1705}
1705 1706
1706#ifdef HAVE_BG_PIXMAP 1707#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS 1708# if TRACE_PIXMAPS
1708# undef update_background 1709# undef update_background
1710void
1709int rxvt_term::trace_update_background (const char *file, int line) 1711rxvt_term::trace_update_background (const char *file, int line)
1710{ 1712{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1713 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background (); 1714 update_background ();
1713} 1715}
1714# endif 1716# endif
1715 1717
1716int 1718void
1717rxvt_term::update_background () 1719rxvt_term::update_background ()
1718{ 1720{
1719 bgPixmap.invalidate (); 1721 bgPixmap.invalidate ();
1720 1722
1721 /* no chance of real time refresh if we are blurring! */ 1723 /* no chance of real time refresh if we are blurring! */
1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1724 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1725 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1726 {
1727 update_background_ev.stop ();
1723 bgPixmap.render (); 1728 bgPixmap.render ();
1729 }
1724 else 1730 else
1725 { 1731 {
1726 ev_tstamp refresh; 1732 ev_tstamp refresh;
1727 update_background_ev.stop ();
1728 1733
1729 if (!bgPixmap.need_client_side_rendering ()) 1734 if (!bgPixmap.need_client_side_rendering ())
1730 refresh = .05; 1735 refresh = .05;
1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1736 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732 refresh = .20; /* very slow !!! */ 1737 refresh = .20; /* very slow !!! */
1733 else 1738 else
1734 refresh = .07; 1739 refresh = .07;
1740
1735 update_background_ev.start (refresh); 1741 update_background_ev.start (refresh);
1736 } 1742 }
1737
1738 return 0;
1739} 1743}
1740 1744
1741void 1745void
1742rxvt_term::update_background_cb (ev::timer &w, int revents) 1746rxvt_term::update_background_cb (ev::timer &w, int revents)
1743{ 1747{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines