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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.289 by ayin, Tue Dec 18 11:15: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
… …
152 150
153} 151}
154#endif 152#endif
155 153
156rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
157 : 155{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 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 (this, &rxvt_term::cursor_blink_cb), 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 (this, &rxvt_term::text_blink_cb), 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 (this, &rxvt_term::cont_scroll_cb), 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
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 170#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 182#endif
176#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 185#endif
179#ifndef NO_BELL 186#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 188#endif
182 child_ev (this, &rxvt_term::child_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188{ 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 196
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 198
203 termlist.push_back (this); 199 termlist.push_back (this);
204 200
… …
288#endif 284#endif
289 285
290#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy (); 287 bgPixmap.destroy ();
292#endif 288#endif
289 display->flush (); /* ideally .put should do this */
293 displays.put (display); 290 displays.put (display);
294 291
295 scr_release (); 292 scr_release ();
296 293
297 /* clear all resources */ 294 /* clear all resources */
… …
330} 327}
331 328
332void 329void
333rxvt_term::destroy () 330rxvt_term::destroy ()
334{ 331{
335 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
336 return; 333 return;
337 334
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 336
340#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
355 incr_ev.stop (); 352 incr_ev.stop ();
356 termwin_ev.stop (display); 353 termwin_ev.stop (display);
357 vt_ev.stop (display); 354 vt_ev.stop (display);
358 } 355 }
359 356
360 prepare_ev.stop (); 357 flush_ev.stop ();
361 pty_ev.stop (); 358 pty_ev.stop ();
362#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
364#endif 361#endif
365#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
476 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
478} 475}
479 476
480/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
481bool 478void
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{ 480{
484 this->envv = envv; 481 this->envv = envv;
485 482
486 SET_R (this); 483 SET_R (this);
487 set_locale (""); 484 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
489 486
490 if (!init_vars ()) 487 init_vars ();
491 return false;
492 488
493 init_secondary (); 489 init_secondary ();
494 490
495 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
496 492
… …
574 free (cmd_argv); 570 free (cmd_argv);
575 571
576 if (pty->pty >= 0) 572 if (pty->pty >= 0)
577 pty_ev.start (pty->pty, ev::READ); 573 pty_ev.start (pty->pty, ev::READ);
578 574
579 prepare_ev.start ();
580
581 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
582 576
583#if ENABLE_XEMBED 577#if ENABLE_XEMBED
584 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
585 { 579 {
… …
590 } 584 }
591#endif 585#endif
592 586
593 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
595
596 return true;
597} 589}
598 590
599static struct sig_handlers 591static struct sig_handlers
600{ 592{
601 ev::sig sw_term, sw_int; 593 ev::sig sw_term, sw_int;
602 594
603 /* 595 /*
604 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
605 */ 597 */
606 void
607 sig_term (ev::sig &w, int revents) 598 void sig_term (ev::sig &w, int revents);
599
600 sig_handlers ()
608 { 601 {
609 rxvt_emergency_cleanup (); 602 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 604 }
619} sig_handlers; 605} sig_handlers;
606
607void
608sig_handlers::sig_term (ev::sig &w, int revents)
609{
610 rxvt_emergency_cleanup ();
611 w.stop ();
612 kill (getpid (), w.signum);
613}
620 614
621char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
622 616
623void 617void
624rxvt_init () 618rxvt_init ()
… …
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
645 639
646 XrmInitialize (); 640 XrmInitialize ();
647}
648
649/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */
652void *
653rxvt_malloc (size_t size)
654{
655 void *p = malloc (size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_calloc (size_t number, size_t size)
665{
666 void *p = calloc (number, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672}
673
674void *
675rxvt_realloc (void *ptr, size_t size)
676{
677 void *p = realloc (ptr, size);
678
679 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n");
681
682 return p;
683} 641}
684 642
685/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
686/* 644/*
687 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
828 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
831 789
832#if 0 790#if 0
833 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
836#endif 794#endif
837} 795}
838 796
… …
1719void 1677void
1720rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1721{ 1679{
1722 Window cr; 1680 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725} 1683}
1726 1684
1727Pixmap 1685Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1686rxvt_term::get_pixmap_property (int prop_id)
1729{ 1687{
… …
1763 /* no chance of real time refresh if we are blurring! */ 1721 /* no chance of real time refresh if we are blurring! */
1764 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))
1765 bgPixmap.render (); 1723 bgPixmap.render ();
1766 else 1724 else
1767 { 1725 {
1726 ev_tstamp refresh;
1768 update_background_ev.stop (); 1727 update_background_ev.stop ();
1769 1728
1770 if (!bgPixmap.need_client_side_rendering()) 1729 if (!bgPixmap.need_client_side_rendering ())
1771 update_background_ev.start (.05); 1730 refresh = .05;
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */ 1732 refresh = .20; /* very slow !!! */
1774 else 1733 else
1734 refresh = .07;
1775 update_background_ev.start (.07); 1735 update_background_ev.start (refresh);
1776 } 1736 }
1777 1737
1778 return 0; 1738 return 0;
1779} 1739}
1780 1740
1781void 1741void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1743{
1744 make_current ();
1784 bgPixmap.render (); 1745 bgPixmap.render ();
1746 refresh_check ();
1785} 1747}
1786 1748
1787#endif /* HAVE_BG_PIXMAP */ 1749#endif /* HAVE_BG_PIXMAP */
1788 1750
1789/*----------------------- end-of-file (C source) -----------------------*/ 1751/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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