--- rxvt-unicode/src/rxvttoolkit.C 2006/01/25 02:42:06 1.25 +++ rxvt-unicode/src/rxvttoolkit.C 2006/01/29 20:51:28 1.28 @@ -179,6 +179,43 @@ ///////////////////////////////////////////////////////////////////////////// +void +rxvt_screen::set (rxvt_display *disp) +{ + display = disp; + xdisp = disp->display; + + Screen *screen = ScreenOfDisplay (xdisp, disp->screen); + + depth = DefaultDepthOfScreen (screen); + visual = DefaultVisualOfScreen (screen); + cmap = DefaultColormapOfScreen (screen); +} + +void +rxvt_screen::set (rxvt_display *disp, int bitdepth) +{ + set (disp); + + XVisualInfo vinfo; + + if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo)) + { + depth = bitdepth; + visual = vinfo.visual; + cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); + } +} + +void +rxvt_screen::clear () +{ + if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) + XFreeColormap (xdisp, cmap); +} + +///////////////////////////////////////////////////////////////////////////// + rxvt_display::rxvt_display (const char *id) : refcounted (id) , x_ev (this, &rxvt_display::x_cb) @@ -289,9 +326,6 @@ screen = DefaultScreen (display); root = DefaultRootWindow (display); - visual = DefaultVisual (display, screen); - cmap = DefaultColormap (display, screen); - depth = DefaultDepth (display, screen); assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); @@ -309,25 +343,6 @@ XUnloadFont (display, f); #endif -#ifdef PREFER_24BIT - /* - * If depth is not 24, look for a 24bit visual. - */ - if (depth != 24) - { - XVisualInfo vinfo; - - if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo)) - { - depth = 24; - visual = vinfo.visual; - cmap = XCreateColormap (display, - RootWindow (display, screen), - visual, AllocNone); - } - } -#endif - int fd = XConnectionNumber (display); #ifndef NO_SLOW_LINK_SUPPORT @@ -521,134 +536,130 @@ ///////////////////////////////////////////////////////////////////////////// bool -rxvt_color::set (rxvt_display *display, Pixel p) +rxvt_color::set (rxvt_screen *screen, const char *name) { #if XFT - XColor xc; - - xc.pixel = p; - if (!XQueryColor (display->display, display->cmap, &xc)) - return false; - - XRenderColor d; - - 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); -#else - this->p = p; -#endif - - return true; -} + 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 = 0x1111; + else if (l == 1+4*2 && 4 == sscanf (name, "#%2hx%2hx%2hx%2hx%c", &r.a, &r.r, &r.g, &r.b, &eos)) + mult = 0x0101; + else if (l == 1+4*4 && 4 == sscanf (name, "#%4hx%4hx%4hx%4hx%c", &r.a, &r.r, &r.g, &r.b, &eos)) + mult = 0x0001; + else + return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); -bool -rxvt_color::set (rxvt_display *display, const char *name) -{ -#if XFT - return XftColorAllocName (display->display, display->visual, display->cmap, - name, &c); + r.r *= mult; r.g *= mult; r.b *= mult; r.a *= mult; + return set (screen, r); #else XColor xc; - if (XParseColor (display->display, display->cmap, name, &xc)) - return set (display, xc.red, xc.green, xc.blue); + 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_display *display, unsigned short cr, unsigned short cg, unsigned short cb) +rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba) { +#if XFT + 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); +#else XColor xc; - xc.red = cr; - xc.green = cg; - xc.blue = cb; + xc.red = rgba.r; + xc.green = rgba.g; + xc.blue = rgba.b; xc.flags = DoRed | DoGreen | DoBlue; - if (XAllocColor (display->display, display->cmap, &xc)) - return set (display, xc.pixel); + if (XAllocColor (screen->xdisp, screen->cmap, &xc)) + { + p = xc.pixel; + return true; + } return false; +#endif } void -rxvt_color::get (rxvt_display *display, 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 (display->display, display->cmap, &c); + 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 } void -rxvt_color::free (rxvt_display *display) +rxvt_color::free (rxvt_screen *screen) { #if XFT - XftColorFree (display->display, display->visual, display->cmap, &c); + XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); #else - XFreeColors (display->display, display->cmap, &p, 1, AllPlanes); + XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); #endif } rxvt_color -rxvt_color::fade (rxvt_display *display, int percent) +rxvt_color::fade (rxvt_screen *screen, int percent) { - percent = 100 - percent; - - unsigned short cr, cg, cb; rxvt_color faded; - get (display, cr, cg, cb); + rxvt_rgba c; + get (screen, c); - faded.set ( - display, - 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_display *display, int percent, rxvt_color &fadeto) +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 (display, cr, cg, cb); - fadeto.get(display, fcr, fcg, fcb); + get (screen, c); + fadeto.get (screen, fc); faded.set ( - display, - LERP (cr, fcr, percent), - LERP (cg, fcg, percent), - LERP (cb, fcb, percent) + 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) + ) ); return faded;