--- rxvt-unicode/src/main.C 2004/12/13 19:16:36 1.120 +++ rxvt-unicode/src/main.C 2005/11/30 21:05:39 1.148 @@ -32,9 +32,9 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "main.intpro" /* PROTOS for internal routines */ -#include +#include +#include #ifdef TTY_GID_SUPPORT # include @@ -44,7 +44,9 @@ # include #endif -#include +#ifdef KEYSYM_RESOURCE +# include "keyboard.h" +#endif vector rxvt_term::termlist; @@ -157,8 +159,6 @@ #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), @@ -170,21 +170,35 @@ cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; termlist.push_back (this); + +#ifdef KEYSYM_RESOURCE + keyboard = new keyboard_manager; + + if (!keyboard) + rxvt_fatal ("out of memory, aborting.\n"); +#endif } -rxvt_term::~rxvt_term () +// clean up the most important stuff, do *not* call x or free mem etc. +// for use before an emergency exit +void rxvt_term::emergency_cleanup () { - termlist.erase (find (termlist.begin (), termlist.end(), this)); - if (cmd_pid) kill (-cmd_pid, SIGHUP); - pty.put (); - #ifdef UTMP_SUPPORT privileged_utmp (RESTORE); #endif + pty.put (); +} + +rxvt_term::~rxvt_term () +{ + termlist.erase (find (termlist.begin (), termlist.end(), this)); + + emergency_cleanup (); + #if ENABLE_STYLES for (int i = RS_styleCount; --i; ) if (TermWin.fontset[i] != TermWin.fontset[0]) @@ -194,55 +208,57 @@ if (display) { + dDisp; + selection_clear (); #ifdef USE_XIM im_destroy (); #endif #ifdef MENUBAR - if (menubarGC) XFreeGC (display->display, menubarGC); + if (menubarGC) XFreeGC (disp, menubarGC); #endif #ifdef XTERM_SCROLLBAR - if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); - if (ShadowGC) XFreeGC (display->display, ShadowGC); + if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); + if (ShadowGC) XFreeGC (disp, ShadowGC); #endif #ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); + if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); #endif #ifdef NEXT_SCROLLBAR - if (blackGC) XFreeGC (display->display, blackGC); - if (whiteGC) XFreeGC (display->display, whiteGC); - if (grayGC) XFreeGC (display->display, grayGC); - if (darkGC) XFreeGC (display->display, darkGC); - if (stippleGC) XFreeGC (display->display, stippleGC); - if (dimple) XFreePixmap (display->display, dimple); - if (upArrow) XFreePixmap (display->display, upArrow); - if (downArrow) XFreePixmap (display->display, downArrow); - if (upArrowHi) XFreePixmap (display->display, upArrowHi); - if (downArrowHi) XFreePixmap (display->display, downArrowHi); + if (blackGC) XFreeGC (disp, blackGC); + if (whiteGC) XFreeGC (disp, whiteGC); + if (grayGC) XFreeGC (disp, grayGC); + if (darkGC) XFreeGC (disp, darkGC); + if (stippleGC) XFreeGC (disp, stippleGC); + if (dimple) XFreePixmap (disp, dimple); + if (upArrow) XFreePixmap (disp, upArrow); + if (downArrow) XFreePixmap (disp, downArrow); + if (upArrowHi) XFreePixmap (disp, upArrowHi); + if (downArrowHi) XFreePixmap (disp, downArrowHi); #endif #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) - if (topShadowGC) XFreeGC (display->display, topShadowGC); - if (botShadowGC) XFreeGC (display->display, botShadowGC); - if (scrollbarGC) XFreeGC (display->display, scrollbarGC); + if (topShadowGC) XFreeGC (disp, topShadowGC); + if (botShadowGC) XFreeGC (disp, botShadowGC); + if (scrollbarGC) XFreeGC (disp, scrollbarGC); #endif - if (TermWin.gc) XFreeGC (display->display, TermWin.gc); + if (TermWin.gc) XFreeGC (disp, TermWin.gc); #if defined(MENUBAR) && (MENUBAR_MAX > 1) delete menuBar.drawable; //if (menuBar.win) - // XDestroyWindow (display->display, menuBar.win); + // XDestroyWindow (disp, menuBar.win); #endif delete TermWin.drawable; // destroy all windows if (TermWin.parent[0]) - XDestroyWindow (display->display, TermWin.parent[0]); + XDestroyWindow (disp, TermWin.parent[0]); } // TODO: free pixcolours, colours should become part of rxvt_display delete pix_colors_focused; -#ifdef OFF_FOCUS_FADING +#if OFF_FOCUS_FADING delete pix_colors_unfocused; #endif @@ -252,7 +268,7 @@ /* clear all resources */ for (int i = 0; i < allocated.size (); i++) - free (allocated[i]); + free (allocated [i]); free (selection.text); // TODO: manage env vars in child only(!) @@ -266,6 +282,10 @@ delete envv; delete argv; + +#ifdef KEYSYM_RESOURCE + delete keyboard; +#endif } void @@ -327,12 +347,104 @@ } /*----------------------------------------------------------------------*/ -/* rxvt_init () */ +/* + * Exit gracefully, clearing the utmp entry and restoring tty attributes + * TODO: if debugging, this should free up any known resources if we can + */ +static XErrorHandler old_xerror_handler; + +static void +rxvt_emergency_cleanup () +{ + for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) + (*t)->emergency_cleanup (); +} + +#if ENABLE_FRILLS +static void +print_x_error (Display *dpy, XErrorEvent *event) +{ + char buffer[BUFSIZ]; + char mesg[BUFSIZ]; + char number[32]; + char *mtype = "XlibMessage"; + XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); + XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); + rxvt_warn ("An X Error occured, trying to continue after report.\n"); + rxvt_warn ("%s: %s\n", mesg, buffer); + XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); + rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); + sprintf(number, "%d", event->request_code); + XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("(which is %s)\n", buffer); + if (event->request_code >= 128) { + XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", + mesg, BUFSIZ); + rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); + } + if ((event->error_code == BadWindow) || + (event->error_code == BadPixmap) || + (event->error_code == BadCursor) || + (event->error_code == BadFont) || + (event->error_code == BadDrawable) || + (event->error_code == BadColor) || + (event->error_code == BadGC) || + (event->error_code == BadIDChoice) || + (event->error_code == BadValue) || + (event->error_code == BadAtom)) { + if (event->error_code == BadValue) + XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", + mesg, BUFSIZ); + else if (event->error_code == BadAtom) + XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", + mesg, BUFSIZ); + else + XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", + mesg, BUFSIZ); + rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); + } + XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", + mesg, BUFSIZ); + rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); +} +#endif + +int +rxvt_xerror_handler (Display *display, XErrorEvent *event) +{ + if (GET_R->allowedxerror == -1) + GET_R->allowedxerror = event->error_code; + else + { + // GET_R is most likely not the terminal which caused the error, + // so just output the error and continue +#if ENABLE_FRILLS + print_x_error (display, event); +#else + old_xerror_handler (display, event); +#endif + } + + return 0; +} + +int +rxvt_xioerror_handler (Display *display) +{ + rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", + DisplayString (display)); + rxvt_emergency_cleanup (); + _exit (EXIT_FAILURE); +} + +/*----------------------------------------------------------------------*/ bool rxvt_term::init (int argc, const char *const *argv) { SET_R (this); + set_locale (""); + if (!init_vars ()) return false; @@ -340,7 +452,9 @@ const char **cmd_argv = init_resources (argc, argv); - set_locale (""); +#ifdef KEYSYM_RESOURCE + keyboard->register_done (); +#endif #if MENUBAR_MAX menubar_read (rs[Rs_menu]); @@ -352,12 +466,14 @@ create_windows (argc, argv); + dDisp; + init_xlocale (); scr_reset (); /* initialize screen */ #if 0 - XSynchronize (display->display, True); + XSynchronize (disp, True); #endif #ifdef HAVE_SCROLLBARS @@ -366,24 +482,26 @@ #endif #if (MENUBAR_MAX) if (menubar_visible ()) - XMapWindow (display->display, menuBar.win); + XMapWindow (disp, menuBar.win); #endif #ifdef TRANSPARENT if (options & Opt_transparent) { - XSelectInput (display->display, display->root, PropertyChangeMask); + XSelectInput (disp, display->root, PropertyChangeMask); check_our_parents (); rootwin_ev.start (display, display->root); } #endif - XMapWindow (display->display, TermWin.vt); - XMapWindow (display->display, TermWin.parent[0]); + XMapWindow (disp, TermWin.vt); + XMapWindow (disp, TermWin.parent[0]); set_colorfgbg (); init_command (cmd_argv); + free (cmd_argv); + pty_ev.start (pty.pty, EVENT_READ); check_ev.start (); @@ -391,7 +509,45 @@ return true; } -static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); +static struct sig_handlers +{ + sig_watcher sw_chld, sw_term, sw_int; + + void sig_chld (sig_watcher &w) + { + // we are being called for every SIGCHLD, find the corresponding term + int pid; + + while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) + for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) + if (pid == (*t)->cmd_pid) + { + (*t)->destroy (); + break; + } + } + + /* + * Catch a fatal signal and tidy up before quitting + */ + void + sig_term (sig_watcher &w) + { +#ifdef DEBUG_CMD + rxvt_warn ("caught signal %d, exiting.\n", w.signum); +#endif + rxvt_emergency_cleanup (); + signal (w.signum, SIG_DFL); + kill (getpid (), w.signum); + } + + sig_handlers () + : sw_chld (this, &sig_handlers::sig_chld), + sw_term (this, &sig_handlers::sig_term), + sw_int (this, &sig_handlers::sig_term) + { + } +} sig_handlers; void rxvt_init () @@ -409,76 +565,16 @@ signal (SIGHUP, SIG_IGN); signal (SIGPIPE, SIG_IGN); + sig_handlers.sw_chld.start (SIGCHLD); + sig_handlers.sw_term.start (SIGTERM); + sig_handlers.sw_int.start (SIGINT); + /* 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); -} - -/* ------------------------------------------------------------------------- * - * SIGNAL HANDLING & EXIT HANDLER * - * ------------------------------------------------------------------------- */ -/* - * Catch a SIGCHLD signal and exit if the direct child has died - */ - -void -rxvt_term::sig_chld (sig_watcher &w) -{ - // we are being called for every SIGCHLD, not just ours - int pid; - - while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) - for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) - if (pid == (*t)->cmd_pid) - { - (*t)->destroy (); - break; - } -} - -/*----------------------------------------------------------------------*/ -/* - * 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 - */ -void -rxvt_term::sig_term (sig_watcher &w) -{ -#ifdef DEBUG_CMD - rxvt_warn ("caught signal %d, exiting.\n", w.signum); -#endif - rxvt_destroy_all (); - signal (w.signum, SIG_DFL); - kill (getpid (), w.signum); -} - -/* INTPROTO */ -int -rxvt_xerror_handler (Display *display, XErrorEvent *event) -{ - if (GET_R->allowedxerror == -1) - GET_R->allowedxerror = event->error_code; - else - { - old_xerror_handler (display, event); - GET_R->destroy (); - } - - return 0; + XSetIOErrorHandler (rxvt_xioerror_handler); } /* ------------------------------------------------------------------------- * @@ -495,8 +591,7 @@ return p; } -/* INTPROTO */ -void * +void * rxvt_calloc (size_t number, size_t size) { void *p = calloc (number, size); @@ -507,7 +602,6 @@ return p; } -/* INTPROTO */ void * rxvt_realloc (void *ptr, size_t size) { @@ -601,10 +695,11 @@ void rxvt_term::window_calc (unsigned int width, unsigned int height) { - short recalc_x, recalc_y; - int x, y, sb_w, mb_h, flags; - unsigned int w, h; - unsigned int max_width, max_height; + short recalc_x, recalc_y; + int x, y, sb_w, mb_h, flags; + unsigned int w, h; + unsigned int max_width, max_height; + dDisp; D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", TermWin.ncol, TermWin.nrow, szHint.width, @@ -620,16 +715,19 @@ parsed_geometry = 1; if (rs[Rs_geometry]) flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); + if (flags & WidthValue) { TermWin.ncol = BOUND_POSITIVE_INT16 (w); szHint.flags |= USSize; } + if (flags & HeightValue) { TermWin.nrow = BOUND_POSITIVE_INT16 (h); szHint.flags |= USSize; } + if (flags & XValue) { szHint.x = x; @@ -640,6 +738,7 @@ szHint.win_gravity = NorthEastGravity; } } + if (flags & YValue) { szHint.y = y; @@ -712,10 +811,10 @@ window_sb_x = szHint.width - sb_w; if (recalc_x) - szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) + szHint.x += (DisplayWidth (disp, display->screen) - szHint.width - 2 * TermWin.ext_bwidth); if (recalc_y) - szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) + szHint.y += (DisplayHeight (disp, display->screen) - szHint.height - 2 * TermWin.ext_bwidth); TermWin.ncol = TermWin.width / TermWin.fwidth; @@ -748,13 +847,13 @@ #if 0 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly if (cmd_pid) /* force through to the command */ - kill (cmd_pid, SIGWINCH); + kill (-cmd_pid, SIGWINCH); #endif } /*----------------------------------------------------------------------*/ /* set_fonts () - load and set the various fonts -/* + * * init = 1 - initialize * * fontname == FONT_UP - switch to bigger font @@ -784,6 +883,7 @@ TermWin.fontset[0] = fs; prop = (*fs)[1]->properties (); + prop.height += TermWin.lineSpace; fs->set_prop (prop); TermWin.fwidth = prop.width; @@ -861,8 +961,8 @@ rxvt_term::set_title (const char *str) { set_string_property (XA_WM_NAME, str); -#if ENABLE_FRILLS - set_utf8_property (display->atom ("_NET_WM_NAME"), str); +#if ENABLE_EWMH + set_utf8_property (xa[XA_NET_WM_NAME], str); #endif } @@ -870,8 +970,8 @@ rxvt_term::set_icon_name (const char *str) { set_string_property (XA_WM_ICON_NAME, str); -#if ENABLE_FRILLS - set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str); +#if ENABLE_EWMH + set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif } @@ -889,25 +989,26 @@ if (isdigit (*color)) { i = atoi (color); + if (i >= 8 && i <= 15) { /* bright colors */ i -= 8; # ifndef NO_BRIGHTCOLOR pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; SET_PIXCOLOR (idx); - goto Done; + goto done; # endif - } + if (i >= 0 && i <= 7) { /* normal colors */ pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; SET_PIXCOLOR (idx); - goto Done; + goto done; } } - if (!rXParseAllocColor (& xcol, color)) + if (!rXParseAllocColor (&xcol, color)) return; /* XStoreColor (display->display, display->cmap, XColor*); */ @@ -933,10 +1034,11 @@ /* XSetWindowAttributes attr; */ /* Cursor cursor; */ -Done: -#ifdef OFF_FOCUS_FADING +done: + +#if OFF_FOCUS_FADING if (rs[Rs_fade]) - pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); + pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); #endif /*TODO: handle Color_BD, scrollbar background, etc. */ @@ -1000,10 +1102,6 @@ } /*----------------------------------------------------------------------*/ -/* - * Colour determination for low colour displays, routine from - * Hans de Goede - */ int rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) @@ -1024,13 +1122,13 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) { int fix_screen; - #ifdef SMART_RESIZE int old_width = szHint.width, old_height = szHint.height; #endif + dDisp; window_calc (width, height); - XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); + XSetWMNormalHints (disp, TermWin.parent[0], &szHint); if (!ignoreparent) { @@ -1044,9 +1142,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (display->display, TermWin.parent[0], display->root, + XTranslateCoordinates (disp, TermWin.parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, + XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, &unused_w1, &unused_h1, &unused_b1, &unused_d1); /* * if display->root isn't the parent window, a WM will probably have offset @@ -1058,8 +1156,8 @@ y -= y1; } - x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; - y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; + x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; + y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; dx = old_width - szHint.width; dy = old_height - szHint.height; @@ -1073,10 +1171,10 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, + XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); + XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); #endif } @@ -1086,20 +1184,21 @@ { if (scrollbar_visible ()) { - XMoveResizeWindow (display->display, scrollBar.win, + XMoveResizeWindow (disp, scrollBar.win, window_sb_x, 0, scrollbar_TotalWidth (), szHint.height); resize_scrollbar (); } if (menubar_visible ()) - XMoveResizeWindow (display->display, menuBar.win, + XMoveResizeWindow (disp, menuBar.win, window_vt_x, 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); - XMoveResizeWindow (display->display, TermWin.vt, + XMoveResizeWindow (disp, TermWin.vt, window_vt_x, window_vt_y, TermWin_TotalWidth (), TermWin_TotalHeight ()); + scr_clear (); #ifdef XPM_BACKGROUND resize_pixmap (); @@ -1132,6 +1231,11 @@ old_width = szHint.width; old_height = szHint.height; +#ifdef XPM_BACKGROUND + if (TermWin.pixmap) + scr_touch (false); +#endif + #ifdef USE_XIM IMSetStatusPosition (); #endif @@ -1149,6 +1253,7 @@ if (width == 0 || height == 0) { XGetWindowAttributes (display->display, display->root, &wattr); + if (width == 0) width = wattr.width - szHint.base_width; if (height == 0) @@ -1370,7 +1475,7 @@ TermWin.fheight + 1, TermWin.fheight - 1, TermWin.fheight - 2, TermWin.fheight + 2); - fs = XCreateFontSet (display->display, pat, + fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, &missing_charset_list, &missing_charset_count, &def_string); if (missing_charset_list) @@ -1452,11 +1557,13 @@ void rxvt_term::im_cb () { - int i, found, had_im; + int i; const char *p; char **s; char buf[IMBUFSIZ]; + SET_R (this); + im_destroy (); D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));