--- rxvt-unicode/src/main.C 2008/01/19 13:00:10 1.301 +++ rxvt-unicode/src/main.C 2010/07/28 17:56:16 1.332 @@ -13,7 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2007 Marc Lehmann + * Copyright (c) 2003-2008 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,11 +32,13 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "init.h" #include "keyboard.h" #include "rxvtperl.h" #include +#include #include #include @@ -51,6 +53,7 @@ # endif #endif +struct termios rxvt_term::def_tio; vector rxvt_term::termlist; // used to tell global functions which terminal instance is "active" @@ -103,7 +106,7 @@ cc = (*this)[cc->c1]; } - // check to see wether this combination already exists otherwise + // check to see whether this combination already exists otherwise for (cc = v.end (); cc-- > v.begin (); ) { if (cc->c1 == c1 && cc->c2 == c2) @@ -174,9 +177,7 @@ #if ENABLE_TRANSPARENCY || ENABLE_PERL rootwin_ev.set (this), #endif -#ifdef HAVE_SCROLLBARS scrollbar_ev.set (this), -#endif #ifdef USE_XIM im_ev.set (this), #endif @@ -231,38 +232,22 @@ #ifdef HAVE_BG_PIXMAP bgPixmap.destroy (); #endif +#ifdef HAVE_AFTERIMAGE + if (asv) + destroy_asvisual (asv, 0); + if (asimman) + destroy_image_manager (asimman, 0); +#endif if (display) { selection_clear (); + selection_clear (true); #ifdef USE_XIM im_destroy (); #endif -#ifdef XTERM_SCROLLBAR - if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); - if (ShadowGC) XFreeGC (dpy, ShadowGC); -#endif -#ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); -#endif -#ifdef NEXT_SCROLLBAR - if (blackGC) XFreeGC (dpy, blackGC); - if (whiteGC) XFreeGC (dpy, whiteGC); - if (grayGC) XFreeGC (dpy, grayGC); - if (darkGC) XFreeGC (dpy, darkGC); - if (stippleGC) XFreeGC (dpy, stippleGC); - if (dimple) XFreePixmap (dpy, dimple); - if (upArrow) XFreePixmap (dpy, upArrow); - if (downArrow) XFreePixmap (dpy, downArrow); - if (upArrowHi) XFreePixmap (dpy, upArrowHi); - if (downArrowHi) XFreePixmap (dpy, downArrowHi); -#endif -#ifdef RXVT_SCROLLBAR - if (topShadowGC) XFreeGC (dpy, topShadowGC); - if (botShadowGC) XFreeGC (dpy, botShadowGC); - if (scrollbarGC) XFreeGC (dpy, scrollbarGC); -#endif + scrollBar.destroy (); if (gc) XFreeGC (dpy, gc); delete drawable; @@ -292,6 +277,7 @@ free (allocated [i]); free (selection.text); + free (selection.clip_text); // TODO: manage env vars in child only(!) free (env_display); free (env_term); @@ -339,9 +325,7 @@ #if USE_XIM im_ev.stop (display); #endif -#if HAVE_SCROLLBARS scrollbar_ev.stop (display); -#endif #if ENABLE_TRANSPARENCY || ENABLE_PERL rootwin_ev.stop (display); #endif @@ -403,7 +387,7 @@ 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 ("An X Error occurred, 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); @@ -411,33 +395,33 @@ 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); + 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); + (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); + mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); } #endif @@ -494,11 +478,84 @@ kill (getpid (), w.signum); } +static void +rxvt_get_ttymode (struct termios *tio) +{ + if (tcgetattr (STDIN_FILENO, tio) < 0) + memset (tio, 0, sizeof (struct termios)); + + for (int i = 0; i < NCCS; i++) + tio->c_cc[i] = VDISABLE; + + tio->c_cc[VINTR] = CINTR; + tio->c_cc[VQUIT] = CQUIT; + tio->c_cc[VERASE] = CERASE; +#ifdef VERASE2 + tio->c_cc[VERASE2] = CERASE2; +#endif + tio->c_cc[VKILL] = CKILL; + tio->c_cc[VEOF] = CEOF; + tio->c_cc[VSTART] = CSTART; + tio->c_cc[VSTOP] = CSTOP; + tio->c_cc[VSUSP] = CSUSP; +# ifdef VDSUSP + tio->c_cc[VDSUSP] = CDSUSP; +# endif +# ifdef VREPRINT + tio->c_cc[VREPRINT] = CRPRNT; +# endif +# ifdef VDISCRD + tio->c_cc[VDISCRD] = CFLUSH; +# endif +# ifdef VWERSE + tio->c_cc[VWERSE] = CWERASE; +# endif +# ifdef VLNEXT + tio->c_cc[VLNEXT] = CLNEXT; +# endif + +# if VMIN != VEOF + tio->c_cc[VMIN] = 1; +# endif +# if VTIME != VEOL + tio->c_cc[VTIME] = 0; +# endif + + /* input modes */ + tio->c_iflag = (BRKINT | IGNPAR | ICRNL +# ifdef IMAXBEL + | IMAXBEL +# endif + | IXON); + + /* output modes */ + tio->c_oflag = (OPOST | ONLCR); + + /* control modes */ + tio->c_cflag = (CS8 | CREAD); + + /* local modes */ + tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO +# if defined (ECHOCTL) && defined (ECHOKE) + | ECHOCTL | ECHOKE +# endif + | ECHOE | ECHOK); +} + char **rxvt_environ; // startup environment void rxvt_init () { + assert (("fontMask must not overlap other RS masks", + 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); + + rxvt_get_ttymode (&rxvt_term::def_tio); + + // get rid of stdin/stdout as we don't need them, to free resources + dup2 (STDERR_FILENO, STDIN_FILENO); + dup2 (STDERR_FILENO, STDOUT_FILENO); + ptytty::init (); if (!ev_default_loop (0)) @@ -512,9 +569,6 @@ sig_handlers.sw_term.start (SIGTERM); ev_unref (); sig_handlers.sw_int.start (SIGINT); ev_unref (); - /* 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 (rxvt_xioerror_handler); @@ -531,7 +585,7 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) { short recalc_x, recalc_y; - int x, y, sb_w, flags; + int x, y, flags; unsigned int w, h; unsigned int max_width, max_height; @@ -551,13 +605,19 @@ if (flags & WidthValue) { - ncol = clamp (w, 0, std::numeric_limits::max ()); + if (!w) + rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); + + ncol = clamp (w, 1, std::numeric_limits::max ()); szHint.flags |= USSize; } if (flags & HeightValue) { - nrow = clamp (h, 0, std::numeric_limits::max ()); + if (!h) + rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); + + nrow = clamp (h, 1, std::numeric_limits::max ()); szHint.flags |= USSize; } @@ -598,12 +658,11 @@ szHint.base_width = szHint.base_height = 2 * int_bwidth; - sb_w = 0; window_vt_x = window_vt_y = int_bwidth; if (scrollBar.state) { - sb_w = scrollbar_TotalWidth (); + int sb_w = scrollBar.total_width (); szHint.base_width += sb_w; if (!option (Opt_scrollBar_right)) @@ -637,16 +696,13 @@ szHint.height = szHint.base_height + height; } - if (scrollBar.state && option (Opt_scrollBar_right)) - window_sb_x = szHint.width - sb_w; - if (recalc_x) szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; if (recalc_y) szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; - ncol = width / fwidth; + ncol = width / fwidth; nrow = height / fheight; } @@ -667,7 +723,7 @@ ws.ws_row = nrow; ws.ws_xpixel = width; ws.ws_ypixel = height; - (void)ioctl (pty->pty, TIOCSWINSZ, &ws); + ioctl (pty->pty, TIOCSWINSZ, &ws); #if 0 // TIOCSWINSZ is supposed to do this automatically and correctly @@ -707,8 +763,9 @@ delete fontset[0]; fontset[0] = fs; - prop = (*fs)[1]->properties (); + prop = (*fs)[rxvt_fontset::firstFont]->properties (); prop.height += lineSpace; + prop.width += letterSpace; fs->set_prop (prop, false); @@ -768,6 +825,18 @@ } void +rxvt_term::set_mbstring_property (Atom prop, const char *str, int len) +{ + XTextProperty ct; + + if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) + { + XSetTextProperty (dpy, parent[0], &ct, prop); + XFree (ct.value); + } +} + +void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) { wchar_t *ws = rxvt_mbstowcs (str, len); @@ -787,7 +856,7 @@ void rxvt_term::set_title (const char *str) { - set_string_property (XA_WM_NAME, str); + set_mbstring_property (XA_WM_NAME, str); #if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_NAME], str); #endif @@ -796,7 +865,7 @@ void rxvt_term::set_icon_name (const char *str) { - set_string_property (XA_WM_ICON_NAME, str); + set_mbstring_property (XA_WM_ICON_NAME, str); #if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif @@ -807,7 +876,6 @@ { #ifdef XTERM_COLOR_CHANGE rxvt_color xcol; - int i; if (color == NULL || *color == '\0') return; @@ -819,7 +887,7 @@ /* handle color aliases */ if (isdigit (*color)) { - i = atoi (color); + int i = atoi (color); if (i >= 8 && i <= 15) { @@ -933,8 +1001,15 @@ window_calc (newwidth, newheight); - if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) - XSetWMNormalHints (dpy, parent[0], &szHint); + bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); + + // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow + if (set_hint) + { + szHint.flags &= ~(PBaseSize | PResizeInc); + XSetWMNormalHints (dpy, parent[0], &szHint); + szHint.flags |= PBaseSize | PResizeInc; + } if (!ignoreparent) { @@ -984,17 +1059,15 @@ #endif } + if (set_hint) + XSetWMNormalHints (dpy, parent[0], &szHint); + fix_screen = ncol != prev_ncol || nrow != prev_nrow; if (fix_screen || newwidth != old_width || newheight != old_height) { if (scrollBar.state) - { - XMoveResizeWindow (dpy, scrollBar.win, - window_sb_x, 0, - scrollbar_TotalWidth (), szHint.height); - resize_scrollbar (); - } + scrollBar.resize (); XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, @@ -1004,16 +1077,11 @@ if (bgPixmap.window_size_sensitive ()) update_background (); #endif - - scr_clear (); } if (fix_screen || old_height == 0) scr_reset (); - // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version - //scr_touch (false); - #ifdef HAVE_BG_PIXMAP // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? // if (bgPixmap.pixmap) @@ -1094,18 +1162,17 @@ bool rxvt_term::IMisRunning () { - char *p; Atom atom; Window win; char server[IMBUFSIZ]; /* get current locale modifier */ - if ((p = XSetLocaleModifiers (NULL)) != NULL) + if (char *p = XSetLocaleModifiers (0)) { strcpy (server, "@server="); - strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ + strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ - if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ + if (p = strchr (server + 1, '@')) /* first one only */ *p = '\0'; atom = XInternAtom (dpy, server, False); @@ -1182,7 +1249,7 @@ if (text) { - void *str; + wchar_t *str; if (!text->encoding_is_wchar && text->string.multi_byte) { @@ -1190,14 +1257,14 @@ if (term->rs[Rs_imLocale]) SET_LOCALE (term->rs[Rs_imLocale]); - str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); - mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); + str = rxvt_temp_buf (text->length + 1); + mbstowcs (str, text->string.multi_byte, text->length + 1); if (term->rs[Rs_imLocale]) SET_LOCALE (term->locale); } else - str = (void *)text->string.wide_char; + str = text->string.wide_char; HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, DT_INT, call_data->caret,