--- rxvt-unicode/src/rxvttoolkit.C 2006/02/02 14:41:00 1.49 +++ rxvt-unicode/src/rxvttoolkit.C 2010/12/14 08:01:51 1.110 @@ -1,9 +1,9 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: rxvttoolkit.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2003-2004 Marc Lehmann + * Copyright (c) 2003-2007 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 @@ -28,17 +28,14 @@ #include #include - -#ifndef NO_SLOW_LINK_SUPPORT -# include -# include -#endif +#include +#include #if XFT # include #endif -const char *const xa_names[] = +static const char *const xa_names[] = { "TEXT", "COMPOUND_TEXT", @@ -64,12 +61,13 @@ "_NET_WM_NAME", "_NET_WM_ICON_NAME", "_NET_WM_PING", + "_NET_WM_ICON", #endif #if USE_XIM "WM_LOCALE_NAME", "XIM_SERVERS", #endif -#ifdef TRANSPARENT +#ifdef ENABLE_TRANSPARENCY "_XROOTPMAP_ID", "ESETROOT_PMAP_ID", #endif @@ -179,7 +177,7 @@ { display = GET_R->display; //HACK: TODO - xim = XOpenIM (display->display, 0, 0, 0); + xim = XOpenIM (display->dpy, 0, 0, 0); if (!xim) return false; @@ -188,7 +186,7 @@ ximcallback.client_data = (XPointer)this; ximcallback.callback = im_destroy_cb; - XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); + XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0); return true; } @@ -203,13 +201,63 @@ ///////////////////////////////////////////////////////////////////////////// +#if XFT +rxvt_drawable::~rxvt_drawable () +{ + if (xftdrawable) + XftDrawDestroy (xftdrawable); +} + +rxvt_drawable::operator XftDraw *() +{ + if (!xftdrawable) + xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap); + + return xftdrawable; +} +#endif + +///////////////////////////////////////////////////////////////////////////// + +#if XFT + +// not strictly necessary as it is only used with superclass of zero_initialised +rxvt_screen::rxvt_screen () +: scratch_area (0) +{ +} + +rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h) +{ + // it's actually faster to re-allocate every time. don't ask me + // why, but its likely no big deal there are no roundtrips + // (I think/hope). + if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/) + { + if (scratch_area) + { + XFreePixmap (dpy, scratch_area->drawable); + delete scratch_area; + } + + Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)), + scratch_w = w, scratch_h = h, depth); + + scratch_area = new rxvt_drawable (this, pm); + } + + return *scratch_area; +} + +#endif + void rxvt_screen::set (rxvt_display *disp) { display = disp; - xdisp = disp->display; + dpy = disp->dpy; - Screen *screen = ScreenOfDisplay (xdisp, disp->screen); + Screen *screen = ScreenOfDisplay (dpy, disp->screen); depth = DefaultDepthOfScreen (screen); visual = DefaultVisualOfScreen (screen); @@ -217,18 +265,16 @@ } void -rxvt_screen::set (rxvt_display *disp, int bitdepth) +rxvt_screen::select_visual (int bitdepth) { - set (disp); - #if XFT XVisualInfo vinfo; - if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo)) + if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) { depth = bitdepth; visual = vinfo.visual; - cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); + cmap = XCreateColormap (dpy, display->root, visual, AllocNone); } #endif } @@ -236,23 +282,33 @@ void rxvt_screen::clear () { - if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) - XFreeColormap (xdisp, cmap); +#if XFT + if (scratch_area) + { + XFreePixmap (dpy, scratch_area->drawable); + delete scratch_area; + } +#endif + + if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen))) + XFreeColormap (dpy, cmap); } ///////////////////////////////////////////////////////////////////////////// rxvt_display::rxvt_display (const char *id) : refcounted (id) -, x_ev (this, &rxvt_display::x_cb) , selection_owner (0) +, clipboard_owner (0) { + x_ev .set (this); + flush_ev.set (this); } XrmDatabase rxvt_display::get_resources (bool refresh) { - char *homedir = (char *)getenv ("HOME"); + char *homedir = getenv ("HOME"); char fname[1024]; /* @@ -262,11 +318,12 @@ XrmDatabase rdb1, database = 0; // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 + // as opposed to "standard practise", we always read in ~/.Xdefaults // 6. System wide per application default file. /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ - if ((xe = (char *)getenv ("XAPPLRESDIR"))) + if ((xe = getenv ("XAPPLRESDIR"))) { snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); @@ -278,6 +335,14 @@ // none // 4. User's defaults file. + if (homedir) + { + snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir); + + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } + /* Get any Xserver defaults */ if (refresh) { @@ -288,44 +353,38 @@ char *val = 0; #if XLIB_ILLEGAL_ACCESS - if (display->xdefaults) - XFree (display->xdefaults); + if (dpy->xdefaults) + XFree (dpy->xdefaults); #endif - if (XGetWindowProperty (display, root, XA_RESOURCE_MANAGER, + if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER, 0L, 100000000L, False, XA_STRING, &actual_type, &actual_format, &nitems, &nremaining, (unsigned char **)&val) == Success && actual_type == XA_STRING && actual_format == 8) - displayResource = val; - else - { - displayResource = 0; - if (val) - XFree(val); - } + displayResource = val; + else + { + displayResource = 0; + + if (val) + XFree (val); + } #if XLIB_ILLEGAL_ACCESS - display->xdefaults = displayResource; + dpy->xdefaults = displayResource; #endif } else - displayResource = XResourceManagerString (display); + displayResource = XResourceManagerString (dpy); if (displayResource) { if ((rdb1 = XrmGetStringDatabase (displayResource))) XrmMergeDatabases (rdb1, &database); } - else if (homedir) - { - snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir); - - if ((rdb1 = XrmGetFileDatabase (fname))) - XrmMergeDatabases (rdb1, &database); - } #if !XLIB_ILLEGAL_ACCESS if (refresh && displayResource) @@ -333,7 +392,7 @@ #endif /* Get screen specific resources */ - displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); + displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen)); if (displayResource) { @@ -346,7 +405,7 @@ // 3. User's per host defaults file /* Add in XENVIRONMENT file */ - if ((xe = (char *)getenv ("XENVIRONMENT")) + if ((xe = getenv ("XENVIRONMENT")) && (rdb1 = XrmGetFileDatabase (xe))) XrmMergeDatabases (rdb1, &database); else if (homedir) @@ -370,59 +429,58 @@ #ifdef LOCAL_X_IS_UNIX if (id[0] == ':') { - val = rxvt_malloc (5 + strlen (id) + 1); + if (!(val = rxvt_temp_buf (5 + strlen (id) + 1))) + return false; strcpy (val, "unix/"); strcat (val, id); - display = XOpenDisplay (val); - free (val); + dpy = XOpenDisplay (val); } else #endif - display = 0; + dpy = 0; - if (!display) - display = XOpenDisplay (id); + if (!dpy) + dpy = XOpenDisplay (id); - if (!display) + if (!dpy) return false; - screen = DefaultScreen (display); - root = DefaultRootWindow (display); + screen = DefaultScreen (dpy); + root = DefaultRootWindow (dpy); assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); - XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); + XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); - XrmSetDatabase (display, get_resources (false)); + XrmSetDatabase (dpy, get_resources (false)); #ifdef POINTER_BLANK XColor blackcolour; blackcolour.red = 0; blackcolour.green = 0; blackcolour.blue = 0; - Font f = XLoadFont (display, "fixed"); - blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', + Font f = XLoadFont (dpy, "fixed"); + blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ', &blackcolour, &blackcolour); - XUnloadFont (display, f); + XUnloadFont (dpy, f); #endif - int fd = XConnectionNumber (display); + int fd = XConnectionNumber (dpy); -#ifndef NO_SLOW_LINK_SUPPORT - // try to detect wether we have a local connection. - // assume unix domains socket == local, everything else not + // try to detect whether we have a local connection. + // assume unix domain socket == local, everything else not // TODO: might want to check for inet/127.0.0.1 is_local = 0; sockaddr_un sa; socklen_t sl = sizeof (sa); if (!getsockname (fd, (sockaddr *)&sa, &sl)) - is_local = sa.sun_family == AF_LOCAL; -#endif + is_local = sa.sun_family == AF_UNIX; - x_ev.start (fd, EVENT_READ); + flush_ev.start (); + x_ev.start (fd, ev::READ); fcntl (fd, F_SETFD, FD_CLOEXEC); - XSelectInput (display, root, PropertyChangeMask); + XSelectInput (dpy, root, PropertyChangeMask); flush (); @@ -432,25 +490,26 @@ void rxvt_display::ref_next () { - // TODO: somehow check wether the database files/resources changed + // TODO: somehow check whether the database files/resources changed // before affording re-loading/parsing - XrmDestroyDatabase (XrmGetDatabase (display)); - XrmSetDatabase (display, get_resources (true)); + XrmDestroyDatabase (XrmGetDatabase (dpy)); + XrmSetDatabase (dpy, get_resources (true)); } rxvt_display::~rxvt_display () { - if (!display) + if (!dpy) return; #ifdef POINTER_BLANK - XFreeCursor (display, blank_cursor); + XFreeCursor (dpy, blank_cursor); #endif x_ev.stop (); + flush_ev.stop (); #ifdef USE_XIM xims.clear (); #endif - XCloseDisplay (display); + XCloseDisplay (dpy); } #ifdef USE_XIM @@ -468,15 +527,15 @@ int actual_format; unsigned long nitems, bytes_after; - if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, + if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, False, XA_ATOM, &actual_type, &actual_format, &nitems, &bytes_after, (unsigned char **)&atoms) - != Success ) + != Success) return; - if (actual_type == XA_ATOM && actual_format == 32) + if (actual_type == XA_ATOM && actual_format == 32) for (int i = 0; i < nitems; i++) - if (XGetSelectionOwner (display, atoms[i])) + if (XGetSelectionOwner (dpy, atoms[i])) { im_change_cb (); break; @@ -486,63 +545,76 @@ } #endif -void rxvt_display::x_cb (io_watcher &w, short revents) +void rxvt_display::x_cb (ev::io &w, int revents) { - do - { - XEvent xev; - XNextEvent (display, &xev); + flush_ev.start (); +} + +void rxvt_display::flush_cb (ev::prepare &w, int revents) +{ + while (XEventsQueued (dpy, QueuedAfterFlush)) + do + { + XEvent xev; + XNextEvent (dpy, &xev); #ifdef USE_XIM - if (!XFilterEvent (&xev, None)) - { - if (xev.type == PropertyNotify - && xev.xany.window == root - && xev.xproperty.atom == xa[XA_XIM_SERVERS]) - im_change_check (); -#endif - for (int i = xw.size (); i--; ) - { - if (!xw[i]) - xw.erase_unordered (i); - else if (xw[i]->window == xev.xany.window) - xw[i]->call (xev); - } + if (!XFilterEvent (&xev, None)) + { + if (xev.type == PropertyNotify + && xev.xany.window == root + && xev.xproperty.atom == xa[XA_XIM_SERVERS]) + im_change_check (); +#endif + if (xev.type == MappingNotify) + XRefreshKeyboardMapping (&xev.xmapping); + + for (int i = xw.size (); i--; ) + { + if (!xw[i]) + xw.erase_unordered (i); + else if (xw[i]->window == xev.xany.window) + xw[i]->call (xev); + } #ifdef USE_XIM - } + } #endif - } - while (XEventsQueued (display, QueuedAlready)); + } + while (XEventsQueued (dpy, QueuedAlready)); - XFlush (display); -} - -void rxvt_display::flush () -{ - if (XEventsQueued (display, QueuedAlready)) - x_cb (x_ev, EVENT_READ); - - XFlush (display); + w.stop (); } void rxvt_display::reg (xevent_watcher *w) { - xw.push_back (w); - w->active = xw.size (); + if (!w->active) + { + xw.push_back (w); + w->active = xw.size (); + } } void rxvt_display::unreg (xevent_watcher *w) { if (w->active) - xw[w->active - 1] = 0; + { + xw[w->active - 1] = 0; + w->active = 0; + } } -void rxvt_display::set_selection_owner (rxvt_term *owner) +void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard) { - if (selection_owner && selection_owner != owner) - selection_owner->selection_clear (); + rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner; - selection_owner = owner; + if (cur_owner && cur_owner != owner) + { + rxvt_term *term = cur_owner; + term->selection_clear (clipboard); + term->flush (); + } + + cur_owner = owner; } #ifdef USE_XIM @@ -565,7 +637,7 @@ l = strlen (locale); m = strlen (modifiers); - if (!(id = (char *)malloc (l + m + 2))) + if (!(id = rxvt_temp_buf (l + m + 2))) return 0; memcpy (id, locale, l); id[l] = '\n'; @@ -573,8 +645,6 @@ rxvt_xim *xim = xims.get (id); - free (id); - return xim; } @@ -589,7 +659,7 @@ Atom rxvt_display::atom (const char *name) { - return XInternAtom (display, name, False); + return XInternAtom (dpy, name, False); } ///////////////////////////////////////////////////////////////////////////// @@ -598,10 +668,20 @@ refcache displays; ///////////////////////////////////////////////////////////////////////////// - +// + +static unsigned int +insert_component (unsigned int value, unsigned int mask, unsigned int shift) +{ + return (value * (mask + 1) >> 16) << shift; +} + bool rxvt_color::alloc (rxvt_screen *screen, const rgba &color) { + //TODO: only supports 24 bit + int alpha = color.a >= 0xff00 ? 0xffff : color.a; + #if XFT XRenderPictFormat *format; @@ -609,18 +689,18 @@ // Transparency users should eat shit and die, and then // XRenderQueryPictIndexValues themselves plenty. if ((screen->visual->c_class == TrueColor) - && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) + && (format = XRenderFindVisualFormat (screen->dpy, screen->visual))) { // the fun lies in doing everything manually... c.color.red = color.r; c.color.green = color.g; c.color.blue = color.b; - c.color.alpha = color.a; + c.color.alpha = alpha; - c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) - | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) - | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) - | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); + c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) + | insert_component (color.g, format->direct.greenMask, format->direct.green) + | insert_component (color.b, format->direct.blueMask , format->direct.blue ) + | insert_component (alpha , format->direct.alphaMask, format->direct.alpha); return true; } @@ -631,9 +711,9 @@ d.red = color.r; d.green = color.g; d.blue = color.b; - d.alpha = color.a; + d.alpha = alpha; - return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); + return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); } #else c.red = color.r; @@ -642,21 +722,18 @@ if (screen->visual->c_class == TrueColor) { - c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) - / rgba::MAX_CC) << ctz (screen->visual->red_mask ) - | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask)) - / rgba::MAX_CC) << ctz (screen->visual->green_mask) - | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) - / rgba::MAX_CC) << ctz (screen->visual->blue_mask ); + c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask )) + | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask)) + | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask )); return true; } - else if (XAllocColor (screen->xdisp, screen->cmap, &c)) + else if (XAllocColor (screen->dpy, screen->cmap, &c)) return true; else c.pixel = (color.r + color.g + color.b) > 128*3 - ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) - : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); + ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) + : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); #endif return false; @@ -669,21 +746,21 @@ char eos; int skip; + c.a = rgba::MAX_CC; + // parse the nonstandard "[alphapercent]" prefix if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) { c.a = lerp (0, rgba::MAX_CC, c.a); name += skip; } - else - c.a = rgba::MAX_CC; // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) { - XColor xc, xc_exact; + XColor xc; - if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) + if (XParseColor (screen->dpy, screen->cmap, name, &xc)) { c.r = xc.red; c.g = xc.green; @@ -718,10 +795,10 @@ for (int i = 0; i < cmap_size; i++) colors [i].pixel = i; - + // many kilobytes transfer per colour, but pseudocolor isn't worth // many extra optimisations. - XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); + XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); int diff = 0x7fffffffUL; XColor *best = colors; @@ -741,10 +818,10 @@ //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", // color.r, color.g, color.b, best->red, best->green, best->blue, diff); - + got = alloc (screen, rgba (best->red, best->green, best->blue)); - delete colors; + delete [] colors; } #endif @@ -779,13 +856,16 @@ color.pixel = (Pixel)*this; } -void +void rxvt_color::free (rxvt_screen *screen) { + if (screen->visual->c_class == TrueColor) + return; // nothing to do + #if XFT - XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); + XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); #else - XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); + XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); #endif }