--- rxvt-unicode/src/main.C 2012/01/19 15:44:49 1.371 +++ rxvt-unicode/src/main.C 2016/07/14 05:33:26 1.401 @@ -13,11 +13,12 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2010 Marc Lehmann + * Copyright (c) 2003-2014 Marc Lehmann + * Copyright (c) 2015 Emanuele Giaquinta * * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -152,9 +153,6 @@ rxvt_term::rxvt_term () { -#if HAVE_BG_PIXMAP - update_background_ev.set (this); -#endif #ifdef CURSOR_BLINK cursor_blink_ev.set (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); #endif @@ -170,11 +168,11 @@ #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) slip_wheel_ev.set (this); #endif -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if 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 @@ -224,8 +222,8 @@ #endif delete fontset[0]; -#ifdef HAVE_BG_PIXMAP - bg_destroy (); +#if HAVE_IMG + delete bg_img; #endif if (display) @@ -233,13 +231,16 @@ 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); @@ -249,7 +250,8 @@ { pix_colors_focused [i].free (this); #if OFF_FOCUS_FADING - pix_colors_unfocused [i].free (this); + if (rs[Rs_fade]) + pix_colors_unfocused [i].free (this); #endif } @@ -272,6 +274,11 @@ delete selection_req; + if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *))) + rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n"); + + delete [] env; + delete envv; delete argv; @@ -281,6 +288,8 @@ #ifndef NO_RESOURCES XrmDestroyDatabase (option_db); #endif + + SET_R ((rxvt_term *)0); } // child has exited, usually destroys @@ -313,7 +322,7 @@ im_ev.stop (display); #endif scrollbar_ev.stop (display); -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if ENABLE_PERL rootwin_ev.stop (display); #endif termwin_ev.stop (display); @@ -364,7 +373,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; @@ -376,58 +384,108 @@ } #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)) { - 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); + char buffer[BUFSIZ]; + char mesg[BUFSIZ]; + char number[32]; + + rxvt_warn ("An X Error occurred, trying to continue after report.\n"); + + 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, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); + else if (event->error_code == BadAtom) + XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); + else + XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); + + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); + } } #endif -int +int ecb_cold rxvt_xerror_handler (Display *display, XErrorEvent *event) { - if (GET_R->allowedxerror == -1) + if (GET_R && GET_R->allowedxerror == -1) GET_R->allowedxerror = event->error_code; else { @@ -443,7 +501,7 @@ return 0; } -int +int ecb_cold rxvt_xioerror_handler (Display *display) { rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", @@ -573,6 +631,10 @@ XSetIOErrorHandler (rxvt_xioerror_handler); XrmInitialize (); + +#if HAVE_PIXBUF + g_type_init (); +#endif } /*----------------------------------------------------------------------*/ @@ -766,13 +828,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++) @@ -877,8 +938,6 @@ rxvt_term::set_window_color (int idx, const char *color) { #ifdef XTERM_COLOR_CHANGE - rxvt_color xcol; - if (color == NULL || *color == '\0') return; @@ -894,38 +953,32 @@ if (i >= 8 && i <= 15) { /* bright colors */ - pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; + alias_color (idx, minBrightCOLOR + i - 8); goto done; } if (i >= 0 && i <= 7) { /* normal colors */ - pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; + alias_color (idx, minCOLOR + i); goto done; } } - set_color (xcol, color); - - /* - * FIXME: should free colors here, but no idea how to do it so instead, - * so just keep gobbling up the colormap - */ - - pix_colors_focused[idx] = xcol; + pix_colors_focused[idx].free (this); + set_color (pix_colors_focused[idx], color); done: /*TODO: handle Color_BD, scrollbar background, etc. */ update_fade_color (idx); - recolour_cursor (); - scr_recolour (); + recolor_cursor (); + scr_recolor (); #endif /* XTERM_COLOR_CHANGE */ } void -rxvt_term::recolour_cursor () +rxvt_term::recolor_cursor () { XColor fg, bg; @@ -964,7 +1017,7 @@ if (pix_colors[Color_bg] == pix_colors[i]) { sprintf (bstr, "%d", i - Color_Black); -#ifdef BG_IMAGE_FROM_FILE +#if HAVE_IMG xpmb = "default;"; #endif break; @@ -990,9 +1043,29 @@ void rxvt_term::alias_color (int dst, int src) { + pix_colors[dst].free (this); pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); } +#ifdef SMART_RESIZE +static unsigned int +get_parent_bw (Display *dpy, Window w) +{ + int idummy; + unsigned int udummy; + Window wdummy, parent; + Window *children; + unsigned int nchildren, border_width; + + XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren); + XFree (children); + XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy, + &udummy, &udummy, &border_width, &udummy); + + return border_width; +} +#endif + /* -------------------------------------------------------------------- * * - WINDOW RESIZING - * * -------------------------------------------------------------------- */ @@ -1037,8 +1110,10 @@ */ if (x1 != x || y1 != y) { - x -= x1; - y -= y1; + unsigned int border_width = get_parent_bw (dpy, parent); + + x -= x1 + border_width; + y -= y1 + border_width; } x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; @@ -1077,16 +1152,13 @@ window_vt_x, window_vt_y, vt_width, vt_height); -#ifdef HAVE_BG_PIXMAP - if (bg_window_size_sensitive ()) - update_background (); -#endif + HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END)); } if (fix_screen || old_height == 0) scr_reset (); -#ifdef USE_XIM +#if USE_XIM im_set_position (); #endif } @@ -1121,7 +1193,7 @@ /* -------------------------------------------------------------------- * * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ -#ifdef USE_XIM +#if USE_XIM void rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) @@ -1311,9 +1383,9 @@ char **s; XIMStyles *xim_styles; - set_environ (envv); + set_environ (env); - if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) + if (!((p = XSetLocaleModifiers (modifiers)) && *p)) return false; input_method = display->get_xim (locale, modifiers); @@ -1623,59 +1695,4 @@ 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 -rxvt_term::update_background () -{ - if (update_background_ev.is_active ()) - return; - - bg_invalidate (); - - if (!mapped) - return; - - ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); - - if (to_wait <= 0.) - bg_render (); - else - update_background_ev.start (to_wait); -} - -void -rxvt_term::update_background_cb (ev::timer &w, int revents) -{ - make_current (); - - update_background_ev.stop (); - bg_render (); - refresh_check (); -} - -#endif /* HAVE_BG_PIXMAP */ - /*----------------------- end-of-file (C source) -----------------------*/