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.278 by ayin, Tue Dec 11 21:52:23 2007 UTC vs.
Revision 1.292 by root, Mon Dec 24 10:58:09 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.
… …
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);
… …
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);
484 set_locale (""); 484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
486 486
487 if (!init_vars ()) 487 init_vars ();
488 return false;
489 488
490 init_secondary (); 489 init_secondary ();
491 490
492 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
493 492
… …
522 521
523#ifdef ENABLE_TRANSPARENCY 522#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent)) 523 if (option (Opt_transparent))
525 { 524 {
526 bgPixmap.set_transparent (); 525 bgPixmap.set_transparent ();
526
527#ifdef HAVE_AFTERIMAGE 527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius]) 528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif 530#endif
531 if (ISSET_PIXCOLOR (Color_tint)) 531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
533 if (rs [Rs_shade]) 534 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]); 535 bgPixmap.set_shade (rs [Rs_shade]);
535 536
536 bgPixmap.set_root_pixmap (); 537 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask); 538 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root); 539 rootwin_ev.start (display, display->root);
539 } 540 }
540#endif 541#endif
541 542
542#ifdef BG_IMAGE_FROM_FILE 543#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL) 544 if (rs[Rs_backgroundPixmap])
544 { 545 {
545 const char *p = rs[Rs_backgroundPixmap]; 546 const char *p = rs[Rs_backgroundPixmap];
546 547
547 if ((p = strchr (p, ';')) != NULL) 548 if ((p = strchr (p, ';')) != 0)
548 { 549 {
549 p++; 550 p++;
550 bgPixmap.set_geometry (p); 551 bgPixmap.set_geometry (p);
551 } 552 }
552 else 553 else
… …
571 free (cmd_argv); 572 free (cmd_argv);
572 573
573 if (pty->pty >= 0) 574 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ); 575 pty_ev.start (pty->pty, ev::READ);
575 576
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
579 578
580#if ENABLE_XEMBED 579#if ENABLE_XEMBED
581 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
582 { 581 {
… …
587 } 586 }
588#endif 587#endif
589 588
590 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
592
593 return true;
594} 591}
595 592
596static struct sig_handlers 593static struct sig_handlers
597{ 594{
598 ev::sig sw_term, sw_int; 595 ev::sig sw_term, sw_int;
… …
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 639 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 640 XSetIOErrorHandler (rxvt_xioerror_handler);
644 641
645 XrmInitialize (); 642 XrmInitialize ();
646}
647
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682} 643}
683 644
684/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
685/* 646/*
686 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
1718void 1679void
1719rxvt_term::get_window_origin (int &x, int &y) 1680rxvt_term::get_window_origin (int &x, int &y)
1720{ 1681{
1721 Window cr; 1682 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1724} 1685}
1725 1686
1726Pixmap 1687Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1688rxvt_term::get_pixmap_property (int prop_id)
1728{ 1689{
… …
1735 unsigned char *prop = NULL; 1696 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1697 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1698 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1699 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1700 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop; 1701 return *(Pixmap *)prop;
1742 }
1743 } 1702 }
1703
1744 return None; 1704 return None;
1745} 1705}
1746 1706
1747#ifdef HAVE_BG_PIXMAP 1707#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS 1708# if TRACE_PIXMAPS
1749# undef update_background 1709# undef update_background
1710void
1750int rxvt_term::trace_update_background (const char *file, int line) 1711rxvt_term::trace_update_background (const char *file, int line)
1751{ 1712{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1713 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background (); 1714 update_background ();
1754} 1715}
1755# endif 1716# endif
1756 1717
1757int 1718void
1758rxvt_term::update_background () 1719rxvt_term::update_background ()
1759{ 1720{
1760 bgPixmap.invalidate (); 1721 bgPixmap.invalidate ();
1761 1722
1762 /* no chance of real time refresh if we are blurring! */ 1723 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1724 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1725 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1726 {
1727 update_background_ev.stop ();
1764 bgPixmap.render (); 1728 bgPixmap.render ();
1729 }
1765 else 1730 else
1766 { 1731 {
1767 update_background_ev.stop (); 1732 ev_tstamp refresh;
1768 1733
1769 if (!bgPixmap.need_client_side_rendering()) 1734 if (!bgPixmap.need_client_side_rendering ())
1770 update_background_ev.start (.05); 1735 refresh = .05;
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1736 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */ 1737 refresh = .20; /* very slow !!! */
1773 else 1738 else
1739 refresh = .07;
1740
1774 update_background_ev.start (.07); 1741 update_background_ev.start (refresh);
1775 } 1742 }
1776
1777 return 0;
1778} 1743}
1779 1744
1780void 1745void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1746rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1747{
1748 make_current ();
1783 bgPixmap.render (); 1749 bgPixmap.render ();
1750 refresh_check ();
1784} 1751}
1785 1752
1786#endif /* HAVE_BG_PIXMAP */ 1753#endif /* HAVE_BG_PIXMAP */
1787 1754
1788/*----------------------- end-of-file (C source) -----------------------*/ 1755/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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