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.280 by ayin, Wed Dec 12 11:35:56 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 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.
… …
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 */
… …
327} 322}
328 323
329void 324void
330rxvt_term::destroy () 325rxvt_term::destroy ()
331{ 326{
332 if (ev_is_active (&destroy_ev)) 327 if (destroy_ev.is_active ())
333 return; 328 return;
334 329
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 331
337#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
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
… …
516 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
517#endif 512#endif
518#ifdef HAVE_BG_PIXMAP 513#ifdef HAVE_BG_PIXMAP
519 { 514 {
520 bgPixmap.set_target (this); 515 bgPixmap.set_target (this);
516 bgPixmap.invalidate ();
521 517
522#ifdef ENABLE_TRANSPARENCY 518#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent)) 519 if (option (Opt_transparent))
524 { 520 {
525 bgPixmap.set_transparent (); 521 bgPixmap.set_transparent ();
522
526#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif 526#endif
530 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
532 if (rs [Rs_shade]) 530 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]); 531 bgPixmap.set_shade (rs [Rs_shade]);
534 532
535 bgPixmap.set_root_pixmap (); 533 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
538 } 536 }
539#endif 537#endif
540 538
541#ifdef BG_IMAGE_FROM_FILE 539#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL) 540 if (rs[Rs_backgroundPixmap])
543 { 541 {
544 const char *p = rs[Rs_backgroundPixmap]; 542 const char *p = rs[Rs_backgroundPixmap];
545 543
546 if ((p = strchr (p, ';')) != NULL) 544 if ((p = strchr (p, ';')) != 0)
547 { 545 {
548 p++; 546 p++;
549 bgPixmap.set_geometry (p); 547 bgPixmap.set_geometry (p);
550 } 548 }
551 else 549 else
… …
570 free (cmd_argv); 568 free (cmd_argv);
571 569
572 if (pty->pty >= 0) 570 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ); 571 pty_ev.start (pty->pty, ev::READ);
574 572
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
578 574
579#if ENABLE_XEMBED 575#if ENABLE_XEMBED
580 if (rs[Rs_embed]) 576 if (rs[Rs_embed])
581 { 577 {
… …
586 } 582 }
587#endif 583#endif
588 584
589 XMapWindow (dpy, vt); 585 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]); 586 XMapWindow (dpy, parent[0]);
587
588 refresh_check ();
591} 589}
592 590
593static struct sig_handlers 591static struct sig_handlers
594{ 592{
595 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
… …
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
641 639
642 XrmInitialize (); 640 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} 641}
680 642
681/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
682/* 644/*
683 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
1715void 1677void
1716rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1717{ 1679{
1718 Window cr; 1680 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1721} 1683}
1722 1684
1723Pixmap 1685Pixmap
1724rxvt_term::get_pixmap_property (int prop_id) 1686rxvt_term::get_pixmap_property (int prop_id)
1725{ 1687{
… …
1732 unsigned char *prop = NULL; 1694 unsigned char *prop = NULL;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop); 1697 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP) 1698 if (result == Success && prop && atype == XA_PIXMAP)
1737 {
1738 return *(Pixmap *)prop; 1699 return *(Pixmap *)prop;
1739 }
1740 } 1700 }
1701
1741 return None; 1702 return None;
1742} 1703}
1743 1704
1744#ifdef HAVE_BG_PIXMAP 1705#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS 1706# if TRACE_PIXMAPS
1746# undef update_background 1707# undef update_background
1708void
1747int rxvt_term::trace_update_background (const char *file, int line) 1709rxvt_term::trace_update_background (const char *file, int line)
1748{ 1710{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background (); 1712 update_background ();
1751} 1713}
1752# endif 1714# endif
1753 1715
1754int 1716void
1755rxvt_term::update_background () 1717rxvt_term::update_background ()
1756{ 1718{
1719 if (update_background_ev.is_active ())
1720 return;
1721
1757 bgPixmap.invalidate (); 1722 bgPixmap.invalidate ();
1758 1723
1759 /* no chance of real time refresh if we are blurring! */ 1724 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)) 1725
1726 if (to_wait <= 0.)
1761 bgPixmap.render (); 1727 bgPixmap.render ();
1762 else 1728 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1729 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} 1730}
1776 1731
1777void 1732void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1733rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1734{
1735 make_current ();
1736
1737 update_background_ev.stop ();
1780 bgPixmap.render (); 1738 bgPixmap.render ();
1739 refresh_check ();
1781} 1740}
1782 1741
1783#endif /* HAVE_BG_PIXMAP */ 1742#endif /* HAVE_BG_PIXMAP */
1784 1743
1785/*----------------------- end-of-file (C source) -----------------------*/ 1744/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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