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.284 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.289 by ayin, Tue Dec 18 11:15:24 2007 UTC

… …
284#endif 284#endif
285 285
286#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy (); 287 bgPixmap.destroy ();
288#endif 288#endif
289 display->flush (); /* ideally .put should do this */
289 displays.put (display); 290 displays.put (display);
290 291
291 scr_release (); 292 scr_release ();
292 293
293 /* clear all resources */ 294 /* clear all resources */
… …
637 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
638 639
639 XrmInitialize (); 640 XrmInitialize ();
640} 641}
641 642
642/* ------------------------------------------------------------------------- *
643 * MEMORY ALLOCATION WRAPPERS *
644 * ------------------------------------------------------------------------- */
645void *
646rxvt_malloc (size_t size)
647{
648 void *p = malloc (size);
649
650 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n");
652
653 return p;
654}
655
656void *
657rxvt_calloc (size_t number, size_t size)
658{
659 void *p = calloc (number, size);
660
661 if (!p)
662 rxvt_fatal ("memory allocation failure. aborting.\n");
663
664 return p;
665}
666
667void *
668rxvt_realloc (void *ptr, size_t size)
669{
670 void *p = realloc (ptr, size);
671
672 if (!p)
673 rxvt_fatal ("memory allocation failure. aborting.\n");
674
675 return p;
676}
677
678/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
679/* 644/*
680 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
681 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
682 */ 647 */
… …
1712void 1677void
1713rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1714{ 1679{
1715 Window cr; 1680 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1718} 1683}
1719 1684
1720Pixmap 1685Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1686rxvt_term::get_pixmap_property (int prop_id)
1722{ 1687{
… …
1756 /* no chance of real time refresh if we are blurring! */ 1721 /* no chance of real time refresh if we are blurring! */
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1758 bgPixmap.render (); 1723 bgPixmap.render ();
1759 else 1724 else
1760 { 1725 {
1726 ev_tstamp refresh;
1761 update_background_ev.stop (); 1727 update_background_ev.stop ();
1762 1728
1763 if (!bgPixmap.need_client_side_rendering()) 1729 if (!bgPixmap.need_client_side_rendering ())
1764 update_background_ev.start (.05); 1730 refresh = .05;
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */ 1732 refresh = .20; /* very slow !!! */
1767 else 1733 else
1734 refresh = .07;
1768 update_background_ev.start (.07); 1735 update_background_ev.start (refresh);
1769 } 1736 }
1770 1737
1771 return 0; 1738 return 0;
1772} 1739}
1773 1740

Diff Legend

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