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.300 by root, Sat Jan 19 00:24:53 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);
… …
226 for (int i = RS_styleCount; --i; ) 225 for (int i = RS_styleCount; --i; )
227 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
228 delete fontset[i]; 227 delete fontset[i];
229#endif 228#endif
230 delete fontset[0]; 229 delete fontset[0];
230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
231 234
232 if (display) 235 if (display)
233 { 236 {
234 selection_clear (); 237 selection_clear ();
235 238
… …
275 pix_colors_unfocused [i].free (this); 278 pix_colors_unfocused [i].free (this);
276#endif 279#endif
277 } 280 }
278 281
279 clear (); 282 clear ();
280 }
281 283
282 delete [] pix_colors_focused; 284 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
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++)
… …
327} 323}
328 324
329void 325void
330rxvt_term::destroy () 326rxvt_term::destroy ()
331{ 327{
332 if (ev_is_active (&destroy_ev)) 328 if (destroy_ev.is_active ())
333 return; 329 return;
334 330
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 332
337#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
… …
352 incr_ev.stop (); 348 incr_ev.stop ();
353 termwin_ev.stop (display); 349 termwin_ev.stop (display);
354 vt_ev.stop (display); 350 vt_ev.stop (display);
355 } 351 }
356 352
357 prepare_ev.stop (); 353 flush_ev.stop ();
358 pty_ev.stop (); 354 pty_ev.stop ();
359#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
361#endif 357#endif
362#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
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
… …
570 free (cmd_argv); 569 free (cmd_argv);
571 570
572 if (pty->pty >= 0) 571 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ); 572 pty_ev.start (pty->pty, ev::READ);
574 573
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
578 575
579#if ENABLE_XEMBED 576#if ENABLE_XEMBED
580 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
581 { 578 {
… …
586 } 583 }
587#endif 584#endif
588 585
589 XMapWindow (dpy, vt); 586 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]); 587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
591} 590}
592 591
593static struct sig_handlers 592static struct sig_handlers
594{ 593{
595 ev::sig sw_term, sw_int; 594 ev::sig sw_term, sw_int;
… …
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 638 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 639 XSetIOErrorHandler (rxvt_xioerror_handler);
641 640
642 XrmInitialize (); 641 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} 642}
680 643
681/*----------------------------------------------------------------------*/ 644/*----------------------------------------------------------------------*/
682/* 645/*
683 * window size/position calculations for XSizeHint and other storage. 646 * window size/position calculations for XSizeHint and other storage.
… …
1715void 1678void
1716rxvt_term::get_window_origin (int &x, int &y) 1679rxvt_term::get_window_origin (int &x, int &y)
1717{ 1680{
1718 Window cr; 1681 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1721} 1684}
1722 1685
1723Pixmap 1686Pixmap
1724rxvt_term::get_pixmap_property (int prop_id) 1687rxvt_term::get_pixmap_property (int prop_id)
1725{ 1688{
… …
1732 unsigned char *prop = NULL; 1695 unsigned char *prop = NULL;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1696 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1697 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop); 1698 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP) 1699 if (result == Success && prop && atype == XA_PIXMAP)
1737 {
1738 return *(Pixmap *)prop; 1700 return *(Pixmap *)prop;
1739 }
1740 } 1701 }
1702
1741 return None; 1703 return None;
1742} 1704}
1743 1705
1744#ifdef HAVE_BG_PIXMAP 1706#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS 1707# if TRACE_PIXMAPS
1746# undef update_background 1708# undef update_background
1709void
1747int rxvt_term::trace_update_background (const char *file, int line) 1710rxvt_term::trace_update_background (const char *file, int line)
1748{ 1711{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background (); 1713 update_background ();
1751} 1714}
1752# endif 1715# endif
1753 1716
1754int 1717void
1755rxvt_term::update_background () 1718rxvt_term::update_background ()
1756{ 1719{
1720 if (update_background_ev.is_active ())
1721 return;
1722
1757 bgPixmap.invalidate (); 1723 bgPixmap.invalidate ();
1758 1724
1759 /* no chance of real time refresh if we are blurring! */ 1725 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)) 1726
1727 if (to_wait <= 0.)
1761 bgPixmap.render (); 1728 bgPixmap.render ();
1762 else 1729 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1730 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} 1731}
1776 1732
1777void 1733void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1734rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1735{
1736 make_current ();
1737
1738 update_background_ev.stop ();
1780 bgPixmap.render (); 1739 bgPixmap.render ();
1740 refresh_check ();
1781} 1741}
1782 1742
1783#endif /* HAVE_BG_PIXMAP */ 1743#endif /* HAVE_BG_PIXMAP */
1784 1744
1785/*----------------------- end-of-file (C source) -----------------------*/ 1745/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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