--- rxvt-unicode/src/main.C 2004/08/25 05:03:33 1.108 +++ rxvt-unicode/src/main.C 2005/02/19 04:16:49 1.142 @@ -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,6 +159,9 @@ #ifdef USE_XIM im_ev (this, &rxvt_term::im_cb), #endif + sw_term (this, &rxvt_term::sig_term), + sw_int (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), @@ -168,21 +173,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]) @@ -192,49 +211,55 @@ 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]); + if (TermWin.parent[0] +#if ENABLE_XEMBED + && !rs[Rs_embed] +#endif + ) + XDestroyWindow (disp, TermWin.parent[0]); } // TODO: free pixcolours, colours should become part of rxvt_display @@ -250,7 +275,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(!) @@ -259,12 +284,15 @@ free (env_term); free (env_colorfgbg); free (locale); -#if 0 - free (codeset); -#endif + free (v_buffer); + free (incr_buf); delete envv; delete argv; + +#ifdef KEYSYM_RESOURCE + delete keyboard; +#endif } void @@ -326,12 +354,119 @@ } /*----------------------------------------------------------------------*/ +/* + * 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 + { + //TODO: GET_R is most likely not the terminal which caused the error + //TODO: maybe 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); +} + +/* + * 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_emergency_cleanup (); + signal (w.signum, SIG_DFL); + kill (getpid (), w.signum); +} + +/*----------------------------------------------------------------------*/ /* rxvt_init () */ bool rxvt_term::init (int argc, const char *const *argv) { SET_R (this); + set_locale (""); + if (!init_vars ()) return false; @@ -339,7 +474,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]); @@ -351,12 +488,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 @@ -365,24 +504,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 (); @@ -390,18 +531,9 @@ return true; } -static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); - 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,22 +544,15 @@ 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); - //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); + // TODO: handle this with exceptions and tolerate the memory loss + XSetIOErrorHandler (rxvt_xioerror_handler); } /* ------------------------------------------------------------------------- * @@ -437,120 +562,55 @@ * 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); - - errno = save_errno; -} - -/* - * Catch a fatal signal and tidy up before quitting - */ -/* INTPROTO */ -RETSIGTYPE -rxvt_Exit_signal (int sig) -{ - signal (sig, SIG_DFL); -#ifdef DEBUG_CMD - rxvt_warn ("caught signal %d, exiting.\n", sig); -#endif - rxvt_clean_exit (); - kill (getpid (), sig); -} - -/* 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; -} - -/*----------------------------------------------------------------------*/ -/* - * 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 (); + for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) + if (pid == (*t)->cmd_pid) + { + (*t)->destroy (); + break; + } } /* ------------------------------------------------------------------------- * * 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; } /* ------------------------------------------------------------------------- * @@ -635,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, @@ -654,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; @@ -674,6 +738,7 @@ szHint.win_gravity = NorthEastGravity; } } + if (flags & YValue) { szHint.y = y; @@ -746,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; @@ -782,7 +847,7 @@ #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 } @@ -800,11 +865,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 +882,9 @@ delete TermWin.fontset[0]; TermWin.fontset[0] = fs; - fs->prop = prop = (*fs)[1]->properties (); + prop = (*fs)[1]->properties (); + prop.height += TermWin.lineSpace; + fs->set_prop (prop); TermWin.fwidth = prop.width; TermWin.fheight = prop.height; @@ -850,7 +914,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 +932,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 } @@ -922,6 +989,7 @@ if (isdigit (*color)) { i = atoi (color); + if (i >= 8 && i <= 15) { /* bright colors */ i -= 8; @@ -930,8 +998,8 @@ SET_PIXCOLOR (idx); goto Done; # endif - } + if (i >= 0 && i <= 7) { /* normal colors */ pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; @@ -940,7 +1008,7 @@ } } - if (!rXParseAllocColor (& xcol, color)) + if (!rXParseAllocColor (&xcol, color)) return; /* XStoreColor (display->display, display->cmap, XColor*); */ @@ -1033,10 +1101,6 @@ } /*----------------------------------------------------------------------*/ -/* - * Colour determination for low colour displays, routine from - * Hans de Goede - */ int rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) @@ -1057,13 +1121,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) { @@ -1077,9 +1141,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 @@ -1091,8 +1155,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; @@ -1106,10 +1170,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 } @@ -1119,20 +1183,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 (); @@ -1165,6 +1230,11 @@ old_width = szHint.width; old_height = szHint.height; +#ifdef XPM_BACKGROUND + if (TermWin.pixmap) + scr_touch (false); +#endif + #ifdef USE_XIM IMSetStatusPosition (); #endif @@ -1182,6 +1252,7 @@ if (width == 0 || height == 0) { XGetWindowAttributes (display->display, display->root, &wattr); + if (width == 0) width = wattr.width - szHint.base_width; if (height == 0) @@ -1265,23 +1336,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 (nspot); + + if (nspot.x == spot.x && nspot.y == spot.y) return; - im_set_position (spot); + spot = nspot; preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); @@ -1291,17 +1359,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 +1396,7 @@ return false; xim = input_method->xim; + spot.x = spot.y = -1; xim_styles = NULL; if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) @@ -1338,30 +1406,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) @@ -1392,7 +1474,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) @@ -1479,6 +1561,8 @@ char **s; char buf[IMBUFSIZ]; + SET_R (this); + im_destroy (); D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); @@ -1496,6 +1580,7 @@ bool found = false; s = rxvt_splitcommastring (p); + for (i = 0; s[i]; i++) { if (*s[i]) @@ -1509,9 +1594,8 @@ } } } - for (i = 0; s[i]; i++) - free (s[i]); - free (s); + + rxvt_freecommastring (s); if (found) goto done;