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.279 by ayin, Wed Dec 12 09:33:48 2007 UTC vs.
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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);
… …
285#endif 284#endif
286 285
287#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy (); 287 bgPixmap.destroy ();
289#endif 288#endif
289 display->flush (); /* ideally .put should do this */
290 displays.put (display); 290 displays.put (display);
291 291
292 scr_release (); 292 scr_release ();
293 293
294 /* clear all resources */ 294 /* clear all resources */
… …
327} 327}
328 328
329void 329void
330rxvt_term::destroy () 330rxvt_term::destroy ()
331{ 331{
332 if (ev_is_active (&destroy_ev)) 332 if (destroy_ev.is_active ())
333 return; 333 return;
334 334
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 336
337#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
352 incr_ev.stop (); 352 incr_ev.stop ();
353 termwin_ev.stop (display); 353 termwin_ev.stop (display);
354 vt_ev.stop (display); 354 vt_ev.stop (display);
355 } 355 }
356 356
357 prepare_ev.stop (); 357 flush_ev.stop ();
358 pty_ev.stop (); 358 pty_ev.stop ();
359#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
361#endif 361#endif
362#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
473 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
475} 475}
476 476
477/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
478bool 478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{ 480{
481 this->envv = envv; 481 this->envv = envv;
482 482
483 SET_R (this); 483 SET_R (this);
… …
570 free (cmd_argv); 570 free (cmd_argv);
571 571
572 if (pty->pty >= 0) 572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ); 573 pty_ev.start (pty->pty, ev::READ);
574 574
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
578 576
579#if ENABLE_XEMBED 577#if ENABLE_XEMBED
580 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
581 { 579 {
… …
586 } 584 }
587#endif 585#endif
588 586
589 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
591
592 return true;
593} 589}
594 590
595static struct sig_handlers 591static struct sig_handlers
596{ 592{
597 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
… …
640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
642 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
643 639
644 XrmInitialize (); 640 XrmInitialize ();
645}
646
647/* ------------------------------------------------------------------------- *
648 * MEMORY ALLOCATION WRAPPERS *
649 * ------------------------------------------------------------------------- */
650void *
651rxvt_malloc (size_t size)
652{
653 void *p = malloc (size);
654
655 if (!p)
656 rxvt_fatal ("memory allocation failure. aborting.\n");
657
658 return p;
659}
660
661void *
662rxvt_calloc (size_t number, size_t size)
663{
664 void *p = calloc (number, size);
665
666 if (!p)
667 rxvt_fatal ("memory allocation failure. aborting.\n");
668
669 return p;
670}
671
672void *
673rxvt_realloc (void *ptr, size_t size)
674{
675 void *p = realloc (ptr, size);
676
677 if (!p)
678 rxvt_fatal ("memory allocation failure. aborting.\n");
679
680 return p;
681} 641}
682 642
683/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
684/* 644/*
685 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
1717void 1677void
1718rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1719{ 1679{
1720 Window cr; 1680 Window cr;
1721 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1722/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1723} 1683}
1724 1684
1725Pixmap 1685Pixmap
1726rxvt_term::get_pixmap_property (int prop_id) 1686rxvt_term::get_pixmap_property (int prop_id)
1727{ 1687{
… …
1761 /* no chance of real time refresh if we are blurring! */ 1721 /* no chance of real time refresh if we are blurring! */
1762 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))
1763 bgPixmap.render (); 1723 bgPixmap.render ();
1764 else 1724 else
1765 { 1725 {
1726 ev_tstamp refresh;
1766 update_background_ev.stop (); 1727 update_background_ev.stop ();
1767 1728
1768 if (!bgPixmap.need_client_side_rendering()) 1729 if (!bgPixmap.need_client_side_rendering ())
1769 update_background_ev.start (.05); 1730 refresh = .05;
1770 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1771 update_background_ev.start (.20); /* very slow !!! */ 1732 refresh = .20; /* very slow !!! */
1772 else 1733 else
1734 refresh = .07;
1773 update_background_ev.start (.07); 1735 update_background_ev.start (refresh);
1774 } 1736 }
1775 1737
1776 return 0; 1738 return 0;
1777} 1739}
1778 1740
1779void 1741void
1780rxvt_term::update_background_cb (ev::timer &w, int revents) 1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1781{ 1743{
1744 make_current ();
1782 bgPixmap.render (); 1745 bgPixmap.render ();
1746 refresh_check ();
1783} 1747}
1784 1748
1785#endif /* HAVE_BG_PIXMAP */ 1749#endif /* HAVE_BG_PIXMAP */
1786 1750
1787/*----------------------- end-of-file (C source) -----------------------*/ 1751/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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