--- rxvt-unicode/src/main.C 2003/11/25 11:52:42 1.3 +++ rxvt-unicode/src/main.C 2003/11/27 10:12:10 1.8 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: main.c *----------------------------------------------------------------------* - * $Id: main.C,v 1.3 2003/11/25 11:52:42 pcg Exp $ + * $Id: main.C,v 1.8 2003/11/27 10:12:10 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -44,13 +44,6 @@ # include #endif -rxvt_term::rxvt_term() -: pty_ev(this, &rxvt_term::pty_cb), - x_ev (this, &rxvt_term::x_cb) -{ - cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; -} - void * rxvt_term::operator new (size_t s) { @@ -66,89 +59,189 @@ free (p); } +rxvt_term::rxvt_term () +: pty_ev (this, &rxvt_term::pty_cb), +#ifdef CURSOR_BLINK + blink_ev (this, &rxvt_term::blink_cb), +#endif +#ifdef POINTER_BLANK + pointer_ev (this, &rxvt_term::pointer_cb), +#endif + x_ev (this, &rxvt_term::x_cb), + destroy_ev (this, &rxvt_term::destroy_cb) +{ + cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; +} + +rxvt_term::~rxvt_term () +{ + rxvt_scr_release (this); + +#ifndef NO_SETOWNER_TTYDEV + rxvt_privileged_ttydev (this, RESTORE); +#endif +#ifdef UTMP_SUPPORT + rxvt_privileged_utmp (this, RESTORE); +#endif +#ifdef USE_XIM + if (Input_Context != NULL) + { + XDestroyIC (Input_Context); + Input_Context = NULL; + } +#endif + + if (cmd_fd >= 0) + close (cmd_fd); + + if (Xfd >= 0) + XCloseDisplay (Xdisplay); + + delete PixColors; +} + +void +rxvt_term::destroy () +{ + pty_ev.stop (); + x_ev.stop (); +#ifdef CURSOR_BLINK + blink_ev.stop (); +#endif +#ifdef POINTER_BLANK + pointer_ev.stop (); +#endif + + destroy_ev.start (0); +} + +void +rxvt_term::destroy_cb (time_watcher &w) +{ + SET_R (this); + + delete this; +} + /*----------------------------------------------------------------------*/ /* rxvt_init() */ /* LIBPROTO */ rxvt_t rxvt_init(int argc, const char *const *argv) { - const char **cmd_argv; - SET_R(new rxvt_term); dR; - if (rxvt_init_vars(aR) < 0) + if (!R->init_vars () || !R->init (argc, argv)) { - free(R); + delete R; return NULL; } -/* - * Save and then give up any super-user privileges - * If we need privileges in any area then we must specifically request it. - * We should only need to be root in these cases: - * 1. write utmp entries on some systems - * 2. chown tty on some systems - */ - rxvt_privileges(aR_ SAVE); - rxvt_privileges(aR_ IGNORE); + return R; +} + +/* EXTPROTO */ +void +rxvt_init_signals () +{ +/* install exit handler for cleanup */ +#if 0 +#ifdef HAVE_ATEXIT + atexit(rxvt_clean_exit); +#else +# ifdef HAVE_ON_EXIT + on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */ +# endif +#endif +#endif + + struct sigaction sa; - rxvt_init_secondary(aR); + sigfillset (&sa.sa_mask); + sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; + sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE + sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); + sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); + sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); + sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); - cmd_argv = rxvt_init_resources(aR_ argc, argv); +/* need to trap SIGURG for SVR4 (Unixware) rlogin */ +/* signal (SIGURG, SIG_DFL); */ - R->x_ev.start (ConnectionNumber (R->Xdisplay), EVENT_READ); + XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); +} + +bool +rxvt_term::init (int argc, const char *const *argv) +{ + dR;//TODO (scrollbar, setidle) + + /* + * Save and then give up any super-user privileges + * If we need privileges in any area then we must specifically request it. + * We should only need to be root in these cases: + * 1. write utmp entries on some systems + * 2. chown tty on some systems + */ + rxvt_privileges (this, SAVE); + rxvt_privileges (this, IGNORE); + + rxvt_init_secondary (this); + + const char **cmd_argv = rxvt_init_resources (this, argc, argv); #if (MENUBAR_MAX) - rxvt_menubar_read(aR_ R->rs[Rs_menu]); + rxvt_menubar_read (this, rs[Rs_menu]); #endif #ifdef HAVE_SCROLLBARS - if (R->Options & Opt_scrollBar) - scrollbar_setIdle(); /* set existence for size calculations */ + if (Options & Opt_scrollBar) + scrollbar_setIdle (); /* set existence for size calculations */ #endif - rxvt_Create_Windows(aR_ argc, argv); + rxvt_Create_Windows (this, argc, argv); - rxvt_init_xlocale(aR); + rxvt_init_xlocale (this); - rxvt_scr_reset(aR); /* initialize screen */ + rxvt_scr_reset (this); /* initialize screen */ #ifdef RXVT_GRAPHICS - rxvt_Gr_reset(aR); /* reset graphics */ + rxvt_Gr_reset (this); /* reset graphics */ #endif #if 0 #ifdef DEBUG_X - XSynchronize(R->Xdisplay, True); - XSetErrorHandler((XErrorHandler) abort); -#else - XSetErrorHandler((XErrorHandler) rxvt_xerror_handler); + XSynchronize(Xdisplay, True); #endif #endif #ifdef HAVE_SCROLLBARS - if (R->Options & Opt_scrollBar) - rxvt_Resize_scrollBar(aR); /* create and map scrollbar */ + if (Options & Opt_scrollBar) + rxvt_Resize_scrollBar (this); /* create and map scrollbar */ #endif #if (MENUBAR_MAX) - if (menubar_visible(r)) - XMapWindow(R->Xdisplay, R->menuBar.win); + if (menubar_visible(r)) + XMapWindow (Xdisplay, menuBar.win); #endif #ifdef TRANSPARENT - if (R->Options & Opt_transparent) - { - XSelectInput(R->Xdisplay, Xroot, PropertyChangeMask); - rxvt_check_our_parents(aR); - } + if (Options & Opt_transparent) + { + XSelectInput (Xdisplay, Xroot, PropertyChangeMask); + rxvt_check_our_parents (this); + } #endif - XMapWindow(R->Xdisplay, R->TermWin.vt); - XMapWindow(R->Xdisplay, R->TermWin.parent[0]); + XMapWindow (Xdisplay, TermWin.vt); + XMapWindow (Xdisplay, TermWin.parent[0]); + + rxvt_init_env (this); + rxvt_init_command (this, cmd_argv); - rxvt_init_env(aR); - rxvt_init_command(aR_ cmd_argv); + x_ev.start (Xfd, EVENT_READ); + pty_ev.start (cmd_fd, EVENT_READ); - R->pty_ev.start (R->cmd_fd, EVENT_READ); + flush (); - return R; + return true; } /* ------------------------------------------------------------------------- * @@ -162,18 +255,15 @@ RETSIGTYPE rxvt_Child_signal(int sig __attribute__ ((unused))) { - dR; - int pid, save_errno = errno; - - do { - errno = 0; - } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); + int pid, save_errno = errno; + while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) + ; + errno = save_errno; +#if 0 if (pid == R->cmd_pid) - exit(EXIT_SUCCESS); - - errno = save_errno; - signal(SIGCHLD, rxvt_Child_signal); + exit (EXIT_SUCCESS); +#endif } /* @@ -197,18 +287,20 @@ rxvt_xerror_handler(const Display * display __attribute__ ((unused)), const XErrorEvent * event) { - dR; + dR; - if (R->allowedxerror == -1) { - R->allowedxerror = event->error_code; - return 0; /* ignored anyway */ + if (R->allowedxerror == -1) + R->allowedxerror = event->error_code; + else + { + rxvt_print_error("XError: Request: %d . %d, Error: %d", + event->request_code, event->minor_code, + event->error_code); + + R->destroy (); } - rxvt_print_error("XError: Request: %d . %d, Error: %d", - event->request_code, event->minor_code, - event->error_code); -/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ - exit(EXIT_FAILURE); -/* NOTREACHED */ + + return 0; } /*----------------------------------------------------------------------*/ @@ -218,25 +310,11 @@ */ /* EXTPROTO */ void -rxvt_clean_exit(void) +rxvt_clean_exit () { - dR; + dR; -#ifdef DEBUG_SCREEN - rxvt_scr_release(aR); -#endif -#ifndef NO_SETOWNER_TTYDEV - rxvt_privileged_ttydev(aR_ RESTORE); -#endif -#ifdef UTMP_SUPPORT - rxvt_privileged_utmp(aR_ RESTORE); -#endif -#ifdef USE_XIM - if (R->Input_Context != NULL) { - XDestroyIC(R->Input_Context); - R->Input_Context = NULL; - } -#endif + R->destroy (); } /* ------------------------------------------------------------------------- *