--- rxvt-unicode/src/rxvttoolkit.C 2006/01/25 21:03:04 1.26 +++ rxvt-unicode/src/rxvttoolkit.C 2006/01/30 16:12:58 1.35 @@ -34,41 +34,57 @@ # include #endif +#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", +{ + "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", + "_MOTIF_WM_HINTS", #endif #if ENABLE_EWMH - "_NET_WM_PID", - "_NET_WM_NAME", - "_NET_WM_ICON_NAME", - "_NET_WM_PING", + "_NET_WM_PID", + "_NET_WM_NAME", + "_NET_WM_ICON_NAME", + "_NET_WM_PING", #endif #if USE_XIM - "WM_LOCALE_NAME", - "XIM_SERVERS", + "WM_LOCALE_NAME", + "XIM_SERVERS", #endif #ifdef TRANSPARENT - "_XROOTPMAP_ID", - "ESETROOT_PMAP_ID", + "_XROOTPMAP_ID", + "ESETROOT_PMAP_ID", #endif #if ENABLE_XEMBED - "_XEMBED", - "_XEMBED_INFO", + "_XEMBED", + "_XEMBED_INFO", +#endif +#if !ENABLE_MINIMAL + "SCREEN_RESOURCES", + "XDCCC_LINEAR_RGB_CORRECTION", + "XDCCC_LINEAR_RGB_MATRICES", + "WM_COLORMAP_WINDOWS", + "WM_STATE", #endif - }; +}; ///////////////////////////////////////////////////////////////////////////// @@ -183,29 +199,30 @@ rxvt_screen::set (rxvt_display *disp) { display = disp; - - xdisp = disp->display; + xdisp = disp->display; Screen *screen = ScreenOfDisplay (xdisp, disp->screen); - depth = DefaultDepthOfScreen (screen); - visual = DefaultVisualOfScreen (screen); - cmap = DefaultColormapOfScreen (screen); + depth = DefaultDepthOfScreen (screen); + visual = DefaultVisualOfScreen (screen); + cmap = DefaultColormapOfScreen (screen); } void -rxvt_screen::set (rxvt_display *disp, int depth) +rxvt_screen::set (rxvt_display *disp, int bitdepth) { set (disp); +#if XFT XVisualInfo vinfo; - if (XMatchVisualInfo (xdisp, display->screen, depth, TrueColor, &vinfo)) + if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo)) { - this->depth = depth; - this->visual = vinfo.visual; - this->cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); + depth = bitdepth; + visual = vinfo.visual; + cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); } +#endif } void @@ -537,81 +554,136 @@ ///////////////////////////////////////////////////////////////////////////// bool -rxvt_color::set (rxvt_screen *screen, Pixel p) +rxvt_color::set (rxvt_screen *screen, const char *name) { #if XFT - XColor xc; - - xc.pixel = p; - if (!XQueryColor (screen->xdisp, screen->cmap, &xc)) - return false; + int l = strlen (name); + rxvt_rgba r; + char eos; + int mult; + + // shortcutting this saves countless server RTTs for the built-in colours + if (l == 3+3*3 && 3 == sscanf (name, "rgb:%hx/%hx/%hx/%hx%c", &r.r, &r.g, &r.b, &r.a, &eos)) + { + r.a = rxvt_rgba::MAX_CC; + mult = rxvt_rgba::MAX_CC / 0x00ff; + } + + // parse a number of non-standard ARGB colour specifications + else if ( l == 1+4*1 && 4 == sscanf (name, "#%1hx%1hx%1hx%1hx%c", &r.a, &r.r, &r.g, &r.b, &eos)) + mult = rxvt_rgba::MAX_CC / 0x000f; + else if (l == 1+4*2 && 4 == sscanf (name, "#%2hx%2hx%2hx%2hx%c", &r.a, &r.r, &r.g, &r.b, &eos)) + mult = rxvt_rgba::MAX_CC / 0x00ff; + else if (l == 1+4*4 && 4 == sscanf (name, "#%4hx%4hx%4hx%4hx%c", &r.a, &r.r, &r.g, &r.b, &eos)) + mult = rxvt_rgba::MAX_CC / 0xffff; + else if (l == 4+5*4 && 4 == sscanf (name, "rgba:%hx/%hx/%hx/%hx%c", &r.r, &r.g, &r.b, &r.a, &eos)) + mult = rxvt_rgba::MAX_CC / 0xffff; - XRenderColor d; - - d.red = xc.red; - d.green = xc.green; - d.blue = xc.blue; - d.alpha = 0xffff; - - return - XftColorAllocValue (screen->xdisp, - screen->visual, - screen->cmap, - &d, &c); -#else - this->p = p; -#endif + // slow case: server round trip + else + return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); - return true; -} + r.r *= mult; r.g *= mult; r.b *= mult; r.a *= mult; -bool -rxvt_color::set (rxvt_screen *screen, const char *name) -{ -#if XFT - return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); + return set (screen, r); #else XColor xc; if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) - return set (screen, xc.red, xc.green, xc.blue); + return set (screen, rxvt_rgba (xc.red, xc.green, xc.blue)); return false; #endif } bool -rxvt_color::set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb) +rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba) { - XColor xc; +#if XFT + XRenderPictFormat *format; - xc.red = cr; - xc.green = cg; - xc.blue = cb; - xc.flags = DoRed | DoGreen | DoBlue; + // 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->xdisp, screen->visual))) + { + // the fun lies in doing everything manually... + c.color.red = rgba.r; + c.color.green = rgba.g; + c.color.blue = rgba.b; + c.color.alpha = rgba.a; + + c.pixel = ((rgba.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red ) + | ((rgba.g * format->direct.greenMask / rxvt_rgba::MAX_CC) << format->direct.green) + | ((rgba.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue ) + | ((rgba.a * format->direct.alphaMask / rxvt_rgba::MAX_CC) << format->direct.alpha); - if (XAllocColor (screen->xdisp, screen->cmap, &xc)) - return set (screen, xc.pixel); + return true; + } + else + { + XRenderColor d; + + d.red = rgba.r; + d.green = rgba.g; + d.blue = rgba.b; + d.alpha = rgba.a; + + return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); + } + + return false; +#else + if (screen->visual->c_class == TrueColor) + { + p = (rgba.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) + / rxvt_rgba::MAX_CC) << ctz (screen->visual->red_mask ) + | (rgba.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask)) + / rxvt_rgba::MAX_CC) << ctz (screen->visual->green_mask) + | (rgba.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) + / rxvt_rgba::MAX_CC) << ctz (screen->visual->blue_mask ); + + return true; + } + else + { + XColor xc; + + xc.red = rgba.r; + xc.green = rgba.g; + xc.blue = rgba.b; + xc.flags = DoRed | DoGreen | DoBlue; + + if (XAllocColor (screen->xdisp, screen->cmap, &xc)) + { + p = xc.pixel; + return true; + } + } return false; +#endif } void -rxvt_color::get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb) +rxvt_color::get (rxvt_screen *screen, rxvt_rgba &rgba) { #if XFT - cr = c.color.red; - cg = c.color.green; - cb = c.color.blue; + rgba.r = c.color.red; + rgba.g = c.color.green; + rgba.b = c.color.blue; + rgba.a = c.color.alpha; #else XColor c; c.pixel = p; XQueryColor (screen->xdisp, screen->cmap, &c); - cr = c.red; - cg = c.green; - cb = c.blue; + rgba.r = c.red; + rgba.g = c.green; + rgba.b = c.blue; + rgba.a = rxvt_rgba::MAX_CC; #endif } @@ -628,42 +700,37 @@ rxvt_color rxvt_color::fade (rxvt_screen *screen, int percent) { - percent = 100 - percent; - - unsigned short cr, cg, cb; rxvt_color faded; - get (screen, cr, cg, cb); + rxvt_rgba c; + get (screen, c); - faded.set ( - screen, - cr * percent / 100, - cg * percent / 100, - cb * percent / 100 - ); + c.r = lerp (0, c.r, percent); + c.g = lerp (0, c.g, percent); + c.b = lerp (0, c.b, percent); + + faded.set (screen, c); return faded; } -#define LERP(a,b,p) (a * p + b * (100 - p)) / 100 - rxvt_color rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto) { - percent = 100 - percent; - - unsigned short cr, cg, cb; - unsigned short fcr, fcg, fcb; + rxvt_rgba c, fc; rxvt_color faded; - get (screen, cr, cg, cb); - fadeto.get (screen, fcr, fcg, fcb); + get (screen, c); + fadeto.get (screen, fc); faded.set ( screen, - LERP (cr, fcr, percent), - LERP (cg, fcg, percent), - LERP (cb, fcb, percent) + rxvt_rgba ( + lerp (fc.r, c.r, percent), + lerp (fc.g, c.g, percent), + lerp (fc.b, c.b, percent), + lerp (fc.a, c.a, percent) + ) ); return faded;