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.271 by root, Tue Dec 4 16:33:42 2007 UTC vs.
Revision 1.288 by ayin, Tue Dec 18 01:36:24 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#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
45#endif
46 44
47#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 46# define X_LOCALE
49# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
50#else 48#else
… …
157{ 155{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 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);
160#endif 158#endif
161#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
162 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);
163#endif 161#endif
164#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
165 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);
166#endif 164#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 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);
169#endif 167#endif
170#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
… …
187#endif 185#endif
188#ifndef NO_BELL 186#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 188#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
287#endif 284#endif
288 285
289#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy (); 287 bgPixmap.destroy ();
291#endif 288#endif
289 display->flush (); /* ideally .put should do this */
292 displays.put (display); 290 displays.put (display);
293 291
294 scr_release (); 292 scr_release ();
295 293
296 /* clear all resources */ 294 /* clear all resources */
… …
329} 327}
330 328
331void 329void
332rxvt_term::destroy () 330rxvt_term::destroy ()
333{ 331{
334 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
335 return; 333 return;
336 334
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 336
339#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
354 incr_ev.stop (); 352 incr_ev.stop ();
355 termwin_ev.stop (display); 353 termwin_ev.stop (display);
356 vt_ev.stop (display); 354 vt_ev.stop (display);
357 } 355 }
358 356
359 prepare_ev.stop (); 357 flush_ev.stop ();
360 pty_ev.stop (); 358 pty_ev.stop ();
361#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
363#endif 361#endif
364#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
475 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
477} 475}
478 476
479/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
480bool 478void
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{ 480{
483 this->envv = envv; 481 this->envv = envv;
484 482
485 SET_R (this); 483 SET_R (this);
486 set_locale (""); 484 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
488 486
489 if (!init_vars ()) 487 init_vars ();
490 return false;
491 488
492 init_secondary (); 489 init_secondary ();
493 490
494 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
495 492
… …
573 free (cmd_argv); 570 free (cmd_argv);
574 571
575 if (pty->pty >= 0) 572 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ); 573 pty_ev.start (pty->pty, ev::READ);
577 574
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
581 576
582#if ENABLE_XEMBED 577#if ENABLE_XEMBED
583 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
584 { 579 {
… …
589 } 584 }
590#endif 585#endif
591 586
592 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 589}
597 590
598static struct sig_handlers 591static struct sig_handlers
599{ 592{
600 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
… …
645 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
646 639
647 XrmInitialize (); 640 XrmInitialize ();
648} 641}
649 642
650/* ------------------------------------------------------------------------- *
651 * MEMORY ALLOCATION WRAPPERS *
652 * ------------------------------------------------------------------------- */
653void *
654rxvt_malloc (size_t size)
655{
656 void *p = malloc (size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_calloc (size_t number, size_t size)
666{
667 void *p = calloc (number, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673}
674
675void *
676rxvt_realloc (void *ptr, size_t size)
677{
678 void *p = realloc (ptr, size);
679
680 if (!p)
681 rxvt_fatal ("memory allocation failure. aborting.\n");
682
683 return p;
684}
685
686/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
687/* 644/*
688 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
690 */ 647 */
… …
829 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
830 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
832 789
833#if 0 790#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
837#endif 794#endif
838} 795}
839 796
… …
1764 /* no chance of real time refresh if we are blurring! */ 1721 /* no chance of real time refresh if we are blurring! */
1765 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))
1766 bgPixmap.render (); 1723 bgPixmap.render ();
1767 else 1724 else
1768 { 1725 {
1726 ev_tstamp refresh;
1769 update_background_ev.stop (); 1727 update_background_ev.stop ();
1770 1728
1771 if (!bgPixmap.need_client_side_rendering()) 1729 if (!bgPixmap.need_client_side_rendering ())
1772 update_background_ev.start (.05); 1730 refresh = .05;
1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1774 update_background_ev.start (.20); /* very slow !!! */ 1732 refresh = .20; /* very slow !!! */
1775 else 1733 else
1734 refresh = .07;
1776 update_background_ev.start (.07); 1735 update_background_ev.start (refresh);
1777 } 1736 }
1778 1737
1779 return 0; 1738 return 0;
1780} 1739}
1781 1740
1782void 1741void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1743{
1744 make_current ();
1785 bgPixmap.render (); 1745 bgPixmap.render ();
1746 refresh_check ();
1786} 1747}
1787 1748
1788#endif /* HAVE_BG_PIXMAP */ 1749#endif /* HAVE_BG_PIXMAP */
1789 1750
1790/*----------------------- end-of-file (C source) -----------------------*/ 1751/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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