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.283 by root, Fri Dec 14 05:25:25 2007 UTC vs.
Revision 1.298 by root, Sat Jan 12 22:13:46 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
… …
276 } 276 }
277 277
278 clear (); 278 clear ();
279 } 279 }
280 280
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP 281#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy (); 282 bgPixmap.destroy ();
288#endif 283#endif
284 display->flush (); /* ideally .put should do this */
289 displays.put (display); 285 displays.put (display);
290 286
291 scr_release (); 287 scr_release ();
292 288
293 /* clear all resources */ 289 /* clear all resources */
… …
520 516
521#ifdef ENABLE_TRANSPARENCY 517#ifdef ENABLE_TRANSPARENCY
522 if (option (Opt_transparent)) 518 if (option (Opt_transparent))
523 { 519 {
524 bgPixmap.set_transparent (); 520 bgPixmap.set_transparent ();
521
525#ifdef HAVE_AFTERIMAGE 522#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius]) 523 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif 525#endif
529 if (ISSET_PIXCOLOR (Color_tint)) 526 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
531 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
533 531
534 bgPixmap.set_root_pixmap (); 532 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
537 } 535 }
538#endif 536#endif
539 537
540#ifdef BG_IMAGE_FROM_FILE 538#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL) 539 if (rs[Rs_backgroundPixmap])
542 { 540 {
543 const char *p = rs[Rs_backgroundPixmap]; 541 const char *p = rs[Rs_backgroundPixmap];
544 542
545 if ((p = strchr (p, ';')) != NULL) 543 if ((p = strchr (p, ';')) != 0)
546 { 544 {
547 p++; 545 p++;
548 bgPixmap.set_geometry (p); 546 bgPixmap.set_geometry (p);
549 } 547 }
550 else 548 else
… …
583 } 581 }
584#endif 582#endif
585 583
586 XMapWindow (dpy, vt); 584 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]); 585 XMapWindow (dpy, parent[0]);
586
587 refresh_check ();
588} 588}
589 589
590static struct sig_handlers 590static struct sig_handlers
591{ 591{
592 ev::sig sw_term, sw_int; 592 ev::sig sw_term, sw_int;
… …
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
638 638
639 XrmInitialize (); 639 XrmInitialize ();
640}
641
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} 640}
677 641
678/*----------------------------------------------------------------------*/ 642/*----------------------------------------------------------------------*/
679/* 643/*
680 * window size/position calculations for XSizeHint and other storage. 644 * window size/position calculations for XSizeHint and other storage.
… …
1712void 1676void
1713rxvt_term::get_window_origin (int &x, int &y) 1677rxvt_term::get_window_origin (int &x, int &y)
1714{ 1678{
1715 Window cr; 1679 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1680 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1681/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1718} 1682}
1719 1683
1720Pixmap 1684Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1685rxvt_term::get_pixmap_property (int prop_id)
1722{ 1686{
… …
1729 unsigned char *prop = NULL; 1693 unsigned char *prop = NULL;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1694 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1695 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop); 1696 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP) 1697 if (result == Success && prop && atype == XA_PIXMAP)
1734 {
1735 return *(Pixmap *)prop; 1698 return *(Pixmap *)prop;
1736 }
1737 } 1699 }
1700
1738 return None; 1701 return None;
1739} 1702}
1740 1703
1741#ifdef HAVE_BG_PIXMAP 1704#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS 1705# if TRACE_PIXMAPS
1743# undef update_background 1706# undef update_background
1707void
1744int rxvt_term::trace_update_background (const char *file, int line) 1708rxvt_term::trace_update_background (const char *file, int line)
1745{ 1709{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1710 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background (); 1711 update_background ();
1748} 1712}
1749# endif 1713# endif
1750 1714
1751int 1715void
1752rxvt_term::update_background () 1716rxvt_term::update_background ()
1753{ 1717{
1718 if (update_background_ev.is_active ())
1719 return;
1720
1754 bgPixmap.invalidate (); 1721 bgPixmap.invalidate ();
1755 1722
1756 /* no chance of real time refresh if we are blurring! */ 1723 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1724
1725 if (to_wait <= 0.)
1758 bgPixmap.render (); 1726 bgPixmap.render ();
1759 else 1727 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering())
1764 update_background_ev.start (.05); 1728 update_background_ev.start (to_wait);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772} 1729}
1773 1730
1774void 1731void
1775rxvt_term::update_background_cb (ev::timer &w, int revents) 1732rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{ 1733{
1734 make_current ();
1735
1736 update_background_ev.stop ();
1777 bgPixmap.render (); 1737 bgPixmap.render ();
1738 refresh_check ();
1778} 1739}
1779 1740
1780#endif /* HAVE_BG_PIXMAP */ 1741#endif /* HAVE_BG_PIXMAP */
1781 1742
1782/*----------------------- end-of-file (C source) -----------------------*/ 1743/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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