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.282 by root, Fri Dec 14 02:22:24 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
… …
185#endif 185#endif
186#ifndef NO_BELL 186#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188#endif 188#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
277 } 276 }
278 277
279 clear (); 278 clear ();
280 } 279 }
281 280
282 delete [] pix_colors_focused;
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP 281#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy (); 282 bgPixmap.destroy ();
289#endif 283#endif
284 display->flush (); /* ideally .put should do this */
290 displays.put (display); 285 displays.put (display);
291 286
292 scr_release (); 287 scr_release ();
293 288
294 /* clear all resources */ 289 /* clear all resources */
… …
352 incr_ev.stop (); 347 incr_ev.stop ();
353 termwin_ev.stop (display); 348 termwin_ev.stop (display);
354 vt_ev.stop (display); 349 vt_ev.stop (display);
355 } 350 }
356 351
357 prepare_ev.stop (); 352 flush_ev.stop ();
358 pty_ev.stop (); 353 pty_ev.stop ();
359#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
361#endif 356#endif
362#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
521 516
522#ifdef ENABLE_TRANSPARENCY 517#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent)) 518 if (option (Opt_transparent))
524 { 519 {
525 bgPixmap.set_transparent (); 520 bgPixmap.set_transparent ();
521
526#ifdef HAVE_AFTERIMAGE 522#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius]) 523 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif 525#endif
530 if (ISSET_PIXCOLOR (Color_tint)) 526 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
532 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
534 531
535 bgPixmap.set_root_pixmap (); 532 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
538 } 535 }
539#endif 536#endif
540 537
541#ifdef BG_IMAGE_FROM_FILE 538#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL) 539 if (rs[Rs_backgroundPixmap])
543 { 540 {
544 const char *p = rs[Rs_backgroundPixmap]; 541 const char *p = rs[Rs_backgroundPixmap];
545 542
546 if ((p = strchr (p, ';')) != NULL) 543 if ((p = strchr (p, ';')) != 0)
547 { 544 {
548 p++; 545 p++;
549 bgPixmap.set_geometry (p); 546 bgPixmap.set_geometry (p);
550 } 547 }
551 else 548 else
… …
570 free (cmd_argv); 567 free (cmd_argv);
571 568
572 if (pty->pty >= 0) 569 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ); 570 pty_ev.start (pty->pty, ev::READ);
574 571
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
578 573
579#if ENABLE_XEMBED 574#if ENABLE_XEMBED
580 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
581 { 576 {
… …
586 } 581 }
587#endif 582#endif
588 583
589 XMapWindow (dpy, vt); 584 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]); 585 XMapWindow (dpy, parent[0]);
586
587 refresh_check ();
591} 588}
592 589
593static struct sig_handlers 590static struct sig_handlers
594{ 591{
595 ev::sig sw_term, sw_int; 592 ev::sig sw_term, sw_int;
… …
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
641 638
642 XrmInitialize (); 639 XrmInitialize ();
643}
644
645/* ------------------------------------------------------------------------- *
646 * MEMORY ALLOCATION WRAPPERS *
647 * ------------------------------------------------------------------------- */
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679} 640}
680 641
681/*----------------------------------------------------------------------*/ 642/*----------------------------------------------------------------------*/
682/* 643/*
683 * window size/position calculations for XSizeHint and other storage. 644 * window size/position calculations for XSizeHint and other storage.
… …
1715void 1676void
1716rxvt_term::get_window_origin (int &x, int &y) 1677rxvt_term::get_window_origin (int &x, int &y)
1717{ 1678{
1718 Window cr; 1679 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1680 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1681/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1721} 1682}
1722 1683
1723Pixmap 1684Pixmap
1724rxvt_term::get_pixmap_property (int prop_id) 1685rxvt_term::get_pixmap_property (int prop_id)
1725{ 1686{
… …
1732 unsigned char *prop = NULL; 1693 unsigned char *prop = NULL;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1694 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1695 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop); 1696 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP) 1697 if (result == Success && prop && atype == XA_PIXMAP)
1737 {
1738 return *(Pixmap *)prop; 1698 return *(Pixmap *)prop;
1739 }
1740 } 1699 }
1700
1741 return None; 1701 return None;
1742} 1702}
1743 1703
1744#ifdef HAVE_BG_PIXMAP 1704#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS 1705# if TRACE_PIXMAPS
1746# undef update_background 1706# undef update_background
1707void
1747int rxvt_term::trace_update_background (const char *file, int line) 1708rxvt_term::trace_update_background (const char *file, int line)
1748{ 1709{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1710 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background (); 1711 update_background ();
1751} 1712}
1752# endif 1713# endif
1753 1714
1754int 1715void
1755rxvt_term::update_background () 1716rxvt_term::update_background ()
1756{ 1717{
1718 if (update_background_ev.is_active ())
1719 return;
1720
1757 bgPixmap.invalidate (); 1721 bgPixmap.invalidate ();
1758 1722
1759 /* no chance of real time refresh if we are blurring! */ 1723 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1724
1725 if (to_wait <= 0.)
1761 bgPixmap.render (); 1726 bgPixmap.render ();
1762 else 1727 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1728 update_background_ev.start (to_wait);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775} 1729}
1776 1730
1777void 1731void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1732rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1733{
1734 make_current ();
1735
1736 update_background_ev.stop ();
1780 bgPixmap.render (); 1737 bgPixmap.render ();
1738 refresh_check ();
1781} 1739}
1782 1740
1783#endif /* HAVE_BG_PIXMAP */ 1741#endif /* HAVE_BG_PIXMAP */
1784 1742
1785/*----------------------- end-of-file (C source) -----------------------*/ 1743/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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