--- rxvt-unicode/src/main.C 2004/12/15 00:53:23 1.122 +++ rxvt-unicode/src/main.C 2006/01/02 15:35:43 1.155 @@ -32,9 +32,13 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "main.intpro" /* PROTOS for internal routines */ +#include "keyboard.h" +#include "rxvtperl.h" -#include +#include + +#include +#include #ifdef TTY_GID_SUPPORT # include @@ -44,8 +48,6 @@ # include #endif -#include - vector rxvt_term::termlist; static char curlocale[128]; @@ -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,79 +170,97 @@ 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 () +{ + PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); + + 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]) - delete TermWin.fontset[i]; + if (fontset[i] != fontset[0]) + delete fontset[i]; #endif - delete TermWin.fontset[0]; + delete fontset[0]; 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 (gc) XFreeGC (disp, 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; + delete drawable; // destroy all windows - if (TermWin.parent[0]) - XDestroyWindow (display->display, TermWin.parent[0]); + if (parent[0]) + XDestroyWindow (disp, 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 +270,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 +284,19 @@ delete envv; delete argv; + +#ifdef KEYSYM_RESOURCE + delete keyboard; +#endif +} + +void +rxvt_term::child_exit () +{ + cmd_pid = 0; + + if (!OPTION (Opt_hold)) + destroy (); } void @@ -327,12 +358,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,58 +463,110 @@ 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]); #endif #ifdef HAVE_SCROLLBARS - if (options & Opt_scrollBar) + if (OPTION (Opt_scrollBar)) scrollBar.setIdle (); /* set existence for size calculations */ #endif +#if ENABLE_PERL + rxvt_perl.init (); +#endif + + PERL_INVOKE ((this, HOOK_INIT, DT_END)); + create_windows (argc, argv); + dDisp; + init_xlocale (); scr_reset (); /* initialize screen */ #if 0 - XSynchronize (display->display, True); + XSynchronize (disp, True); #endif #ifdef HAVE_SCROLLBARS - if (options & Opt_scrollBar) + if (OPTION (Opt_scrollBar)) resize_scrollbar (); /* create and map scrollbar */ #endif #if (MENUBAR_MAX) if (menubar_visible ()) - XMapWindow (display->display, menuBar.win); + XMapWindow (disp, menuBar.win); #endif #ifdef TRANSPARENT - if (options & Opt_transparent) + if (OPTION (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, vt); + XMapWindow (disp, parent[0]); set_colorfgbg (); init_command (cmd_argv); + free (cmd_argv); + pty_ev.start (pty.pty, EVENT_READ); check_ev.start (); + PERL_INVOKE ((this, HOOK_START, DT_END)); + 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)->child_exit (); + 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 +584,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 +610,7 @@ return p; } -/* INTPROTO */ -void * +void * rxvt_calloc (size_t number, size_t size) { void *p = calloc (number, size); @@ -507,7 +621,6 @@ return p; } -/* INTPROTO */ void * rxvt_realloc (void *ptr, size_t size) { @@ -578,7 +691,7 @@ void rxvt_term::privileged_utmp (rxvt_privaction action) { - if ((options & Opt_utmpInhibit) + if (OPTION (Opt_utmpInhibit) || !pty.name || !*pty.name) return; @@ -599,54 +712,64 @@ * if width/height are non-zero then override calculated width/height */ void -rxvt_term::window_calc (unsigned int width, unsigned int height) +rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) { - 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, - szHint.height)); + ncol, nrow, szHint.width, szHint.height)); + szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; szHint.win_gravity = NorthWestGravity; /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ recalc_x = recalc_y = 0; flags = 0; + if (!parsed_geometry) { 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); + ncol = clamp (w, 0, std::numeric_limits::max ()); szHint.flags |= USSize; } + if (flags & HeightValue) { - TermWin.nrow = BOUND_POSITIVE_INT16 (h); + nrow = clamp (h, 0, std::numeric_limits::max ()); szHint.flags |= USSize; } + if (flags & XValue) { szHint.x = x; szHint.flags |= USPosition; + if (flags & XNegative) { recalc_x = 1; szHint.win_gravity = NorthEastGravity; } } + if (flags & YValue) { szHint.y = y; szHint.flags |= USPosition; + if (flags & YNegative) { recalc_y = 1; + if (szHint.win_gravity == NorthEastGravity) szHint.win_gravity = SouthEastGravity; else @@ -656,21 +779,21 @@ } /* TODO: BOUNDS */ - TermWin.width = TermWin.ncol * TermWin.fwidth; - TermWin.height = TermWin.nrow * TermWin.fheight; - max_width = MAX_COLS * TermWin.fwidth; - max_height = MAX_ROWS * TermWin.fheight; + width = ncol * fwidth; + height = nrow * fheight; + max_width = MAX_COLS * fwidth; + max_height = MAX_ROWS * fheight; - szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; + szHint.base_width = szHint.base_height = 2 * int_bwidth; sb_w = mb_h = 0; - window_vt_x = window_vt_y = TermWin.int_bwidth; + window_vt_x = window_vt_y = int_bwidth; if (scrollbar_visible ()) { sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; - if (!(options & Opt_scrollBar_right)) + if (!OPTION (Opt_scrollBar_right)) window_vt_x += sb_w; } @@ -681,47 +804,45 @@ window_vt_y += mb_h; } - szHint.width_inc = TermWin.fwidth; - szHint.height_inc = TermWin.fheight; + szHint.width_inc = fwidth; + szHint.height_inc = fheight; szHint.min_width = szHint.base_width + szHint.width_inc; szHint.min_height = szHint.base_height + szHint.height_inc; - if (width && width - szHint.base_width < max_width) + if (newwidth && newwidth - szHint.base_width < max_width) { - szHint.width = width; - TermWin.width = width - szHint.base_width; + szHint.width = newwidth; + width = newwidth - szHint.base_width; } else { - MIN_IT (TermWin.width, max_width); - szHint.width = szHint.base_width + TermWin.width; + min_it (width, max_width); + szHint.width = szHint.base_width + width; } - if (height && height - szHint.base_height < max_height) + if (newheight && newheight - szHint.base_height < max_height) { - szHint.height = height; - TermWin.height = height - szHint.base_height; + szHint.height = newheight; + height = newheight - szHint.base_height; } else { - MIN_IT (TermWin.height, max_height); - szHint.height = szHint.base_height + TermWin.height; + min_it (height, max_height); + szHint.height = szHint.base_height + height; } - if (scrollbar_visible () && (options & Opt_scrollBar_right)) + if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) window_sb_x = szHint.width - sb_w; if (recalc_x) - szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) - - szHint.width - 2 * TermWin.ext_bwidth); + szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; if (recalc_y) - szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) - - szHint.height - 2 * TermWin.ext_bwidth); + szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; - TermWin.ncol = TermWin.width / TermWin.fwidth; - TermWin.nrow = TermWin.height / TermWin.fheight; + ncol = width / fwidth; + nrow = height / fheight; D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - TermWin.ncol, TermWin.nrow, szHint.width, + ncol, nrow, szHint.width, szHint.height)); return; } @@ -739,22 +860,22 @@ struct winsize ws; - ws.ws_col = TermWin.ncol; - ws.ws_row = TermWin.nrow; - ws.ws_xpixel = TermWin.width; - ws.ws_ypixel = TermWin.height; + ws.ws_col = ncol; + ws.ws_row = nrow; + ws.ws_xpixel = width; + ws.ws_ypixel = height; (void)ioctl (pty.pty, TIOCSWINSZ, &ws); #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 @@ -776,21 +897,20 @@ #if ENABLE_STYLES for (int i = RS_styleCount; --i; ) - if (TermWin.fontset[i] != TermWin.fontset[0]) - delete TermWin.fontset[i]; + if (fontset[i] != fontset[0]) + delete fontset[i]; #endif - delete TermWin.fontset[0]; - TermWin.fontset[0] = fs; + delete fontset[0]; + fontset[0] = fs; prop = (*fs)[1]->properties (); + prop.height += lineSpace; fs->set_prop (prop); - TermWin.fwidth = prop.width; - TermWin.fheight = prop.height; - TermWin.fweight = prop.weight; - TermWin.fslant = prop.slant; - TermWin.fbase = (*fs)[1]->ascent; + fwidth = prop.width; + fheight = prop.height; + fbase = (*fs)[1]->ascent; for (int style = 1; style < 4; style++) { @@ -798,17 +918,17 @@ const char *res = rs[Rs_font + style]; if (res && !*res) - TermWin.fontset[style] = TermWin.fontset[0]; + fontset[style] = fontset[0]; else { - TermWin.fontset[style] = fs = new rxvt_fontset (this); + fontset[style] = fs = new rxvt_fontset (this); rxvt_fontprop prop2 = prop; if (res) prop2.weight = prop2.slant = rxvt_fontprop::unset; else { - res = TermWin.fontset[0]->fontdesc; + res = fontset[0]->fontdesc; if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; @@ -818,11 +938,11 @@ fs->set_prop (prop2); } #else - TermWin.fontset[style] = TermWin.fontset[0]; + fontset[style] = fontset[0]; #endif } - if (TermWin.parent[0]) + if (parent[0]) { resize_all_windows (0, 0, 0); scr_remap_chars (); @@ -834,19 +954,17 @@ void rxvt_term::set_string_property (Atom prop, const char *str, int len) { - // TODO: SMART_WINDOW_TITLE - XChangeProperty (display->display, TermWin.parent[0], + XChangeProperty (display->display, 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], + XChangeProperty (display->display, parent[0], prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -861,7 +979,7 @@ rxvt_term::set_title (const char *str) { set_string_property (XA_WM_NAME, str); -#if ENABLE_FRILLS +#if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_NAME], str); #endif } @@ -870,7 +988,7 @@ rxvt_term::set_icon_name (const char *str) { set_string_property (XA_WM_ICON_NAME, str); -#if ENABLE_FRILLS +#if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif } @@ -889,25 +1007,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 +1052,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. */ @@ -1017,16 +1137,14 @@ * - WINDOW RESIZING - * * -------------------------------------------------------------------- */ void -rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) +rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, 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); + window_calc (newwidth, newheight); + XSetWMNormalHints (disp, parent[0], &szHint); if (!ignoreparent) { @@ -1040,9 +1158,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (display->display, TermWin.parent[0], display->root, + XTranslateCoordinates (disp, parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, + XGetGeometry (disp, 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 @@ -1054,8 +1172,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; @@ -1069,33 +1187,34 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, + XMoveResizeWindow (disp, parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); + XResizeWindow (disp, parent[0], szHint.width, szHint.height); #endif } - fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; + fix_screen = ncol != prev_ncol || nrow != prev_nrow; - if (fix_screen || width != old_width || height != old_height) + if (fix_screen || newwidth != old_width || newheight != old_height) { 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, vt, window_vt_x, window_vt_y, TermWin_TotalWidth (), TermWin_TotalHeight ()); + scr_clear (); #ifdef XPM_BACKGROUND resize_pixmap (); @@ -1110,10 +1229,10 @@ /* scr_reset only works on the primary screen */ if (old_height) /* this is not the first time through */ { - unsigned int ncol = TermWin.ncol; - TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this + unsigned int ocol = ncol; + ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this curr_screen = scr_change_screen (PRIMARY); - TermWin.ncol = ncol; + ncol = ocol; } scr_reset (); @@ -1121,13 +1240,18 @@ if (curr_screen >= 0) /* this is not the first time through */ { scr_change_screen (curr_screen); - selection_check (old_ncol != TermWin.ncol ? 4 : 0); + selection_check (old_ncol != ncol ? 4 : 0); } } old_width = szHint.width; old_height = szHint.height; +#ifdef XPM_BACKGROUND + if (pixmap) + scr_touch (false); +#endif + #ifdef USE_XIM IMSetStatusPosition (); #endif @@ -1138,24 +1262,25 @@ * good for toggling 80/132 columns */ void -rxvt_term::set_widthheight (unsigned int width, unsigned int height) +rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight) { XWindowAttributes wattr; - if (width == 0 || height == 0) + if (newwidth == 0 || newheight == 0) { XGetWindowAttributes (display->display, display->root, &wattr); - if (width == 0) - width = wattr.width - szHint.base_width; - if (height == 0) - height = wattr.height - szHint.base_height; + + if (newwidth == 0) + newwidth = wattr.width - szHint.base_width; + if (newheight == 0) + newheight = wattr.height - szHint.base_height; } - if (width != TermWin.width || height != TermWin.height) + if (newwidth != width || newheight != height) { - width += szHint.base_width; - height += szHint.base_height; - resize_all_windows (width, height, 0); + newwidth += szHint.base_width; + newheight += szHint.base_height; + resize_all_windows (newwidth, newheight, 0); } } @@ -1175,10 +1300,10 @@ rxvt_term::im_set_size (XRectangle &size) { // the int_bwidth terms make no sense to me - size.x = TermWin.int_bwidth; - size.y = TermWin.int_bwidth; - size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; - size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; + size.x = int_bwidth; + size.y = int_bwidth; + size.width = Width2Pixel (ncol) + int_bwidth; + size.height = Height2Pixel (nrow) + int_bwidth; } void @@ -1188,13 +1313,13 @@ { preedit_rect.x = needed_rect.width; preedit_rect.y = 0; - preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; - preedit_rect.height = TermWin.fheight; + preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1; + preedit_rect.height = fheight; status_rect.x = 0; status_rect.y = 0; - status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; - status_rect.height = TermWin.fheight; + status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1; + status_rect.height = fheight; } /* Checking whether input method is running. */ @@ -1232,7 +1357,7 @@ XVaNestedList preedit_attr; if (!Input_Context - || !TermWin.focus + || !focus || !(input_style & XIMPreeditPosition)) return; @@ -1362,11 +1487,11 @@ "-*-*-*-R-*-*-%d-*-*-*-*-*-*," "-*-*-*-R-*-*-%d-*-*-*-*-*-*," "*", - TermWin.fheight, - TermWin.fheight + 1, TermWin.fheight - 1, - TermWin.fheight - 2, TermWin.fheight + 2); + fheight, + fheight + 1, fheight - 1, + fheight - 2, 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) @@ -1420,8 +1545,8 @@ Input_Context = XCreateIC (xim, XNInputStyle, input_style, - XNClientWindow, TermWin.vt, - XNFocusWindow, TermWin.parent[0], + XNClientWindow, vt, + XNFocusWindow, parent[0], preedit_attr ? XNPreeditAttributes : NULL, preedit_attr, status_attr ? XNStatusAttributes : NULL, @@ -1448,11 +1573,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 ()")); @@ -1513,7 +1640,7 @@ XVaNestedList preedit_attr, status_attr; if (!Input_Context - || !TermWin.focus + || !focus || !(input_style & XIMPreeditArea) || !IMisRunning ()) return;