--- rxvt-unicode/src/main.C 2004/08/25 05:03:33 1.108 +++ rxvt-unicode/src/main.C 2004/12/15 00:53:23 1.122 @@ -157,6 +157,8 @@ #ifdef USE_XIM im_ev (this, &rxvt_term::im_cb), #endif + sw_term (this, &rxvt_term::sig_term), + sw_chld (this, &rxvt_term::sig_chld), termwin_ev (this, &rxvt_term::x_cb), vt_ev (this, &rxvt_term::x_cb), check_ev (this, &rxvt_term::check_cb), @@ -259,9 +261,8 @@ free (env_term); free (env_colorfgbg); free (locale); -#if 0 - free (codeset); -#endif + free (v_buffer); + free (incr_buf); delete envv; delete argv; @@ -395,13 +396,6 @@ void rxvt_init () { - /* install exit handler for cleanup */ -#if 0 -#ifdef HAVE_ATEXIT - atexit (rxvt_clean_exit); -#else -#endif -#endif /* * Save and then give up any super-user privileges * If we need privileges in any area then we must specifically request it. @@ -412,21 +406,14 @@ rxvt_privileges (SAVE); rxvt_privileges (IGNORE); - 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); + signal (SIGHUP, SIG_IGN); + signal (SIGPIPE, SIG_IGN); /* need to trap SIGURG for SVR4 (Unixware) rlogin */ /* signal (SIGURG, SIG_DFL); */ old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + // TODO: handle this with exceptions and tolerate the memory loss //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); } @@ -437,42 +424,46 @@ * Catch a SIGCHLD signal and exit if the direct child has died */ -void rxvt_term::child_exited (int pid) -{ - for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) - if (pid == (*t)->cmd_pid) - { - (*t)->destroy (); - break; - } -} - -/* ARGSUSED */ -/* INTPROTO */ -RETSIGTYPE -rxvt_Child_signal (int sig __attribute__ ((unused))) +void +rxvt_term::sig_chld (sig_watcher &w) { - int pid, save_errno = errno; + // we are being called for every SIGCHLD, not just ours + int pid; while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) - rxvt_term::child_exited (pid); + for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) + if (pid == (*t)->cmd_pid) + { + (*t)->destroy (); + break; + } +} - errno = save_errno; +/*----------------------------------------------------------------------*/ +/* + * Exit gracefully, clearing the utmp entry and restoring tty attributes + * TODO: if debugging, this should free up any known resources if we can + */ +void +rxvt_destroy_all () +{ + // TODO: rxvtd should clean up all ressources + for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) + (*t)->destroy (); } /* * Catch a fatal signal and tidy up before quitting */ -/* INTPROTO */ -RETSIGTYPE -rxvt_Exit_signal (int sig) +void +rxvt_term::sig_term (sig_watcher &w) { - signal (sig, SIG_DFL); #ifdef DEBUG_CMD - rxvt_warn ("caught signal %d, exiting.\n", sig); + rxvt_warn ("caught signal %d, exiting.\n", w.signum); #endif - rxvt_clean_exit (); - kill (getpid (), sig); + rxvt_destroy_all (); + signal (w.signum, SIG_DFL); + kill (getpid (), w.signum); } /* INTPROTO */ @@ -490,67 +481,42 @@ return 0; } -/*----------------------------------------------------------------------*/ -/* - * Exit gracefully, clearing the utmp entry and restoring tty attributes - * TODO: if debugging, this should free up any known resources if we can - */ -/* INTPROTO */ -void -rxvt_clean_exit () -{ - // TODO: rxvtd should clean up all ressources - if (GET_R) - GET_R->destroy (); -} - /* ------------------------------------------------------------------------- * * MEMORY ALLOCATION WRAPPERS * * ------------------------------------------------------------------------- */ -/* INTPROTO */ -void * +void * rxvt_malloc (size_t size) { - void *p; + void *p = malloc (size); - p = malloc (size); - if (p) - return p; + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); - rxvt_fatal ("memory allocation failure. aborting.\n"); - /* NOTREACHED */ + return p; } /* INTPROTO */ void * rxvt_calloc (size_t number, size_t size) { - void *p; + void *p = calloc (number, size); - p = calloc (number, size); - if (p) - return p; + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); - rxvt_fatal ("memory allocation failure. aborting.\n"); - /* NOTREACHED */ + return p; } /* INTPROTO */ void * rxvt_realloc (void *ptr, size_t size) { - void *p; + void *p = realloc (ptr, size); - if (ptr) - p = realloc (ptr, size); - else - p = malloc (size); + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); - if (p) - return p; - - rxvt_fatal ("memory allocation failure. aborting.\n"); - /* NOTREACHED */ + return p; } /* ------------------------------------------------------------------------- * @@ -800,11 +766,8 @@ rxvt_fontset *fs = new rxvt_fontset (this); rxvt_fontprop prop; - prop.width = prop.height = prop.weight = prop.slant - = rxvt_fontprop::unset; - if (!fs - || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop) + || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed") || !fs->realize_font (1)) { delete fs; @@ -820,7 +783,8 @@ delete TermWin.fontset[0]; TermWin.fontset[0] = fs; - fs->prop = prop = (*fs)[1]->properties (); + prop = (*fs)[1]->properties (); + fs->set_prop (prop); TermWin.fwidth = prop.width; TermWin.fheight = prop.height; @@ -850,7 +814,8 @@ if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; } - fs->populate (res, prop2); + fs->populate (res); + fs->set_prop (prop2); } #else TermWin.fontset[style] = TermWin.fontset[0]; @@ -867,44 +832,46 @@ return true; } +void rxvt_term::set_string_property (Atom prop, const char *str, int len) +{ + // TODO: SMART_WINDOW_TITLE + XChangeProperty (display->display, TermWin.parent[0], + prop, XA_STRING, 8, PropModeReplace, + (const unsigned char *)str, len >= 0 ? len : strlen (str)); +} + +void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) +{ + // TODO: SMART_WINDOW_TITLE + wchar_t *ws = rxvt_mbstowcs (str, len); + char *s = rxvt_wcstoutf8 (ws); + + XChangeProperty (display->display, TermWin.parent[0], + prop, xa[XA_UTF8_STRING], 8, PropModeReplace, + (const unsigned char *)s, strlen (s)); + + free (s); + free (ws); +} + /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ /* xterm sequences - title, iconName, color (exptl) */ void rxvt_term::set_title (const char *str) { -#ifdef SMART_WINDOW_TITLE - char *name; - - if (!XFetchName (display->display, TermWin.parent[0], &name)) - name = NULL; - - if (name == NULL || strcmp (name, str)) -#endif - XStoreName (display->display, TermWin.parent[0], str); - -#ifdef SMART_WINDOW_TITLE - if (name) - XFree (name); + set_string_property (XA_WM_NAME, str); +#if ENABLE_FRILLS + set_utf8_property (xa[XA_NET_WM_NAME], str); #endif } void rxvt_term::set_icon_name (const char *str) { -#ifdef SMART_WINDOW_TITLE - char *name; - - if (!XGetIconName (display->display, TermWin.parent[0], &name)) - name = NULL; - - if (name == NULL || strcmp (name, str)) -#endif - XSetIconName (display->display, TermWin.parent[0], str); - -#ifdef SMART_WINDOW_TITLE - if (name) - XFree (name); + set_string_property (XA_WM_ICON_NAME, str); +#if ENABLE_FRILLS + set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif } @@ -1033,10 +1000,6 @@ } /*----------------------------------------------------------------------*/ -/* - * Colour determination for low colour displays, routine from - * Hans de Goede - */ int rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) @@ -1265,23 +1228,20 @@ void rxvt_term::IMSendSpot () { - XPoint spot; + XPoint nspot; XVaNestedList preedit_attr; if (!Input_Context || !TermWin.focus - || !(input_style & XIMPreeditPosition) -#if 0 - || !(event_type == KeyPress - || event_type == Expose - || event_type == NoExpose - || event_type == SelectionNotify - || event_type == ButtonRelease || event_type == FocusIn) -#endif - || !IMisRunning ()) + || !(input_style & XIMPreeditPosition)) return; - im_set_position (spot); + im_set_position (nspot); + + if (nspot.x == spot.x && nspot.y == spot.y) + return; + + spot = nspot; preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); @@ -1291,17 +1251,16 @@ void rxvt_term::im_destroy () { - if (Input_Context) - { - XDestroyIC (Input_Context); - Input_Context = 0; - } - if (input_method) { + if (Input_Context && input_method->xim) + XDestroyIC (Input_Context); + display->put_xim (input_method); input_method = 0; } + + Input_Context = 0; } /* @@ -1329,6 +1288,7 @@ return false; xim = input_method->xim; + spot.x = spot.y = -1; xim_styles = NULL; if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) @@ -1338,30 +1298,44 @@ return false; } - p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; - s = rxvt_splitcommastring (p); + const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" }; - for (i = found = 0; !found && s[i]; i++) + for (int pi = 0; pi < 2; pi++) { - if (!strcmp (s[i], "OverTheSpot")) - input_style = (XIMPreeditPosition | XIMStatusNothing); - else if (!strcmp (s[i], "OffTheSpot")) - input_style = (XIMPreeditArea | XIMStatusArea); - else if (!strcmp (s[i], "Root")) - input_style = (XIMPreeditNothing | XIMStatusNothing); - - for (j = 0; j < xim_styles->count_styles; j++) - if (input_style == xim_styles->supported_styles[j]) - { - found = 1; - break; - } + p = pet[pi]; + + if (!p) + continue; + + s = rxvt_splitcommastring (p); + + for (i = found = 0; !found && s[i]; i++) + { + if (!strcmp (s[i], "OverTheSpot")) + input_style = (XIMPreeditPosition | XIMStatusNothing); + else if (!strcmp (s[i], "OffTheSpot")) + input_style = (XIMPreeditArea | XIMStatusArea); + else if (!strcmp (s[i], "Root")) + input_style = (XIMPreeditNothing | XIMStatusNothing); + else if (!strcmp (s[i], "None")) + input_style = (XIMPreeditNone | XIMStatusNone); + + for (j = 0; j < xim_styles->count_styles; j++) + if (input_style == xim_styles->supported_styles[j]) + { + rxvt_freecommastring (s); + + found = 1; + goto foundpet; + } + + } + + rxvt_freecommastring (s); } - for (i = 0; s[i]; i++) - free (s[i]); +foundpet: - free (s); XFree (xim_styles); if (!found) @@ -1496,6 +1470,7 @@ bool found = false; s = rxvt_splitcommastring (p); + for (i = 0; s[i]; i++) { if (*s[i]) @@ -1509,9 +1484,8 @@ } } } - for (i = 0; s[i]; i++) - free (s[i]); - free (s); + + rxvt_freecommastring (s); if (found) goto done;