--- rxvt-unicode/src/rxvttoolkit.C 2006/01/30 16:12:58 1.35 +++ rxvt-unicode/src/rxvttoolkit.C 2006/02/01 18:36:48 1.46 @@ -83,6 +83,14 @@ "XDCCC_LINEAR_RGB_MATRICES", "WM_COLORMAP_WINDOWS", "WM_STATE", + "cursor", +# if USE_XIM + "TRANSPORT", + "LOCALES", + "_XIM_PROTOCOL", + "_XIM_XCONNECT", + "_XIM_MOREDATA", +# endif #endif }; @@ -389,9 +397,10 @@ rxvt_display::ref_next () { // TODO: somehow check wether the database files/resources changed - // before re-loading/parsing + // before affording re-loading/parsing XrmDestroyDatabase (XrmGetDatabase (display)); XrmSetDatabase (display, get_resources ()); + printf ("next\n");//D } rxvt_display::~rxvt_display () @@ -502,6 +511,7 @@ } #ifdef USE_XIM + void rxvt_display::reg (im_watcher *w) { imw.push_back (w); @@ -535,10 +545,11 @@ void rxvt_display::put_xim (rxvt_xim *xim) { -#if XLIB_IS_RACEFREE +# if XLIB_IS_RACEFREE xims.put (xim); -#endif +# endif } + #endif Atom rxvt_display::atom (const char *name) @@ -552,52 +563,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; - - // 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; - - // slow case: server round trip - 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, const rgba &color) { #if XFT XRenderPictFormat *format; @@ -605,19 +573,19 @@ // 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... - 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); + c.color.red = color.r; + c.color.green = color.g; + c.color.blue = color.b; + c.color.alpha = color.a; + + 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); return true; } @@ -625,114 +593,181 @@ { XRenderColor d; - d.red = rgba.r; - d.green = rgba.g; - d.blue = rgba.b; - d.alpha = rgba.a; + d.red = color.r; + d.green = color.g; + d.blue = color.b; + d.alpha = color.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 ); + c.red = color.r; + c.green = color.g; + c.blue = color.b; + + if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) + { + 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 ); return true; } + else if (XAllocColor (screen->xdisp, screen->cmap, &c)) + return true; + else + c.pixel = (color.r + color.g + color.b) > 128*3 + ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) + : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); +#endif + + return false; +} + +bool +rxvt_color::set (rxvt_screen *screen, const char *name) +{ + rgba c; + char eos; + int skip; + + // 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; + XColor xc, xc_exact; - 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; - } + 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 false; -#endif + return set (screen, c); } -void -rxvt_color::get (rxvt_screen *screen, rxvt_rgba &rgba) +bool +rxvt_color::set (rxvt_screen *screen, const rgba &color) { -#if XFT - rgba.r = c.color.red; - rgba.g = c.color.green; - rgba.b = c.color.blue; - rgba.a = c.color.alpha; -#else - XColor c; + bool got = alloc (screen, color); + +#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; + + // many kilobytes transfer per colour, but pseudocolor isn't worth + // many extra optimisations. + 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 (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; + } + } - c.pixel = p; - XQueryColor (screen->xdisp, screen->cmap, &c); + //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)); - rgba.r = c.red; - rgba.g = c.green; - rgba.b = c.blue; - rgba.a = rxvt_rgba::MAX_CC; + delete colors; + } #endif + + return got; } -void -rxvt_color::free (rxvt_screen *screen) +void +rxvt_color::get (rgba &color) { #if XFT - XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); + color.r = c.color.red; + color.g = c.color.green; + color.b = c.color.blue; + color.a = c.color.alpha; #else - XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); + color.r = c.red; + color.g = c.green; + color.b = c.blue; + color.a = rgba::MAX_CC; #endif } -rxvt_color -rxvt_color::fade (rxvt_screen *screen, int percent) +void +rxvt_color::get (XColor &color) { - rxvt_color faded; - - rxvt_rgba c; - get (screen, c); - - c.r = lerp (0, c.r, percent); - c.g = lerp (0, c.g, percent); - c.b = lerp (0, c.b, percent); + rgba c; + get (c); - faded.set (screen, c); + color.red = c.r; + color.green = c.g; + color.blue = c.b; + color.pixel = (Pixel)*this; +} - return faded; +void +rxvt_color::free (rxvt_screen *screen) +{ +#if XFT + XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); +#else + XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); +#endif } -rxvt_color -rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto) +void +rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) { - rxvt_rgba c, fc; - rxvt_color faded; - - get (screen, c); - fadeto.get (screen, fc); + rgba c; + get (c); - faded.set ( + result.set ( screen, - 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) + 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) ) ); - - return faded; }