--- rxvt-unicode/src/main.C 2003/11/26 10:42:34 1.7 +++ rxvt-unicode/src/main.C 2003/12/16 23:04:13 1.12 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: main.c *----------------------------------------------------------------------* - * $Id: main.C,v 1.7 2003/11/26 10:42:34 pcg Exp $ + * $Id: main.C,v 1.12 2003/12/16 23:04:13 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -67,23 +67,72 @@ #ifdef POINTER_BLANK pointer_ev (this, &rxvt_term::pointer_cb), #endif - x_ev (this, &rxvt_term::x_cb) + x_ev (this, &rxvt_term::x_cb), + destroy_ev (this, &rxvt_term::destroy_cb), + check_ev (this, &rxvt_term::check_cb), + incr_ev (this, &rxvt_term::incr_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 () +{ + check_ev.stop (); + 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) +rxvt_init (int argc, const char *const *argv) { - SET_R(new rxvt_term); + SET_R (new rxvt_term); dR; if (!R->init_vars () || !R->init (argc, argv)) @@ -95,6 +144,36 @@ return R; } +/* EXTPROTO */ +void +rxvt_init_signals () +{ +/* install exit handler for cleanup */ +#if 0 +#ifdef HAVE_ATEXIT + atexit(rxvt_clean_exit); +#else +#endif +#endif + + struct sigaction sa; + + sigfillset (&sa.sa_mask); + sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; + sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); + sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0); + 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); + +/* need to trap SIGURG for SVR4 (Unixware) rlogin */ +/* signal (SIGURG, SIG_DFL); */ + + XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); +} + bool rxvt_term::init (int argc, const char *const *argv) { @@ -134,9 +213,6 @@ #if 0 #ifdef DEBUG_X XSynchronize(Xdisplay, True); - XSetErrorHandler((XErrorHandler) abort); -#else - XSetErrorHandler((XErrorHandler) rxvt_xerror_handler); #endif #endif @@ -164,7 +240,9 @@ x_ev.start (Xfd, EVENT_READ); pty_ev.start (cmd_fd, EVENT_READ); - flush (); + check_ev.start (); + + process_x_events (); return true; } @@ -180,18 +258,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 } /* @@ -215,18 +290,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 */ - } - 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 */ + 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 (); + } + + return 0; } /*----------------------------------------------------------------------*/ @@ -236,25 +313,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 (); } /* ------------------------------------------------------------------------- * @@ -556,26 +619,25 @@ * Tell the teletype handler what size the window is. * Called after a window size change. */ -/* EXTPROTO */ void -rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) +rxvt_term::tt_winch () { - struct winsize ws; + struct winsize ws; - if (fd < 0) - return; - ws.ws_col = col; - ws.ws_row = row; - ws.ws_xpixel = ws.ws_ypixel = 0; + if (cmd_fd < 0) + return; + + ws.ws_col = TermWin.ncol; + ws.ws_row = TermWin.nrow; + ws.ws_xpixel = ws.ws_ypixel = 0; #ifndef DEBUG_SIZE - (void)ioctl(fd, TIOCSWINSZ, &ws); + (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); #else - if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { - D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); - } + if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) + D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); # ifdef SIGWINCH - else if (pid) /* force through to the command */ - kill(pid, SIGWINCH); + else if (cmd_pid) /* force through to the command */ + kill (cmd_pid, SIGWINCH); # endif #endif } @@ -1004,8 +1066,8 @@ /* INTPROTO */ void -rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, - XRectangle * needed_rect) +rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, + XRectangle * needed_rect) { int mbh, vtx = 0; @@ -1059,49 +1121,53 @@ __attribute__ ((unused)), XPointer call_data __attribute__ ((unused))) { - dR; - int i, found, had_im; - const char *p; - char **s; - char buf[IMBUFSIZ]; + dR; + int i, found, had_im; + const char *p; + char **s; + char buf[IMBUFSIZ]; - D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); - if (R->Input_Context) - return; + D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); + if (R->Input_Context) + return; - found = had_im = 0; - p = R->rs[Rs_inputMethod]; - if (p && *p) { - had_im = 1; - s = rxvt_splitcommastring(p); - for (i = 0; s[i]; i++) { - if (*s[i]) { - STRCPY(buf, "@im="); - STRNCAT(buf, s[i], IMBUFSIZ - 5); - if ((p = XSetLocaleModifiers(buf)) != NULL && *p - && (rxvt_IM_get_IC(aR) == True)) { - found = 1; - break; + p = R->rs[Rs_inputMethod]; + if (p && *p) + { + bool found = false; + + s = rxvt_splitcommastring (p); + for (i = 0; s[i]; i++) + { + if (*s[i]) + { + STRCPY (buf, "@im="); + STRNCAT (buf, s[i], IMBUFSIZ - 5); + if ((p = XSetLocaleModifiers (buf)) && *p + && rxvt_IM_get_IC (aR)) + { + found = true; + break; } } } - for (i = 0; s[i]; i++) - free(s[i]); - free(s); - } - if (found) - return; + for (i = 0; s[i]; i++) + free(s[i]); + free(s); -/* try with XMODIFIERS env. var. */ - if ((p = XSetLocaleModifiers("")) != NULL && *p) { - rxvt_IM_get_IC(aR); + if (found) return; } +/* try with XMODIFIERS env. var. */ + if ((p = XSetLocaleModifiers ("")) && *p + && rxvt_IM_get_IC (aR)) + return; + /* try with no modifiers base IF the user didn't specify an IM */ - if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p - && rxvt_IM_get_IC(aR) == True) - return; + if ((p = XSetLocaleModifiers ("@im=none")) && *p + && rxvt_IM_get_IC (aR) == True) + return; } /*