--- rxvt-unicode/src/rxvttoolkit.C 2006/01/29 22:27:04 1.31 +++ rxvt-unicode/src/rxvttoolkit.C 2006/01/31 00:25:16 1.39 @@ -39,40 +39,60 @@ #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", + "cursor", +# if USE_XIM + "TRANSPORT", + "LOCALES", + "_XIM_PROTOCOL", + "_XIM_XCONNECT", + "_XIM_MOREDATA", +# endif #endif - }; +}; ///////////////////////////////////////////////////////////////////////////// @@ -540,41 +560,9 @@ refcache displays; ///////////////////////////////////////////////////////////////////////////// - -bool -rxvt_color::set (rxvt_screen *screen, const char *name) -{ -#if XFT - int l = strlen (name); - rxvt_rgba r; - char eos; - int mult; - - 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; - else - return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); - - r.r *= mult; r.g *= mult; r.b *= mult; r.a *= mult; - return set (screen, r); -#else - XColor xc; - - if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) - return set (screen, rxvt_rgba (xc.red, xc.green, xc.blue)); - - return false; -#endif -} - + bool -rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba) +rxvt_color::alloc (rxvt_screen *screen, rxvt_rgba rgba) { #if XFT XRenderPictFormat *format; @@ -582,7 +570,7 @@ // 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 + if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) { // the fun lies in doing everything manually... @@ -591,10 +579,10 @@ c.color.blue = rgba.b; c.color.alpha = rgba.a; - c.pixel = (rgba.r >> (16 - popcount (format->direct.redMask )) << format->direct.red) - | (rgba.g >> (16 - popcount (format->direct.greenMask)) << format->direct.green) - | (rgba.b >> (16 - popcount (format->direct.blueMask )) << format->direct.blue) - | (rgba.a >> (16 - popcount (format->direct.alphaMask)) << format->direct.alpha); + 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); return true; } @@ -609,27 +597,135 @@ return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); } +#else + if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) + { + 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; + + if (XAllocColor (screen->xdisp, screen->cmap, &xc)) + { + p = xc.pixel; + return true; + } + else + p = (rgba.r + rgba.g + rgba.b) > 128*3 + ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) + : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); + } +#endif return false; -#else - XColor xc; +} - xc.red = rgba.r; - xc.green = rgba.g; - xc.blue = rgba.b; - xc.flags = DoRed | DoGreen | DoBlue; +bool +rxvt_color::set (rxvt_screen *screen, const char *name) +{ + rxvt_rgba c; + char eos; + int skip; - if (XAllocColor (screen->xdisp, screen->cmap, &xc)) + if (1 <= sscanf (name, "[%hx]%n", &c.a, &skip)) { - p = xc.pixel; - return true; + switch (skip) + { + case 2 + 1: c.a *= rxvt_rgba::MAX_CC / 0x000f; break; + case 2 + 2: c.a *= rxvt_rgba::MAX_CC / 0x00ff; break; + case 2 + 3: c.a *= rxvt_rgba::MAX_CC / 0x0fff; break; + case 2 + 4: c.a *= rxvt_rgba::MAX_CC / 0xffff; break; + } + + name += skip; } + else + c.a = rxvt_rgba::MAX_CC; - return false; + // parse the non-standard rgba format + if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%hx/%hx/%hx/%hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) + { + XColor xc, xc_exact; + + if (XParseColor (screen->xdisp, 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_screen *screen, rxvt_rgba rgba) +{ + bool got = alloc (screen, rgba); + +#if !ENABLE_MINIMAL + int cmap_size = screen->visual->map_entries; + + if (!got + && screen->visual->c_class == PseudoColor + && cmap_size < 4096) + { + XColor *colors = new XColor [screen->visual->map_entries]; + + for (int i = 0; i < cmap_size; i++) + colors [i].pixel = i; + + XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); + + int diff = 0x7fffffffUL; + XColor *best = colors; + + for (int i = 0; i < cmap_size; i++) + { + int d = (squared_diff (rgba.r >> 2, colors [i].red >> 2)) + + (squared_diff (rgba.g >> 2, colors [i].green >> 2)) + + (squared_diff (rgba.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", + // rgba.r, rgba.g, rgba.b, best->red, best->green, best->blue, diff); + + got = alloc (screen, rxvt_rgba (best->red, best->green, best->blue)); + + delete colors; + } #endif + + return got; } -void +void rxvt_color::get (rxvt_screen *screen, rxvt_rgba &rgba) { #if XFT