--- rxvt-unicode/src/rxvttoolkit.C 2004/12/15 05:30:40 1.8 +++ rxvt-unicode/src/rxvttoolkit.C 2007/06/25 23:27:18 1.67 @@ -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-2006 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 @@ -27,11 +27,72 @@ #include #include -#ifndef NO_SLOW_LINK_SUPPORT -# include -# include +#include +#include +#include + +#if XFT +# include #endif +const char *const xa_names[] = +{ + "TEXT", + "COMPOUND_TEXT", + "UTF8_STRING", + "MULTIPLE", + "TARGETS", + "TIMESTAMP", + "VT_SELECTION", + "INCR", + "WM_PROTOCOLS", + "WM_DELETE_WINDOW", + "CLIPBOARD", + "AVERAGE_WIDTH", + "WEIGHT_NAME", + "SLANT", + "CHARSET_REGISTRY", + "CHARSET_ENCODING", +#if ENABLE_FRILLS + "_MOTIF_WM_HINTS", +#endif +#if ENABLE_EWMH + "_NET_WM_PID", + "_NET_WM_NAME", + "_NET_WM_ICON_NAME", + "_NET_WM_PING", +#endif +#if USE_XIM + "WM_LOCALE_NAME", + "XIM_SERVERS", +#endif +#ifdef TRANSPARENT + "_XROOTPMAP_ID", + "ESETROOT_PMAP_ID", +#endif +#if ENABLE_XEMBED + "_XEMBED", + "_XEMBED_INFO", +#endif +#if !ENABLE_MINIMAL + "SCREEN_RESOURCES", + "XDCCC_LINEAR_RGB_CORRECTION", + "XDCCC_LINEAR_RGB_MATRICES", + "WM_COLORMAP_WINDOWS", + "WM_STATE", + "cursor", +# if USE_XIM + "TRANSPORT", + "LOCALES", + "_XIM_PROTOCOL", + "_XIM_XCONNECT", + "_XIM_MOREDATA", +# endif +#endif +}; + +///////////////////////////////////////////////////////////////////////////// + refcounted::refcounted (const char *id) { this->id = strdup (id); @@ -49,17 +110,17 @@ { if (!strcmp (id, (*i)->id)) { - (*i)->referenced++; + ++(*i)->referenced; + (*i)->ref_next (); return *i; } } T *obj = new T (id); - obj->referenced = 1; - - if (obj && obj->init ()) + if (obj && obj->ref_init ()) { + obj->referenced = 1; this->push_back (obj); return obj; } @@ -84,7 +145,7 @@ } template -refcache::~refcache () +void refcache::clear () { while (this->size ()) put (*this->begin ()); @@ -93,6 +154,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef USE_XIM + static void #if XIMCB_PROTO_BROKEN im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) @@ -109,11 +171,12 @@ display->im_change_cb (); } -bool rxvt_xim::init () +bool +rxvt_xim::ref_init () { display = GET_R->display; //HACK: TODO - xim = XOpenIM (display->display, NULL, NULL, NULL); + xim = XOpenIM (display->dpy, 0, 0, 0); if (!xim) return false; @@ -122,7 +185,7 @@ ximcallback.client_data = (XPointer)this; ximcallback.callback = im_destroy_cb; - XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); + XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); return true; } @@ -132,8 +195,104 @@ if (xim) XCloseIM (xim); } + +#endif + +///////////////////////////////////////////////////////////////////////////// + +#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; + dpy = disp->dpy; + + Screen *screen = ScreenOfDisplay (dpy, disp->screen); + + depth = DefaultDepthOfScreen (screen); + visual = DefaultVisualOfScreen (screen); + cmap = DefaultColormapOfScreen (screen); +} + +void +rxvt_screen::select_visual (int bitdepth) +{ +#if XFT + XVisualInfo vinfo; + + if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) + { + depth = bitdepth; + visual = vinfo.visual; + cmap = XCreateColormap (dpy, display->root, visual, AllocNone); + } +#endif +} + +void +rxvt_screen::clear () +{ +#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) @@ -143,71 +302,215 @@ { } -bool rxvt_display::init () +XrmDatabase +rxvt_display::get_resources (bool refresh) { - display = XOpenDisplay (id); + char *homedir = (char *)getenv ("HOME"); + char fname[1024]; - if (!display) - return false; + /* + * get resources using the X library function + */ + char *displayResource, *xe; + XrmDatabase rdb1, database = 0; - screen = DefaultScreen (display); - root = DefaultRootWindow (display); - visual = DefaultVisual (display, screen); - cmap = DefaultColormap (display, screen); - depth = DefaultDepth (display, screen); + // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 + // as opposed to "standard practise", we always read in ~/.Xdefaults - int fd = XConnectionNumber (display); + // 6. System wide per application default file. -#ifndef NO_SLOW_LINK_SUPPORT - // try to detetc wether we have a local connection. - // assume unix domains 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); + /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ + if ((xe = (char *)getenv ("XAPPLRESDIR"))) + { + snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); - if (!getsockname (fd, (sockaddr *)&sa, &sl)) - is_local = sa.sun_family == AF_LOCAL; + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } + + // 5. User's per application default file. + // 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) + { + // fucking xlib keeps a copy of the rm string + Atom actual_type; + int actual_format; + unsigned long nitems, nremaining; + char *val = 0; + +#if XLIB_ILLEGAL_ACCESS + if (dpy->xdefaults) + XFree (dpy->xdefaults); +#endif + + 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); + } + +#if XLIB_ILLEGAL_ACCESS + dpy->xdefaults = displayResource; #endif + } + else + displayResource = XResourceManagerString (dpy); -#ifdef PREFER_24BIT - /* - * If depth is not 24, look for a 24bit visual. - */ - if (depth != 24) + if (displayResource) + { + if ((rdb1 = XrmGetStringDatabase (displayResource))) + XrmMergeDatabases (rdb1, &database); + } + +#if !XLIB_ILLEGAL_ACCESS + if (refresh && displayResource) + XFree (displayResource); +#endif + + /* Get screen specific resources */ + displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen)); + + if (displayResource) + { + if ((rdb1 = XrmGetStringDatabase (displayResource))) + /* Merge with screen-independent resources */ + XrmMergeDatabases (rdb1, &database); + + XFree (displayResource); + } + + // 3. User's per host defaults file + /* Add in XENVIRONMENT file */ + if ((xe = (char *)getenv ("XENVIRONMENT")) + && (rdb1 = XrmGetFileDatabase (xe))) + XrmMergeDatabases (rdb1, &database); + else if (homedir) { - XVisualInfo vinfo; + struct utsname un; - if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo)) + if (!uname (&un)) { - depth = 24; - visual = vinfo.visual; - cmap = XCreateColormap (display, - RootWindow (display, screen), - visual, AllocNone); + snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename); + + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); } } + + return database; +} + +bool rxvt_display::ref_init () +{ +#ifdef LOCAL_X_IS_UNIX + if (id[0] == ':') + { + val = rxvt_malloc (5 + strlen (id) + 1); + strcpy (val, "unix/"); + strcat (val, id); + dpy = XOpenDisplay (val); + free (val); + } + else #endif + dpy = 0; + + if (!dpy) + dpy = XOpenDisplay (id); + + if (!dpy) + return false; + + screen = DefaultScreen (dpy); + root = DefaultRootWindow (dpy); + +#ifdef HAVE_AFTERIMAGE + ::dpy = dpy; /* init global var from libAfter... */ + asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen), + XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL); +#endif + + assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); + XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); + + XrmSetDatabase (dpy, get_resources (false)); + +#ifdef POINTER_BLANK + XColor blackcolour; + blackcolour.red = 0; + blackcolour.green = 0; + blackcolour.blue = 0; + Font f = XLoadFont (dpy, "fixed"); + blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ', + &blackcolour, &blackcolour); + XUnloadFont (dpy, f); +#endif + + int fd = XConnectionNumber (dpy); + + // try to detect wether we have a local connection. + // assume unix domains 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_UNIX; x_ev.start (fd, EVENT_READ); fcntl (fd, F_SETFD, FD_CLOEXEC); - XSelectInput (display, root, PropertyChangeMask); -#ifdef USE_XIM - xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0); -#endif + XSelectInput (dpy, root, PropertyChangeMask); flush (); return true; } +void +rxvt_display::ref_next () +{ + // TODO: somehow check wether the database files/resources changed + // before affording re-loading/parsing + XrmDestroyDatabase (XrmGetDatabase (dpy)); + XrmSetDatabase (dpy, get_resources (true)); +} + rxvt_display::~rxvt_display () { - x_ev.stop (); + if (!dpy) + return; - if (display) - XCloseDisplay (display); +#ifdef POINTER_BLANK + XFreeCursor (dpy, blank_cursor); +#endif + x_ev.stop (); +#ifdef USE_XIM + xims.clear (); +#endif + XCloseDisplay (dpy); } #ifdef USE_XIM @@ -219,13 +522,13 @@ void rxvt_display::im_change_check () { - // make sure we only call im_change_cb when a new input method + // try to only call im_change_cb when a new input method // registers, as xlib crashes due to a race otherwise. Atom actual_type, *atoms; int actual_format; unsigned long nitems, bytes_after; - if (XGetWindowProperty (display, root, 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 ) @@ -233,7 +536,7 @@ 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; @@ -248,15 +551,14 @@ do { XEvent xev; - XNextEvent (display, &xev); + XNextEvent (dpy, &xev); #ifdef USE_XIM if (!XFilterEvent (&xev, None)) { - if (xev.type == PropertyNotify && xev.xany.window == root - && xev.xproperty.atom == xa_xim_servers) + && xev.xproperty.atom == xa[XA_XIM_SERVERS]) im_change_check (); #endif for (int i = xw.size (); i--; ) @@ -270,26 +572,35 @@ } #endif } - while (XEventsQueued (display, QueuedAlready)); + while (XEventsQueued (dpy, QueuedAlready)); - flush (); + XFlush (dpy); } void rxvt_display::flush () { - XFlush (display); + if (XEventsQueued (dpy, QueuedAlready)) + x_cb (x_ev, EVENT_READ); + + XFlush (dpy); } 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) @@ -301,6 +612,7 @@ } #ifdef USE_XIM + void rxvt_display::reg (im_watcher *w) { imw.push_back (w); @@ -334,13 +646,16 @@ void rxvt_display::put_xim (rxvt_xim *xim) { +# if XLIB_IS_RACEFREE xims.put (xim); +# endif } + #endif Atom rxvt_display::atom (const char *name) { - return XInternAtom (display, name, False); + return XInternAtom (dpy, name, False); } ///////////////////////////////////////////////////////////////////////////// @@ -349,109 +664,218 @@ 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::set (rxvt_display *display, Pixel p) +rxvt_color::alloc (rxvt_screen *screen, const rgba &color) { #if XFT - XColor xc; + XRenderPictFormat *format; - xc.pixel = p; - if (!XQueryColor (display->display, display->cmap, &xc)) - return false; + // FUCKING Xft gets it wrong, of course, so work around it. + // Transparency users should eat shit and die, and then + // XRenderQueryPictIndexValues themselves plenty. + if ((screen->visual->c_class == TrueColor) + && (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.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 (color.a, format->direct.alphaMask, format->direct.alpha); - XRenderColor d; + return true; + } + else + { + XRenderColor d; + + d.red = color.r; + d.green = color.g; + d.blue = color.b; + d.alpha = color.a; - d.red = xc.red; - d.green = xc.green; - d.blue = xc.blue; - d.alpha = 0xffff; - - return - XftColorAllocValue (display->display, - display->visual, - display->cmap, - &d, &c); + return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); + } #else - this->p = p; + c.red = color.r; + c.green = color.g; + c.blue = color.b; + + if (screen->visual->c_class == TrueColor) + { + c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) + | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) + | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); + + return true; + } + else if (XAllocColor (screen->dpy, screen->cmap, &c)) + return true; + else + c.pixel = (color.r + color.g + color.b) > 128*3 + ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy)) + : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy)); #endif - return true; + return false; } bool -rxvt_color::set (rxvt_display *display, const char *name) +rxvt_color::set (rxvt_screen *screen, const char *name) { -#if XFT - return XftColorAllocName (display->display, display->visual, display->cmap, - name, &c); -#else - XColor xc; + rgba c; + char eos; + int skip; - if (XParseColor (display->display, display->cmap, name, &xc)) - return set (display, xc.red, xc.green, xc.blue); + // 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; - return false; -#endif + // 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; + + if (XParseColor (screen->dpy, screen->cmap, name, &xc)) + { + c.r = xc.red; + c.g = xc.green; + c.b = xc.blue; + } + else + { + c.r = 0xffff; + c.g = 0x6969; + c.b = 0xb4b4; + + rxvt_warn ("unable to parse color '%s', using pink instead.\n", name); + } + } + + return set (screen, c); } bool -rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb) +rxvt_color::set (rxvt_screen *screen, const rgba &color) { - XColor xc; + bool got = alloc (screen, color); - xc.red = cr; - xc.green = cg; - xc.blue = cb; - xc.flags = DoRed | DoGreen | DoBlue; +#if !ENABLE_MINIMAL + int cmap_size = screen->visual->map_entries; - if (XAllocColor (display->display, display->cmap, &xc)) - return set (display, xc.pixel); + if (!got + && screen->visual->c_class == PseudoColor + && cmap_size < 4096) + { + XColor *colors = new XColor [screen->visual->map_entries]; - return false; + 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->dpy, screen->cmap, colors, cmap_size); + + int diff = 0x7fffffffUL; + XColor *best = colors; + + for (int i = 0; i < cmap_size; i++) + { + int d = (squared_diff (color.r >> 2, colors [i].red >> 2)) + + (squared_diff (color.g >> 2, colors [i].green >> 2)) + + (squared_diff (color.b >> 2, colors [i].blue >> 2)); + + if (d < diff) + { + diff = d; + best = colors + i; + } + } + + //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; + } +#endif + + return got; } -void -rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb) +void +rxvt_color::get (rgba &color) { #if XFT - cr = c.color.red; - cg = c.color.green; - cb = c.color.blue; + color.r = c.color.red; + color.g = c.color.green; + color.b = c.color.blue; + color.a = c.color.alpha; #else - XColor c; + color.r = c.red; + color.g = c.green; + color.b = c.blue; + color.a = rgba::MAX_CC; +#endif +} - c.pixel = p; - XQueryColor (display->display, display->cmap, &c); +void +rxvt_color::get (XColor &color) +{ + rgba c; + get (c); - cr = c.red; - cg = c.green; - cb = c.blue; -#endif + color.red = c.r; + color.green = c.g; + color.blue = c.b; + color.pixel = (Pixel)*this; } void -rxvt_color::free (rxvt_display *display) +rxvt_color::free (rxvt_screen *screen) { + if (screen->visual->c_class == TrueColor) + return; // nothing to do + #if XFT - XftColorFree (display->display, display->visual, display->cmap, &c); + XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); #else - XFreeColors (display->display, display->cmap, &p, 1, AllPlanes); + XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); #endif } -rxvt_color -rxvt_color::fade (rxvt_display *display, int percent) +void +rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) { - unsigned short cr, cg, cb; - rxvt_color faded; - - get (display, cr, cg, cb); - faded.set (display, - cr * percent / 100, - cg * percent / 100, - cb * percent / 100); + rgba c; + get (c); - return faded; + result.set ( + screen, + rgba ( + lerp (c.r, to.r, percent), + lerp (c.g, to.g, percent), + lerp (c.b, to.b, percent), + lerp (c.a, to.a, percent) + ) + ); }