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.273 by ayin, Tue Dec 11 11:39:06 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.
… …
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
… …
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
… …
571 free (cmd_argv); 570 free (cmd_argv);
572 571
573 if (pty->pty >= 0) 572 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ); 573 pty_ev.start (pty->pty, ev::READ);
575 574
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
579 576
580#if ENABLE_XEMBED 577#if ENABLE_XEMBED
581 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
582 { 579 {
… …
587 } 584 }
588#endif 585#endif
589 586
590 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
592
593 return true;
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;
… …
643 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
644 639
645 XrmInitialize (); 640 XrmInitialize ();
646} 641}
647 642
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}
683
684/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
685/* 644/*
686 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
687 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
688 */ 647 */
… …
827 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830 789
831#if 0 790#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
835#endif 794#endif
836} 795}
837 796
… …
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{
… …
1762 /* no chance of real time refresh if we are blurring! */ 1721 /* no chance of real time refresh if we are blurring! */
1763 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))
1764 bgPixmap.render (); 1723 bgPixmap.render ();
1765 else 1724 else
1766 { 1725 {
1726 ev_tstamp refresh;
1767 update_background_ev.stop (); 1727 update_background_ev.stop ();
1768 1728
1769 if (!bgPixmap.need_client_side_rendering()) 1729 if (!bgPixmap.need_client_side_rendering ())
1770 update_background_ev.start (.05); 1730 refresh = .05;
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */ 1732 refresh = .20; /* very slow !!! */
1773 else 1733 else
1734 refresh = .07;
1774 update_background_ev.start (.07); 1735 update_background_ev.start (refresh);
1775 } 1736 }
1776 1737
1777 return 0; 1738 return 0;
1778} 1739}
1779 1740
1780void 1741void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1743{
1744 make_current ();
1783 bgPixmap.render (); 1745 bgPixmap.render ();
1746 refresh_check ();
1784} 1747}
1785 1748
1786#endif /* HAVE_BG_PIXMAP */ 1749#endif /* HAVE_BG_PIXMAP */
1787 1750
1788/*----------------------- end-of-file (C source) -----------------------*/ 1751/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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