--- rxvt-unicode/src/background.C 2010/10/18 11:00:38 1.87 +++ rxvt-unicode/src/background.C 2010/10/20 09:04:55 1.94 @@ -1009,15 +1009,15 @@ flags |= blurNeeded; #if XFT - XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); - if (filters) - { - for (int i = 0; i < filters->nfilter; i++) - if (!strcmp (filters->filter[i], FilterConvolution)) - flags |= bgPixmap_t::blurServerSide; + XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); + if (filters) + { + for (int i = 0; i < filters->nfilter; i++) + if (!strcmp (filters->filter[i], FilterConvolution)) + flags |= bgPixmap_t::blurServerSide; - XFree (filters); - } + XFree (filters); + } #endif return (changed > 0); @@ -1119,22 +1119,22 @@ static void get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) { - double sigma = radius / 2.0; - double scale = sqrt (2.0 * M_PI) * sigma; - double sum = 0.0; + double sigma = radius / 2.0; + double scale = sqrt (2.0 * M_PI) * sigma; + double sum = 0.0; - for (int i = 0; i < width; i++) - { - double x = i - width / 2; - kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; - sum += kernel[i]; - } + for (int i = 0; i < width; i++) + { + double x = i - width / 2; + kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; + sum += kernel[i]; + } - params[0] = XDoubleToFixed (width); - params[1] = XDoubleToFixed (1); + params[0] = XDoubleToFixed (width); + params[1] = XDoubleToFixed (1); - for (int i = 0; i < width; i++) - params[i+2] = XDoubleToFixed (kernel[i] / sum); + for (int i = 0; i < width; i++) + params[i+2] = XDoubleToFixed (kernel[i] / sum); } #endif @@ -1149,7 +1149,7 @@ Display *dpy = target->dpy; XRenderPictureAttributes pa; - XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); + XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); @@ -1377,12 +1377,12 @@ { if (flags & (blurNeeded | blurServerSide)) { - if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) + if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) result |= transpPmapBlurred; } if (flags & (tintNeeded | tintServerSide)) { - if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) + if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) result |= transpPmapTinted; } } /* server side rendering completed */ @@ -1419,7 +1419,7 @@ # endif /* ENABLE_TRANSPARENCY */ # ifndef HAVE_AFTERIMAGE -static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); +static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); # endif bool @@ -1473,7 +1473,7 @@ rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); if (flags & tintSet) tint.get (c); - ShadeXImage (target, result, shade, c.r, c.g, c.b); + ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); } # endif @@ -1615,19 +1615,16 @@ #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT /* taken from aterm-0.4.2 */ -typedef uint32_t RUINT32T; - static void -ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) +ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) { int sh_r, sh_g, sh_b; - RUINT32T mask_r, mask_g, mask_b; - RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; + uint32_t mask_r, mask_g, mask_b; + uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; unsigned int lower_lim_r, lower_lim_g, lower_lim_b; unsigned int upper_lim_r, upper_lim_g, upper_lim_b; int i; - - Visual *visual = term->visual; + int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; @@ -1637,14 +1634,14 @@ mask_b = visual->blue_mask; /* boring lookup table pre-initialization */ - switch (srcImage->bits_per_pixel) + switch (srcImage->depth) { case 15: if ((mask_r != 0x7c00) || (mask_g != 0x03e0) || (mask_b != 0x001f)) return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); lookup_r = lookup; lookup_g = lookup+32; lookup_b = lookup+32+32; @@ -1657,7 +1654,7 @@ (mask_g != 0x07e0) || (mask_b != 0x001f)) return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32)); lookup_r = lookup; lookup_g = lookup+32; lookup_b = lookup+32+64; @@ -1670,7 +1667,7 @@ (mask_g != 0x00ff00) || (mask_b != 0x0000ff)) return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256)); lookup_r = lookup; lookup_g = lookup+256; lookup_b = lookup+256+256; @@ -1683,7 +1680,7 @@ (mask_g != 0x00ff00) || (mask_b != 0x0000ff)) return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256)); lookup_r = lookup; lookup_g = lookup+256; lookup_b = lookup+256+256; @@ -1704,9 +1701,9 @@ lower_lim_g = 65535-gm; lower_lim_b = 65535-bm; - lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); - lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); - lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); + lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); + lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); + lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); upper_lim_r = upper_lim_g = upper_lim_b = 65535; } @@ -1715,130 +1712,69 @@ lower_lim_r = lower_lim_g = lower_lim_b = 0; - upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); - upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); - upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); - } - - /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ - if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000)) - { - unsigned int tmp; - - tmp = lower_lim_r; - lower_lim_r = lower_lim_b; - lower_lim_b = tmp; - - tmp = upper_lim_r; - upper_lim_r = upper_lim_b; - upper_lim_b = tmp; + upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100); + upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100); + upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100); } /* fill our lookup tables */ for (i = 0; i <= mask_r>>sh_r; i++) { - RUINT32T tmp; - tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); - tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); + uint32_t tmp; + tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); + tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); lookup_r[i] = (tmp/65535)<>sh_g; i++) { - RUINT32T tmp; - tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); - tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); + uint32_t tmp; + tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); + tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); lookup_g[i] = (tmp/65535)<>sh_b; i++) { - RUINT32T tmp; - tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); - tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); + uint32_t tmp; + tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); + tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); lookup_b[i] = (tmp/65535)<bits_per_pixel) - { - case 15: - { - unsigned short *p1, *pf, *p, *pl; - p1 = (unsigned short *) srcImage->data; - pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) - { - *p = lookup_r[(*p & 0x7c00)>>10] | - lookup_g[(*p & 0x03e0)>> 5] | - lookup_b[(*p & 0x001f)]; - } - p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); - } - break; - } - case 16: - { - unsigned short *p1, *pf, *p, *pl; - p1 = (unsigned short *) srcImage->data; - pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) - { - *p = lookup_r[(*p & 0xf800)>>11] | - lookup_g[(*p & 0x07e0)>> 5] | - lookup_b[(*p & 0x001f)]; - } - p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); - } - break; - } - case 24: - { - unsigned char *p1, *pf, *p, *pl; - p1 = (unsigned char *) srcImage->data; - pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width * 3; - for (; p < pl; p += 3) - { - p[0] = lookup_r[(p[0] & 0xff0000)>>16]; - p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; - p[2] = lookup_r[(p[2] & 0x0000ff)]; - } - p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); + if (srcImage->bits_per_pixel == 32 + && (srcImage->depth == 24 || srcImage->depth == 32) + && srcImage->byte_order == host_byte_order) + { + uint32_t *p1, *pf, *p, *pl; + p1 = (uint32_t *) srcImage->data; + pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + + while (p1 < pf) + { + p = p1; + pl = p1 + srcImage->width; + for (; p < pl; p++) + { + *p = lookup_r[(*p & 0xff0000) >> 16] | + lookup_g[(*p & 0x00ff00) >> 8] | + lookup_b[(*p & 0x0000ff)] | + (*p & 0xff000000); } - break; - } - case 32: - { - RUINT32T *p1, *pf, *p, *pl; - p1 = (RUINT32T *) srcImage->data; - pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); - - while (p1 < pf) - { - p = p1; - pl = p1 + srcImage->width; - for (; p < pl; p++) - { - *p = lookup_r[(*p & 0xff0000)>>16] | - lookup_g[(*p & 0x00ff00)>> 8] | - lookup_b[(*p & 0x0000ff)] | - (*p & ~0xffffff); - } - p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); - } - break; + p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); } } + else + { + for (int y = 0; y < srcImage->height; y++) + for (int x = 0; x < srcImage->width; x++) + { + unsigned long pixel = XGetPixel (srcImage, x, y); + pixel = lookup_r[(pixel & mask_r) >> sh_r] | + lookup_g[(pixel & mask_g) >> sh_g] | + lookup_b[(pixel & mask_b) >> sh_b]; + XPutPixel (srcImage, x, y, pixel); + } + } free (lookup); }