--- rxvt-unicode/src/rxvttoolkit.C 2006/01/31 16:57:35 1.42 +++ rxvt-unicode/src/rxvttoolkit.C 2006/02/02 00:31:47 1.47 @@ -397,7 +397,7 @@ 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 ()); } @@ -510,6 +510,7 @@ } #ifdef USE_XIM + void rxvt_display::reg (im_watcher *w) { imw.push_back (w); @@ -543,10 +544,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) @@ -562,7 +564,7 @@ ///////////////////////////////////////////////////////////////////////////// bool -rxvt_color::alloc (rxvt_screen *screen, const rxvt_rgba &color) +rxvt_color::alloc (rxvt_screen *screen, const rgba &color) { #if XFT XRenderPictFormat *format; @@ -579,10 +581,10 @@ c.color.blue = color.b; c.color.alpha = color.a; - c.pixel = ((color.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red ) - | ((color.g * format->direct.greenMask / rxvt_rgba::MAX_CC) << format->direct.green) - | ((color.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue ) - | ((color.a * format->direct.alphaMask / rxvt_rgba::MAX_CC) << format->direct.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); return true; } @@ -598,35 +600,27 @@ return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); } #else + c.red = color.r; + c.green = color.g; + c.blue = color.b; + if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) { - p = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) - / rxvt_rgba::MAX_CC) << ctz (screen->visual->red_mask ) - | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask)) - / rxvt_rgba::MAX_CC) << ctz (screen->visual->green_mask) - | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) - / rxvt_rgba::MAX_CC) << ctz (screen->visual->blue_mask ); + 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 - { - XColor xc; - - xc.red = color.r; - xc.green = color.g; - xc.blue = color.b; - - if (XAllocColor (screen->xdisp, screen->cmap, &xc)) - { - p = xc.pixel; - return true; - } - else - p = (color.r + color.g + color.b) > 128*3 + c.pixel = (color.r + color.g + color.b) > 128*3 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); - } #endif return false; @@ -635,22 +629,21 @@ bool rxvt_color::set (rxvt_screen *screen, const char *name) { - rxvt_rgba c; + rgba c; char eos; int skip; + // parse the nonstandard "[alphapercent]" prefix if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) { - printf ("X %d\n", c.a); - c.a = lerp (0, rxvt_rgba::MAX_CC, c.a); + c.a = lerp (0, rgba::MAX_CC, c.a); name += skip; - printf ("y %04x\n", c.a); } else - c.a = rxvt_rgba::MAX_CC; + c.a = rgba::MAX_CC; - // 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)) + // 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; @@ -674,7 +667,7 @@ } bool -rxvt_color::set (rxvt_screen *screen, const rxvt_rgba &color) +rxvt_color::set (rxvt_screen *screen, const rgba &color) { bool got = alloc (screen, color); @@ -690,6 +683,8 @@ 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; @@ -711,7 +706,7 @@ //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, rxvt_rgba (best->red, best->green, best->blue)); + got = alloc (screen, rgba (best->red, best->green, best->blue)); delete colors; } @@ -721,7 +716,7 @@ } void -rxvt_color::get (rxvt_screen *screen, rxvt_rgba &color) +rxvt_color::get (rgba &color) { #if XFT color.r = c.color.red; @@ -729,37 +724,44 @@ color.b = c.color.blue; color.a = c.color.alpha; #else - XColor c; - - c.pixel = p; - XQueryColor (screen->xdisp, screen->cmap, &c); - color.r = c.red; color.g = c.green; color.b = c.blue; - color.a = rxvt_rgba::MAX_CC; + color.a = rgba::MAX_CC; #endif } +void +rxvt_color::get (XColor &color) +{ + rgba c; + get (c); + + color.red = c.r; + color.green = c.g; + color.blue = c.b; + color.pixel = (Pixel)*this; +} + void rxvt_color::free (rxvt_screen *screen) { #if XFT XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); #else - XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); + XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); #endif } void -rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rxvt_rgba &to) +rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) { - rxvt_rgba c; - get (screen, c); + rgba c; + get (c); result.set ( screen, - rxvt_rgba ( + rgba ( lerp (c.r, to.r, percent), lerp (c.g, to.g, percent), lerp (c.b, to.b, percent),