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.274 by ayin, Tue Dec 11 11:53:48 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43# include <termios.h> 43#include <termios.h>
44 44
45#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 46# define X_LOCALE
47# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
48#else 48#else
… …
155{ 155{
156#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif 158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif 167#endif
168#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
… …
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
… …
473 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
475} 470}
476 471
477/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
478bool 473void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{ 475{
481 this->envv = envv; 476 this->envv = envv;
482 477
483 SET_R (this); 478 SET_R (this);
484 set_locale (""); 479 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
486 481
487 if (!init_vars ()) 482 init_vars ();
488 return false;
489 483
490 init_secondary (); 484 init_secondary ();
491 485
492 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
493 487
… …
517 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
518#endif 512#endif
519#ifdef HAVE_BG_PIXMAP 513#ifdef HAVE_BG_PIXMAP
520 { 514 {
521 bgPixmap.set_target (this); 515 bgPixmap.set_target (this);
516 bgPixmap.invalidate ();
522 517
523#ifdef ENABLE_TRANSPARENCY 518#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent)) 519 if (option (Opt_transparent))
525 { 520 {
526 bgPixmap.set_transparent (); 521 bgPixmap.set_transparent ();
522
527#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif 526#endif
531 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
533 if (rs [Rs_shade]) 530 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]); 531 bgPixmap.set_shade (rs [Rs_shade]);
535 532
536 bgPixmap.set_root_pixmap (); 533 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
539 } 536 }
540#endif 537#endif
541 538
542#ifdef BG_IMAGE_FROM_FILE 539#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL) 540 if (rs[Rs_backgroundPixmap])
544 { 541 {
545 const char *p = rs[Rs_backgroundPixmap]; 542 const char *p = rs[Rs_backgroundPixmap];
546 543
547 if ((p = strchr (p, ';')) != NULL) 544 if ((p = strchr (p, ';')) != 0)
548 { 545 {
549 p++; 546 p++;
550 bgPixmap.set_geometry (p); 547 bgPixmap.set_geometry (p);
551 } 548 }
552 else 549 else
… …
571 free (cmd_argv); 568 free (cmd_argv);
572 569
573 if (pty->pty >= 0) 570 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ); 571 pty_ev.start (pty->pty, ev::READ);
575 572
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
579 574
580#if ENABLE_XEMBED 575#if ENABLE_XEMBED
581 if (rs[Rs_embed]) 576 if (rs[Rs_embed])
582 { 577 {
… …
588#endif 583#endif
589 584
590 XMapWindow (dpy, vt); 585 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]); 586 XMapWindow (dpy, parent[0]);
592 587
593 return true; 588 refresh_check ();
594} 589}
595 590
596static struct sig_handlers 591static struct sig_handlers
597{ 592{
598 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
… …
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
644 639
645 XrmInitialize (); 640 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} 641}
683 642
684/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
685/* 644/*
686 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
1718void 1677void
1719rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1720{ 1679{
1721 Window cr; 1680 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1724} 1683}
1725 1684
1726Pixmap 1685Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1686rxvt_term::get_pixmap_property (int prop_id)
1728{ 1687{
… …
1735 unsigned char *prop = NULL; 1694 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1697 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1698 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop; 1699 return *(Pixmap *)prop;
1742 }
1743 } 1700 }
1701
1744 return None; 1702 return None;
1745} 1703}
1746 1704
1747#ifdef HAVE_BG_PIXMAP 1705#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS 1706# if TRACE_PIXMAPS
1749# undef update_background 1707# undef update_background
1708void
1750int rxvt_term::trace_update_background (const char *file, int line) 1709rxvt_term::trace_update_background (const char *file, int line)
1751{ 1710{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background (); 1712 update_background ();
1754} 1713}
1755# endif 1714# endif
1756 1715
1757int 1716void
1758rxvt_term::update_background () 1717rxvt_term::update_background ()
1759{ 1718{
1719 if (update_background_ev.is_active ())
1720 return;
1721
1760 bgPixmap.invalidate (); 1722 bgPixmap.invalidate ();
1761 1723
1762 /* no chance of real time refresh if we are blurring! */ 1724 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1725
1726 if (to_wait <= 0.)
1764 bgPixmap.render (); 1727 bgPixmap.render ();
1765 else 1728 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1729 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1730}
1779 1731
1780void 1732void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1733rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1734{
1735 make_current ();
1736
1737 update_background_ev.stop ();
1783 bgPixmap.render (); 1738 bgPixmap.render ();
1739 refresh_check ();
1784} 1740}
1785 1741
1786#endif /* HAVE_BG_PIXMAP */ 1742#endif /* HAVE_BG_PIXMAP */
1787 1743
1788/*----------------------- end-of-file (C source) -----------------------*/ 1744/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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