--- rxvt-unicode/src/background.C 2010/10/16 20:25:06 1.84 +++ rxvt-unicode/src/background.C 2010/10/30 23:15:14 1.100 @@ -224,7 +224,7 @@ if (align >= 0 && align <= 100) return diff * align / 100; - else if (align > 100 && align <= 200 ) + else if (align > 100 && align <= 200) return ((align - 100) * smaller / 100) + window_size - smaller; else if (align >= -100 && align < 0) return ((align + 100) * smaller / 100) - image_size; @@ -430,8 +430,6 @@ changed++; } - //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", - // flags, h_scale, v_scale, h_align, v_align); return (changed > 0); } @@ -470,8 +468,8 @@ } flags &= ~sizeSensitive; - if (h_scale != 0 || v_scale != 0 - || h_align != 0 || v_align != 0 + if ((flags & propScale) || h_scale || v_scale + || (!(flags & rootAlign) && (h_align || v_align)) || w > target_width || h > target_height) flags |= sizeSensitive; } @@ -532,8 +530,6 @@ int w = 0; int h = 0; - TIMING_TEST_START (asim); - if (original_asim) get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); @@ -659,7 +655,6 @@ free (layers); } } - TIMING_TEST_PRINT_RESULT (asim); bool ret = false; @@ -715,7 +710,6 @@ destroy_asimage (&result); XFreeGC (target->dpy, gc); - TIMING_TEST_PRINT_RESULT (asim); ret = true; } @@ -1009,15 +1003,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 +1113,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 +1143,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); @@ -1285,9 +1279,6 @@ XRenderFreePicture (dpy, mask_pic); XRenderFreePicture (dpy, overlay_pic); XRenderFreePicture (dpy, back_pic); -# if DO_TIMING_TEST - XSync (dpy, False); -# endif # endif } @@ -1295,8 +1286,8 @@ } /* make_transparency_pixmap() - * Builds a pixmap sized the same as terminal window, with depth same as the root window - * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by + * Builds a pixmap of the same size as the terminal window that contains + * the tiled portion of the root pixmap that is supposed to be covered by * our window. */ unsigned long @@ -1315,14 +1306,12 @@ Display *dpy = target->dpy; int root_width = DisplayWidth (dpy, screen); int root_height = DisplayHeight (dpy, screen); - unsigned int root_pmap_width, root_pmap_height; int window_width = target->szHint.width; int window_height = target->szHint.height; int sx, sy; XGCValues gcv; GC gc; - TIMING_TEST_START (tp); target->get_window_origin (sx, sy); /* check if we are outside of the visible part of the virtual screen : */ @@ -1330,20 +1319,6 @@ || sx >= root_width || sy >= root_height) return 0; - if (root_pixmap != None) - { - /* we want to validate the pixmap and get its size at the same time : */ - int junk; - unsigned int ujunk; - /* root pixmap may be bad - allow a error */ - target->allowedxerror = -1; - - if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) - root_pixmap = None; - - target->allowedxerror = 0; - } - if (root_pixmap == None) return 0; @@ -1369,7 +1344,6 @@ result |= transpPmapTiled; XFreeGC (dpy, gc); } - TIMING_TEST_PRINT_RESULT (tp); if (tiled_root_pmap != None) { @@ -1377,12 +1351,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 */ @@ -1396,30 +1370,38 @@ pmap_depth = root_depth; } - TIMING_TEST_PRINT_RESULT (tp); - return result; } -bool +void bgPixmap_t::set_root_pixmap () { Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); if (new_root_pixmap == None) new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); - if (new_root_pixmap != root_pixmap) + root_pixmap = new_root_pixmap; + + // validate root pixmap + if (root_pixmap != None) { - root_pixmap = new_root_pixmap; - return true; - } + unsigned int width, height; + Window wdummy; + int idummy; + unsigned int udummy; - return false; + target->allowedxerror = -1; + + if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy)) + root_pixmap = None; + + target->allowedxerror = 0; + } } # 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 @@ -1430,8 +1412,6 @@ if (target == NULL) return false; - TIMING_TEST_START (tp); - invalidate (); # ifdef ENABLE_TRANSPARENCY if (flags & isTransparent) @@ -1466,14 +1446,12 @@ { # if !defined(HAVE_AFTERIMAGE) && !XFT /* our own client-side tinting */ - /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. - This may need to be changed in need_client_side_rendering() logic is altered !!! */ if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) { 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 @@ -1529,11 +1507,8 @@ apply (); - XSync (target->dpy, False); valid_since = ev::now (); - TIMING_TEST_PRINT_RESULT (tp); - return true; } @@ -1558,8 +1533,6 @@ { if (target) { - flags &= ~isVtOrigin; - if (pixmap != None) { /* set target's background to pixmap */ @@ -1575,7 +1548,6 @@ else # endif { - flags |= isVtOrigin; /* force old pixmap dereference in case it was transparent before :*/ XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); @@ -1615,21 +1587,18 @@ #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; + int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; - Visual *visual = term->visual; - - if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; + if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; /* for convenience */ mask_r = visual->red_mask; @@ -1637,204 +1606,147 @@ mask_b = visual->blue_mask; /* boring lookup table pre-initialization */ - switch (srcImage->bits_per_pixel) { - case 15: - if ((mask_r != 0x7c00) || - (mask_g != 0x03e0) || - (mask_b != 0x001f)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); + switch (srcImage->depth) + { + case 15: + if ((mask_r != 0x7c00) || + (mask_g != 0x03e0) || + (mask_b != 0x001f)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); lookup_r = lookup; lookup_g = lookup+32; lookup_b = lookup+32+32; sh_r = 10; sh_g = 5; sh_b = 0; - break; - case 16: - if ((mask_r != 0xf800) || - (mask_g != 0x07e0) || - (mask_b != 0x001f)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); + break; + case 16: + if ((mask_r != 0xf800) || + (mask_g != 0x07e0) || + (mask_b != 0x001f)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32)); lookup_r = lookup; lookup_g = lookup+32; lookup_b = lookup+32+64; sh_r = 11; sh_g = 5; sh_b = 0; - break; - case 24: - if ((mask_r != 0xff0000) || - (mask_g != 0x00ff00) || - (mask_b != 0x0000ff)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); + break; + case 24: + if ((mask_r != 0xff0000) || + (mask_g != 0x00ff00) || + (mask_b != 0x0000ff)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256)); lookup_r = lookup; lookup_g = lookup+256; lookup_b = lookup+256+256; sh_r = 16; sh_g = 8; sh_b = 0; - break; - case 32: - if ((mask_r != 0xff0000) || - (mask_g != 0x00ff00) || - (mask_b != 0x0000ff)) - return; - lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); + break; + case 32: + if ((mask_r != 0xff0000) || + (mask_g != 0x00ff00) || + (mask_b != 0x0000ff)) + return; + lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256)); lookup_r = lookup; lookup_g = lookup+256; lookup_b = lookup+256+256; sh_r = 16; sh_g = 8; sh_b = 0; - break; - default: - return; /* we do not support this color depth */ - } + break; + default: + return; /* we do not support this color depth */ + } /* prepare limits for color transformation (each channel is handled separately) */ - if (shade > 100) { - shade = 200 - shade; + if (shade > 100) + { + shade = 200 - shade; - lower_lim_r = 65535-rm; - 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); - - upper_lim_r = upper_lim_g = upper_lim_b = 65535; - } else { - - 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; - } + lower_lim_r = 65535-rm; + lower_lim_g = 65535-gm; + lower_lim_b = 65535-bm; - /* 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); - 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); - 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); - 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; + upper_lim_r = upper_lim_g = upper_lim_b = 65535; } - case 16: + else { - 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; + + lower_lim_r = lower_lim_g = lower_lim_b = 0; + + 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); } - case 24: + + /* fill our lookup tables */ + for (i = 0; i <= mask_r>>sh_r; i++) { - 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); - } - break; + 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 *p1, *pf, *p, *pl; - p1 = (RUINT32T *) srcImage->data; - pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); + 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++) + { + 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 == 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 & ~0xffffff); + { + 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); + } + p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); } - p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); - } - break; } - } + 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); }