--- rxvt-unicode/src/main.C 2011/07/09 13:14:47 1.357 +++ rxvt-unicode/src/main.C 2013/02/17 00:11:28 1.388 @@ -38,9 +38,9 @@ #include -#include -#include -#include +#include +#include +#include #include @@ -48,9 +48,7 @@ # define X_LOCALE # include #else -# ifdef HAVE_SETLOCALE -# include -# endif +# include #endif struct termios rxvt_term::def_tio; @@ -107,7 +105,7 @@ } // check to see whether this combination already exists otherwise - for (cc = v.end (); cc-- > v.begin (); ) + for (cc = v.begin (); cc < v.end (); cc++) if (cc->c1 == c1 && cc->c2 == c2) return COMPOSE_LO + (cc - v.begin ()); @@ -172,11 +170,11 @@ #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) slip_wheel_ev.set (this); #endif -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if BG_IMAGE_FROM_ROOT || ENABLE_PERL rootwin_ev.set (this), #endif scrollbar_ev.set (this), -#ifdef USE_XIM +#if USE_XIM im_ev.set (this), #endif #ifdef POINTER_BLANK @@ -230,18 +228,25 @@ bg_destroy (); #endif +#if HAVE_IMG + delete bg_img; +#endif + if (display) { selection_clear (); selection_clear (true); -#ifdef USE_XIM +#if USE_XIM im_destroy (); #endif scrollBar.destroy (); - if (gc) XFreeGC (dpy, gc); + + if (gc) + XFreeGC (dpy, gc); delete drawable; + // destroy all windows if (parent) XDestroyWindow (dpy, parent); @@ -269,9 +274,6 @@ free (selection.text); free (selection.clip_text); - // TODO: manage env vars in child only(!) - free (env_display); - free (env_term); free (locale); free (v_buffer); @@ -318,7 +320,7 @@ im_ev.stop (display); #endif scrollbar_ev.stop (display); -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if BG_IMAGE_FROM_ROOT || ENABLE_PERL rootwin_ev.stop (display); #endif termwin_ev.stop (display); @@ -355,7 +357,7 @@ } void -rxvt_term::set_option (uint8_t opt, bool set) +rxvt_term::set_option (uint8_t opt, bool set) NOTHROW { if (!opt) return; @@ -369,7 +371,6 @@ /*----------------------------------------------------------------------*/ /* * 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; @@ -381,55 +382,105 @@ } #if !ENABLE_MINIMAL -static void +static void ecb_cold print_x_error (Display *dpy, XErrorEvent *event) { char buffer[BUFSIZ]; char mesg[BUFSIZ]; char number[32]; - const char mtype[] = "XlibMessage"; - XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); - XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); + 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); - 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)) { + + XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); + + XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); + XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); + rxvt_warn ("+ %s: %s\n", mesg, buffer); + + XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); + + if (event->request_code >= 128) + { +#if 0 + /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ + int nexts; + char **exts = XListExtensions (dpy, &nexts); + + while (nexts) + { + char *extname = exts [nexts - 1]; + int major, first_event, first_error; + + if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) + { + XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); + rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); + + snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); + XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); + + break; + } + + printf ("nextss %d %s\n", nexts, extname);//D + --nexts; + ++exts; + } +#else + int nexts = 0; + char **exts = 0; +#endif + + if (!nexts) + { + rxvt_warn ("+ (which is an unknown extension)\n", buffer); + + XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); + +#if 0 + sprintf (number, "RENDER.%d", event->minor_code); + XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); +#endif + } + + XFreeExtensionList (exts); + } + else + { + sprintf (number, "%d", event->request_code); + XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); + } + + 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); + XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); else if (event->error_code == BadAtom) - XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", - mesg, BUFSIZ); + XGetErrorDatabaseText (dpy, "XlibMessage", "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, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); + + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); } - XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", - mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); } #endif -int +int ecb_cold rxvt_xerror_handler (Display *display, XErrorEvent *event) { if (GET_R->allowedxerror == -1) @@ -448,7 +499,7 @@ return 0; } -int +int ecb_cold rxvt_xioerror_handler (Display *display) { rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", @@ -578,6 +629,10 @@ XSetIOErrorHandler (rxvt_xioerror_handler); XrmInitialize (); + +#if HAVE_PIXBUF + g_type_init (); +#endif } /*----------------------------------------------------------------------*/ @@ -708,6 +763,15 @@ ncol = width / fwidth; nrow = height / fheight; + + // When the size of the vt window is not a multiple of the cell + // size, i.e., when the wm does not honour our size hints, there are + // extra areas not covered by the terminal screen. Such gaps, when a + // bg pixmap is set, would have to be cleared manually to properly + // refresh the background. We take the simpler route and shrink the + // vt window so as to avoid creating gaps. + vt_width = ncol * fwidth; + vt_height = nrow * fheight; } /*----------------------------------------------------------------------*/ @@ -725,8 +789,8 @@ ws.ws_col = ncol; ws.ws_row = nrow; - ws.ws_xpixel = width; - ws.ws_ypixel = height; + ws.ws_xpixel = vt_width; + ws.ws_ypixel = vt_height; ioctl (pty->pty, TIOCSWINSZ, &ws); #if 0 @@ -762,13 +826,12 @@ fontset[0] = fs; prop = (*fs)[rxvt_fontset::firstFont]->properties (); - prop.height += lineSpace; - prop.width += letterSpace; + prop.width = max (prop.width + letterSpace, 1); fs->set_prop (prop, false); fwidth = prop.width; - fheight = prop.height; + fheight = prop.height + lineSpace; fbase = prop.ascent; for (int style = 1; style < 4; style++) @@ -940,13 +1003,14 @@ /* * find if fg/bg matches any of the normal (low-intensity) colors */ -void -rxvt_term::set_colorfgbg () +char * +rxvt_term::get_colorfgbg () { unsigned int i; const char *xpmb = ""; char fstr[] = "default"; char bstr[] = "default"; + char *env_colorfgbg; for (i = Color_Black; i <= Color_White; i++) if (pix_colors[Color_fg] == pix_colors[i]) @@ -959,13 +1023,15 @@ if (pix_colors[Color_bg] == pix_colors[i]) { sprintf (bstr, "%d", i - Color_Black); -#ifdef BG_IMAGE_FROM_FILE +#if BG_IMAGE_FROM_FILE xpmb = "default;"; #endif break; } + env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg")); sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); + return env_colorfgbg; } /*----------------------------------------------------------------------*/ @@ -1068,7 +1134,9 @@ XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, - width, height); + vt_width, vt_height); + + HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END)); #ifdef HAVE_BG_PIXMAP if (bg_window_size_sensitive ()) @@ -1079,8 +1147,8 @@ if (fix_screen || old_height == 0) scr_reset (); -#ifdef USE_XIM - IMSetPosition (); +#if USE_XIM + im_set_position (); #endif } @@ -1103,7 +1171,7 @@ newheight = wattr.height - szHint.base_height; } - if (newwidth != width || newheight != height) + if (newwidth != vt_width || newheight != vt_height) { newwidth += szHint.base_width; newheight += szHint.base_height; @@ -1114,7 +1182,7 @@ /* -------------------------------------------------------------------- * * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ -#ifdef USE_XIM +#if USE_XIM void rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) @@ -1151,7 +1219,7 @@ /* Checking whether input method is running. */ bool -rxvt_term::IMisRunning () +rxvt_term::im_is_running () { Atom atom; Window win; @@ -1177,7 +1245,7 @@ } void -rxvt_term::IMSendSpot () +rxvt_term::im_send_spot () { XPoint nspot; XVaNestedList preedit_attr; @@ -1293,7 +1361,7 @@ * open a suitable preedit type */ bool -rxvt_term::IM_get_IC (const char *modifiers) +rxvt_term::im_get_ic (const char *modifiers) { int i, j, found; XIM xim; @@ -1501,7 +1569,7 @@ vt_select_input (); #endif - IMSetPosition (); + im_set_position (); return true; } @@ -1521,10 +1589,8 @@ if (Input_Context) return; -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) SET_LOCALE (rs[Rs_imLocale]); -#endif p = rs[Rs_inputMethod]; if (p && *p) @@ -1539,7 +1605,7 @@ { strcpy (buf, "@im="); strncat (buf, s[i], IMBUFSIZ - 5); - if (IM_get_IC (buf)) + if (im_get_ic (buf)) { found = true; break; @@ -1554,22 +1620,20 @@ } /* try with XMODIFIERS env. var. */ - if (IM_get_IC ("")) + if (im_get_ic ("")) goto done; /* try with no modifiers base IF the user didn't specify an IM */ - if (IM_get_IC ("@im=none")) + if (im_get_ic ("@im=none")) goto done; done: -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) SET_LOCALE (locale); -#endif } void -rxvt_term::IMSetPosition () +rxvt_term::im_set_position () { XRectangle preedit_rect, status_rect, *needed_rect; XVaNestedList preedit_attr, status_attr; @@ -1577,7 +1641,7 @@ if (!Input_Context || !focus || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) - || !IMisRunning ()) + || !im_is_running ()) return; if (input_style & XIMPreeditPosition) @@ -1620,28 +1684,6 @@ XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); } -Pixmap -rxvt_term::get_pixmap_property (Atom property) -{ - Pixmap pixmap = None; - - int aformat; - unsigned long nitems, bytes_after; - Atom atype; - unsigned char *prop; - int result = XGetWindowProperty (dpy, display->root, property, - 0L, 1L, False, XA_PIXMAP, &atype, &aformat, - &nitems, &bytes_after, &prop); - if (result == Success) - { - if (atype == XA_PIXMAP) - pixmap = *(Pixmap *)prop; - XFree (prop); - } - - return pixmap; -} - #ifdef HAVE_BG_PIXMAP void @@ -1650,8 +1692,6 @@ if (update_background_ev.is_active ()) return; - bg_invalidate (); - ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); if (to_wait <= 0.)