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

Diff Legend

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