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.287 by ayin, Tue Dec 18 01:26:42 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 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
… …
275#endif 275#endif
276 } 276 }
277 277
278 clear (); 278 clear ();
279 } 279 }
280
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285 280
286#ifdef HAVE_BG_PIXMAP 281#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy (); 282 bgPixmap.destroy ();
288#endif 283#endif
289 display->flush (); /* ideally .put should do this */ 284 display->flush (); /* ideally .put should do this */
… …
516 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
517#endif 512#endif
518#ifdef HAVE_BG_PIXMAP 513#ifdef HAVE_BG_PIXMAP
519 { 514 {
520 bgPixmap.set_target (this); 515 bgPixmap.set_target (this);
516 bgPixmap.invalidate ();
521 517
522#ifdef ENABLE_TRANSPARENCY 518#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent)) 519 if (option (Opt_transparent))
524 { 520 {
525 bgPixmap.set_transparent (); 521 bgPixmap.set_transparent ();
522
526#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif 526#endif
530 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
532 if (rs [Rs_shade]) 530 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]); 531 bgPixmap.set_shade (rs [Rs_shade]);
534 532
535 bgPixmap.set_root_pixmap (); 533 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
538 } 536 }
539#endif 537#endif
540 538
541#ifdef BG_IMAGE_FROM_FILE 539#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL) 540 if (rs[Rs_backgroundPixmap])
543 { 541 {
544 const char *p = rs[Rs_backgroundPixmap]; 542 const char *p = rs[Rs_backgroundPixmap];
545 543
546 if ((p = strchr (p, ';')) != NULL) 544 if ((p = strchr (p, ';')) != 0)
547 { 545 {
548 p++; 546 p++;
549 bgPixmap.set_geometry (p); 547 bgPixmap.set_geometry (p);
550 } 548 }
551 else 549 else
… …
584 } 582 }
585#endif 583#endif
586 584
587 XMapWindow (dpy, vt); 585 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]); 586 XMapWindow (dpy, parent[0]);
587
588 refresh_check ();
589} 589}
590 590
591static struct sig_handlers 591static struct sig_handlers
592{ 592{
593 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
… …
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
639 639
640 XrmInitialize (); 640 XrmInitialize ();
641}
642
643/* ------------------------------------------------------------------------- *
644 * MEMORY ALLOCATION WRAPPERS *
645 * ------------------------------------------------------------------------- */
646void *
647rxvt_malloc (size_t size)
648{
649 void *p = malloc (size);
650
651 if (!p)
652 rxvt_fatal ("memory allocation failure. aborting.\n");
653
654 return p;
655}
656
657void *
658rxvt_calloc (size_t number, size_t size)
659{
660 void *p = calloc (number, size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_realloc (void *ptr, size_t size)
670{
671 void *p = realloc (ptr, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677} 641}
678 642
679/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
680/* 644/*
681 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
1713void 1677void
1714rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1715{ 1679{
1716 Window cr; 1680 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1719} 1683}
1720 1684
1721Pixmap 1685Pixmap
1722rxvt_term::get_pixmap_property (int prop_id) 1686rxvt_term::get_pixmap_property (int prop_id)
1723{ 1687{
… …
1730 unsigned char *prop = NULL; 1694 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop); 1697 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP) 1698 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop; 1699 return *(Pixmap *)prop;
1737 }
1738 } 1700 }
1701
1739 return None; 1702 return None;
1740} 1703}
1741 1704
1742#ifdef HAVE_BG_PIXMAP 1705#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS 1706# if TRACE_PIXMAPS
1744# undef update_background 1707# undef update_background
1708void
1745int rxvt_term::trace_update_background (const char *file, int line) 1709rxvt_term::trace_update_background (const char *file, int line)
1746{ 1710{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background (); 1712 update_background ();
1749} 1713}
1750# endif 1714# endif
1751 1715
1752int 1716void
1753rxvt_term::update_background () 1717rxvt_term::update_background ()
1754{ 1718{
1719 if (update_background_ev.is_active ())
1720 return;
1721
1755 bgPixmap.invalidate (); 1722 bgPixmap.invalidate ();
1756 1723
1757 /* no chance of real time refresh if we are blurring! */ 1724 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1725
1726 if (to_wait <= 0.)
1759 bgPixmap.render (); 1727 bgPixmap.render ();
1760 else 1728 else
1761 {
1762 ev_tstamp refresh;
1763 update_background_ev.stop ();
1764
1765 if (!bgPixmap.need_client_side_rendering ())
1766 refresh = .05;
1767 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1768 refresh = .20; /* very slow !!! */
1769 else
1770 refresh = .07;
1771 update_background_ev.start (refresh); 1729 update_background_ev.start (to_wait);
1772 }
1773
1774 return 0;
1775} 1730}
1776 1731
1777void 1732void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1733rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1734{
1780 make_current (); 1735 make_current ();
1736
1737 update_background_ev.stop ();
1781 bgPixmap.render (); 1738 bgPixmap.render ();
1782 refresh_check (); 1739 refresh_check ();
1783} 1740}
1784 1741
1785#endif /* HAVE_BG_PIXMAP */ 1742#endif /* HAVE_BG_PIXMAP */

Diff Legend

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