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.270 by root, Tue Dec 4 16:24:00 2007 UTC vs.
Revision 1.283 by root, Fri Dec 14 05:25:25 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);
… …
329} 326}
330 327
331void 328void
332rxvt_term::destroy () 329rxvt_term::destroy ()
333{ 330{
334 if (destroy_ev.active) 331 if (destroy_ev.is_active ())
335 return; 332 return;
336 333
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 335
339#if ENABLE_OVERLAY 336#if ENABLE_OVERLAY
… …
354 incr_ev.stop (); 351 incr_ev.stop ();
355 termwin_ev.stop (display); 352 termwin_ev.stop (display);
356 vt_ev.stop (display); 353 vt_ev.stop (display);
357 } 354 }
358 355
359 prepare_ev.stop (); 356 flush_ev.stop ();
360 pty_ev.stop (); 357 pty_ev.stop ();
361#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
363#endif 360#endif
364#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
475 rxvt_emergency_cleanup (); 472 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 473 _exit (EXIT_FAILURE);
477} 474}
478 475
479/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
480bool 477void
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{ 479{
483 this->envv = envv; 480 this->envv = envv;
484 481
485 SET_R (this); 482 SET_R (this);
486 set_locale (""); 483 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :( 484 set_environ (envv); // few things in X do not call setlocale :(
488 485
489 if (!init_vars ()) 486 init_vars ();
490 return false;
491 487
492 init_secondary (); 488 init_secondary ();
493 489
494 const char **cmd_argv = init_resources (argc, argv); 490 const char **cmd_argv = init_resources (argc, argv);
495 491
… …
573 free (cmd_argv); 569 free (cmd_argv);
574 570
575 if (pty->pty >= 0) 571 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ); 572 pty_ev.start (pty->pty, ev::READ);
577 573
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
581 575
582#if ENABLE_XEMBED 576#if ENABLE_XEMBED
583 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
584 { 578 {
… …
589 } 583 }
590#endif 584#endif
591 585
592 XMapWindow (dpy, vt); 586 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]); 587 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 588}
597 589
598static struct sig_handlers 590static struct sig_handlers
599{ 591{
600 ev::sig sw_term, sw_int; 592 ev::sig sw_term, sw_int;
601 593
602 /* 594 /*
603 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
604 */ 596 */
605 void
606 sig_term (ev::sig &w, int revents) 597 void sig_term (ev::sig &w, int revents);
607 {
608 rxvt_emergency_cleanup ();
609 w.stop ();
610 kill (getpid (), w.signum);
611 }
612 598
613 sig_handlers () 599 sig_handlers ()
614 { 600 {
615 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this); 601 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
616 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this); 602 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 } 603 }
618} sig_handlers; 604} sig_handlers;
619 605
606void
607sig_handlers::sig_term (ev::sig &w, int revents)
608{
609 rxvt_emergency_cleanup ();
610 w.stop ();
611 kill (getpid (), w.signum);
612}
613
620char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
621 615
622void 616void
623rxvt_init () 617rxvt_init ()
624{ 618{
… …
827 ws.ws_xpixel = width; 821 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 822 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
830 824
831#if 0 825#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 826 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 827 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 828 kill (-cmd_pid, SIGWINCH);
835#endif 829#endif
836} 830}
837 831

Diff Legend

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