ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.154 by sf-exg, Mon May 9 16:35:37 2011 UTC vs.
Revision 1.192 by sf-exg, Fri Dec 30 12:45:56 2011 UTC

… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 * auto Same as 100x100+50+50
61 */
62
63#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
38# if XRENDER
39static Picture
40create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
41{
42 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
43
44 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
45 XRenderPictureAttributes pa;
46 pa.repeat = True;
47 pa.component_alpha = component_alpha;
48 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
49
50 XFreePixmap (dpy, pixmap);
51
52 return mask;
53}
54# endif
55
64void 56void
65rxvt_term::bg_destroy () 57rxvt_term::bg_destroy ()
66{ 58{
67#ifdef HAVE_AFTERIMAGE 59#ifdef HAVE_AFTERIMAGE
68 if (original_asim) 60 if (original_asim)
… …
176 int smaller = min (image_size, window_size); 168 int smaller = min (image_size, window_size);
177 169
178 if (align >= 0 && align <= 100) 170 if (align >= 0 && align <= 100)
179 return diff * align / 100; 171 return diff * align / 100;
180 else if (align > 100 && align <= 200) 172 else if (align > 100 && align <= 200)
181 return ((align - 100) * smaller / 100) + window_size - smaller; 173 return (align - 100) * smaller / 100 + window_size - smaller;
182 else if (align >= -100 && align < 0) 174 else if (align >= -100 && align < 0)
183 return ((align + 100) * smaller / 100) - image_size; 175 return (align + 100) * smaller / 100 - image_size;
184 return 0; 176 return 0;
185} 177}
186 178
187static inline int 179static inline int
188make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
207{ 199{
208 bool changed = false; 200 bool changed = false;
209 int geom_flags = 0; 201 int geom_flags = 0;
210 int x = 0, y = 0; 202 int x = 0, y = 0;
211 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
212 unsigned int n; 204 unsigned long new_flags = 0;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
214 const char *ops;
215 205
216 if (geom == NULL) 206 if (geom == NULL)
217 return false; 207 return false;
218 208
219 char str[256]; 209 if (geom[0])
220
221 ops = strchr (geom, ':');
222 if (ops == NULL)
223 n = strlen (geom);
224 else
225 n = ops - geom;
226
227 if (n >= sizeof (str))
228 return false;
229
230 memcpy (str, geom, n);
231 str[n] = '\0';
232 rxvt_strtrim (str);
233
234 if (str[0])
235 { 210 {
236 /* we have geometry string - let's handle it prior to applying ops */ 211 char **arr = rxvt_strsplit (':', geom);
212
213 for (int i = 0; arr[i]; i++)
214 {
215 if (!strcasecmp (arr[i], "style=tiled"))
216 {
217 new_flags = BG_TILE;
218 w = h = noScale;
219 x = y = 0;
220 geom_flags = WidthValue|HeightValue|XValue|YValue;
221 }
222 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
223 {
224 new_flags = BG_KEEP_ASPECT;
225 w = h = windowScale;
226 x = y = centerAlign;
227 geom_flags = WidthValue|HeightValue|XValue|YValue;
228 }
229 else if (!strcasecmp (arr[i], "style=stretched"))
230 {
231 new_flags = 0;
232 w = h = windowScale;
233 geom_flags = WidthValue|HeightValue;
234 }
235 else if (!strcasecmp (arr[i], "style=centered"))
236 {
237 new_flags = 0;
238 w = h = noScale;
239 x = y = centerAlign;
240 geom_flags = WidthValue|HeightValue|XValue|YValue;
241 }
242 else if (!strcasecmp (arr[i], "style=root-tiled"))
243 {
244 new_flags = BG_TILE|BG_ROOT_ALIGN;
245 w = h = noScale;
246 geom_flags = WidthValue|HeightValue;
247 }
248 else if (!strcasecmp (arr[i], "op=tile"))
249 new_flags |= BG_TILE;
250 else if (!strcasecmp (arr[i], "op=keep-aspect"))
251 new_flags |= BG_KEEP_ASPECT;
252 else if (!strcasecmp (arr[i], "op=root-align"))
253 new_flags |= BG_ROOT_ALIGN;
254
255 // deprecated
256 else if (!strcasecmp (arr[i], "tile"))
257 {
258 new_flags |= BG_TILE;
259 w = h = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "propscale"))
263 {
264 new_flags |= BG_KEEP_ASPECT;
265 w = h = windowScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "hscale"))
269 {
270 new_flags |= BG_TILE;
271 w = windowScale;
272 h = noScale;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (!strcasecmp (arr[i], "vscale"))
276 {
277 new_flags |= BG_TILE;
278 h = windowScale;
279 w = noScale;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (!strcasecmp (arr[i], "scale"))
283 {
284 w = h = windowScale;
285 geom_flags |= WidthValue|HeightValue;
286 }
287 else if (!strcasecmp (arr[i], "auto"))
288 {
289 w = h = windowScale;
290 x = y = centerAlign;
291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
293 else if (!strcasecmp (arr[i], "root"))
294 {
295 new_flags |= BG_TILE|BG_ROOT_ALIGN;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299
300 else
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 302 } /* done parsing ops */
303
304 rxvt_free_strsplit (arr);
305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
239 308
240 if (!update) 309 if (!update)
241 { 310 {
242 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 312 x = y = defaultAlign;
… …
252 w = h; 321 w = h;
253 322
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 324 }
256 325
257 if (ops)
258 {
259 char **arr = rxvt_strsplit (':', ops + 1);
260
261 for (int i = 0; arr[i]; i++)
262 {
263 if (!strcasecmp (arr[i], "tile"))
264 {
265 w = h = noScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "propscale"))
269 {
270 new_flags |= BG_PROP_SCALE;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 if (w == 0) w = windowScale;
275
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 if (h == 0) h = windowScale;
282
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 if (h == 0) h = windowScale;
289 if (w == 0) w = windowScale;
290
291 geom_flags |= WidthValue|HeightValue;
292 }
293 else if (!strcasecmp (arr[i], "auto"))
294 {
295 w = h = windowScale;
296 x = y = centerAlign;
297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
299 else if (!strcasecmp (arr[i], "root"))
300 {
301 new_flags |= BG_ROOT_ALIGN;
302 w = h = noScale;
303 geom_flags |= WidthValue|HeightValue;
304 }
305 } /* done parsing ops */
306
307 rxvt_free_strsplit (arr);
308 }
309
310 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
311 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
312 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
313 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
314 330
… …
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 341rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 342{
327 int target_width = szHint.width; 343 int target_width = szHint.width;
328 int target_height = szHint.height; 344 int target_height = szHint.height;
329 345
346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
330 if (bg_flags & BG_PROP_SCALE) 349 if (bg_flags & BG_KEEP_ASPECT)
331 { 350 {
332 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
336 } 355 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 356
343 if (!w) w = image_width; 357 if (!w) w = image_width;
344 if (!h) h = image_height; 358 if (!h) h = image_height;
345 359
346 if (bg_flags & BG_ROOT_ALIGN) 360 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 367 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
355 } 369 }
356 370
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 372 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 377}
363 378
… …
377 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
378 { 393 {
379 ShadingInfo as_shade; 394 ShadingInfo as_shade;
380 as_shade.shading = shade; 395 as_shade.shading = shade;
381 396
382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
383 if (bg_flags & BG_TINT_SET)
384 tint.get (c); 398 tint.get (c);
385 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
386 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
387 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
388 402
389 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
390 } 404 }
391 405
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 407 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 408 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 411 if (tmp)
398 { 412 {
399 destroy_asimage (&background); 413 destroy_asimage (&background);
400 background = tmp; 414 background = tmp;
… …
419 433
420 if (!original_asim 434 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 435 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 436 && (x >= target_width
423 || y >= target_height 437 || y >= target_height
424 || (x + w <= 0) 438 || x + w <= 0
425 || (y + h <= 0)))) 439 || y + h <= 0)))
426 { 440 {
427 if (background) 441 if (background)
428 { 442 {
429 new_pmap_width = background->width; 443 new_pmap_width = background->width;
430 new_pmap_height = background->height; 444 new_pmap_height = background->height;
… …
444 } 458 }
445 else 459 else
446 { 460 {
447 result = original_asim; 461 result = original_asim;
448 462
449 if ((w != original_asim->width) 463 if (w != original_asim->width
450 || (h != original_asim->height)) 464 || h != original_asim->height)
451 { 465 {
452 result = scale_asimage (asv, original_asim, 466 result = scale_asimage (asv, original_asim,
453 w, h, 467 w, h,
454 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
456 } 470 }
457 471
458 if (background == NULL) 472 if (background == NULL)
459 { 473 {
460 if (h_scale == 0 || v_scale == 0) 474 if (bg_flags & BG_TILE)
461 { 475 {
462 /* if tiling - pixmap has to be sized exactly as the image, 476 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 477 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 478 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 479 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 504 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 505 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 506 layers[0].tint = background_tint;
493 layers[1].im = result; 507 layers[1].im = result;
494 508
495 if (h_scale == 0 || v_scale == 0) 509 if (bg_flags & BG_TILE)
496 { 510 {
497 /* tile horizontally */ 511 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 512 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 513 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 514 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 518 /* clip horizontally */
505 layers[1].dst_x = x; 519 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 520 layers[1].clip_width = result->width;
507 } 521 }
508 522
509 if (h_scale == 0 || v_scale == 0) 523 if (bg_flags & BG_TILE)
510 { 524 {
511 while (y > 0) y -= (int)result->height; 525 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 526 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 527 layers[1].clip_height = result->height + target_height;
514 } 528 }
… …
564 578
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 579 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 580 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 581 if (background == NULL)
568 { 582 {
569 if (!(h_scale == 0 || v_scale == 0)) 583 if (!(bg_flags & BG_TILE))
570 { 584 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 585 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
572 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 586 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 587 }
574 588
… …
620 else if (depth == 15 || depth == 16) 634 else if (depth == 15 || depth == 16)
621 bytes_per_pixel = 2; 635 bytes_per_pixel = 2;
622 else 636 else
623 return false; 637 return false;
624 638
625 width_r = rxvt_popcount (visual->red_mask); 639 width_r = ecb_popcount32 (visual->red_mask);
626 width_g = rxvt_popcount (visual->green_mask); 640 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = rxvt_popcount (visual->blue_mask); 641 width_b = ecb_popcount32 (visual->blue_mask);
628 642
629 if (width_r > 8 || width_g > 8 || width_b > 8) 643 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false; 644 return false;
631 645
632 sh_r = rxvt_ctz (visual->red_mask); 646 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = rxvt_ctz (visual->green_mask); 647 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = rxvt_ctz (visual->blue_mask); 648 sh_b = ecb_ctz32 (visual->blue_mask);
635 649
636 if (width > INT_MAX / height / bytes_per_pixel) 650 if (width > INT_MAX / height / bytes_per_pixel)
637 return false; 651 return false;
638 652
639 data = (char *)malloc (width * height * bytes_per_pixel); 653 data = (char *)malloc (width * height * bytes_per_pixel);
… …
646 { 660 {
647 free (data); 661 free (data);
648 return false; 662 return false;
649 } 663 }
650 664
651 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 665 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
652 666
653 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 667 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
654 channels = gdk_pixbuf_get_n_channels (pixbuf); 668 channels = gdk_pixbuf_get_n_channels (pixbuf);
655 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 669 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
656 line = data; 670 line = data;
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
710 724
711 if (!(bg_flags & BG_ROOT_ALIGN) 725 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 726 && (x >= target_width
713 || y >= target_height 727 || y >= target_height
714 || (x + w <= 0) 728 || x + w <= 0
715 || (y + h <= 0))) 729 || y + h <= 0))
716 return false; 730 return false;
717 731
718 result = pixbuf; 732 result = pixbuf;
719 733
720 if ((w != image_width) 734 if (w != image_width
721 || (h != image_height)) 735 || h != image_height)
722 { 736 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 738 w, h,
725 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
726 } 740 }
… …
742 root_pmap = bg_pixmap; 756 root_pmap = bg_pixmap;
743 bg_pixmap = None; 757 bg_pixmap = None;
744 } 758 }
745 else 759 else
746 { 760 {
747 if (h_scale == 0 || v_scale == 0) 761 if (bg_flags & BG_TILE)
748 { 762 {
749 new_pmap_width = min (image_width, target_width); 763 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 764 new_pmap_height = min (image_height, target_height);
751 } 765 }
752 } 766 }
… …
765 gcv.foreground = pix_colors[Color_bg]; 779 gcv.foreground = pix_colors[Color_bg];
766 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 780 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
767 781
768 if (gc) 782 if (gc)
769 { 783 {
770 if (h_scale == 0 || v_scale == 0) 784 if (bg_flags & BG_TILE)
771 { 785 {
772 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 786 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
773 pixbuf_to_pixmap (result, tile, gc, 787 pixbuf_to_pixmap (result, tile, gc,
774 0, 0, 788 0, 0,
775 0, 0, 789 0, 0,
… …
805 } 819 }
806 820
807#if XRENDER 821#if XRENDER
808 if (tr_flags) 822 if (tr_flags)
809 { 823 {
810 XRenderPictureAttributes pa;
811
812 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825
813 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
814 827
815 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
816 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 828 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
817 829
818 pa.repeat = True; 830 Picture mask = create_xrender_mask (dpy, vt, False, False);
819 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
820 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
821 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
822 XFreePixmap (dpy, mask_pmap);
823 831
824 XRenderColor mask_c; 832 XRenderColor mask_c;
825 833
826 mask_c.alpha = 0x8000; 834 mask_c.alpha = 0x8000;
827 mask_c.red = 0; 835 mask_c.red =
828 mask_c.green = 0; 836 mask_c.green =
829 mask_c.blue = 0; 837 mask_c.blue = 0;
830 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839
831 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 840 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
832 841
833 XRenderFreePicture (dpy, src); 842 XRenderFreePicture (dpy, src);
834 XRenderFreePicture (dpy, dst); 843 XRenderFreePicture (dpy, dst);
835 XRenderFreePicture (dpy, mask); 844 XRenderFreePicture (dpy, mask);
… …
855rxvt_term::bg_set_file (const char *file) 864rxvt_term::bg_set_file (const char *file)
856{ 865{
857 if (!file || !*file) 866 if (!file || !*file)
858 return false; 867 return false;
859 868
869 bool ret = false;
860 if (const char *p = strchr (file, ';')) 870 const char *p = strchr (file, ';');
871
872 if (p)
861 { 873 {
862 size_t len = p - file; 874 size_t len = p - file;
863 char *f = rxvt_temp_buf<char> (len + 1); 875 char *f = rxvt_temp_buf<char> (len + 1);
864 memcpy (f, file, len); 876 memcpy (f, file, len);
865 f[len] = '\0'; 877 f[len] = '\0';
… …
874 { 886 {
875 if (original_asim) 887 if (original_asim)
876 safe_asimage_destroy (original_asim); 888 safe_asimage_destroy (original_asim);
877 original_asim = image; 889 original_asim = image;
878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
879 return true; 891 ret = true;
880 } 892 }
881# endif 893# endif
882 894
883# ifdef HAVE_PIXBUF 895# ifdef HAVE_PIXBUF
884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
886 { 898 {
887 if (pixbuf) 899 if (pixbuf)
888 g_object_unref (pixbuf); 900 g_object_unref (pixbuf);
889 pixbuf = image; 901 pixbuf = image;
890 bg_flags |= BG_IS_FROM_FILE; 902 bg_flags |= BG_IS_FROM_FILE;
891 return true; 903 ret = true;
892 } 904 }
893# endif 905# endif
894 906
907 if (ret)
908 {
909 if (p)
910 bg_set_geometry (p + 1);
911 else
912 bg_set_default_geometry ();
913 }
914
895 return false; 915 return ret;
896} 916}
897 917
898# endif /* BG_IMAGE_FROM_FILE */ 918# endif /* BG_IMAGE_FROM_FILE */
899 919
900# ifdef ENABLE_TRANSPARENCY 920# ifdef ENABLE_TRANSPARENCY
… …
947} 967}
948 968
949void 969void
950rxvt_term::set_tint_shade_flags () 970rxvt_term::set_tint_shade_flags ()
951{ 971{
952 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 972 rgba c;
953 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
954 974
955 bg_flags &= ~BG_TINT_FLAGS; 975 bg_flags &= ~BG_TINT_FLAGS;
956 976
957 if (bg_flags & BG_TINT_SET)
958 {
959 tint.get (c); 977 tint.get (c);
978
960 if (!has_shade 979 if (!has_shade
961 && (c.r <= 0x00ff || c.r >= 0xff00) 980 && (c.r <= 0x00ff || c.r >= 0xff00)
962 && (c.g <= 0x00ff || c.g >= 0xff00) 981 && (c.g <= 0x00ff || c.g >= 0xff00)
963 && (c.b <= 0x00ff || c.b >= 0xff00)) 982 && (c.b <= 0x00ff || c.b >= 0xff00))
964 bg_flags |= BG_TINT_BITAND; 983 bg_flags |= BG_TINT_BITAND;
965 }
966 984
967 if (has_shade || (bg_flags & BG_TINT_SET)) 985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
968 bg_flags |= BG_NEEDS_TINT; 989 bg_flags |= BG_NEEDS_TINT;
969} 990}
970 991
971bool 992bool
972rxvt_term::bg_set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
973{ 994{
974 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 995 if (tint != new_tint)
975 { 996 {
976 tint = new_tint; 997 tint = new_tint;
977 bg_flags |= BG_TINT_SET;
978 set_tint_shade_flags (); 998 set_tint_shade_flags ();
979 return true; 999 return true;
980 } 1000 }
981 1001
982 return false; 1002 return false;
983} 1003}
984 1004
985bool 1005bool
986rxvt_term::bg_set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
987{ 1007{
988 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
989 1009
990 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
991 if (new_shade < 0) 1011 if (new_shade < 0)
992 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
993 1013
… …
1027bool 1047bool
1028rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1029{ 1049{
1030 bool ret = false; 1050 bool ret = false;
1031#if XRENDER 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1032 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1033 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1034 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1035 1058
1036 XRenderPictureAttributes pa;
1037 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1038 1060
1039 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1040 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1041 1063
1042 if (kernel && params) 1064 if (kernel && params)
1043 { 1065 {
1044 if (h_blurRadius) 1066 if (h_blurRadius)
1045 { 1067 {
… …
1109 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1131 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1110 ret = true; 1132 ret = true;
1111 XFreeGC (dpy, gc); 1133 XFreeGC (dpy, gc);
1112 } 1134 }
1113 } 1135 }
1114 else
1115 {
1116# if XRENDER 1136# if XRENDER
1117 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1137 else if (bg_flags & BG_HAS_RENDER)
1138 {
1139 rgba c;
1118 1140
1119 if (bg_flags & BG_TINT_SET)
1120 tint.get (c); 1141 tint.get (c);
1121 1142
1122 if (shade <= 100) 1143 if (shade <= 100)
1123 { 1144 {
1124 c.r = c.r * shade / 100; 1145 c.r = c.r * shade / 100;
1125 c.g = c.g * shade / 100; 1146 c.g = c.g * shade / 100;
… …
1130 c.r = c.r * (200 - shade) / 100; 1151 c.r = c.r * (200 - shade) / 100;
1131 c.g = c.g * (200 - shade) / 100; 1152 c.g = c.g * (200 - shade) / 100;
1132 c.b = c.b * (200 - shade) / 100; 1153 c.b = c.b * (200 - shade) / 100;
1133 } 1154 }
1134 1155
1135 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1136 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1156 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1137 XRenderPictureAttributes pa;
1138 1157
1139 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1158 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1140 1159
1141 pa.repeat = True; 1160 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1142 1161
1143 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1162 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1144 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1145 XFreePixmap (dpy, overlay_pmap);
1146
1147 pa.component_alpha = True;
1148 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1149 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1150 XFreePixmap (dpy, mask_pmap);
1151 1163
1152 XRenderColor mask_c; 1164 XRenderColor mask_c;
1153 1165
1154 mask_c.alpha = 0xffff; 1166 mask_c.alpha = 0xffff;
1155 mask_c.red = 1167 mask_c.red =
… …
1160 mask_c.alpha = 0; 1172 mask_c.alpha = 0;
1161 mask_c.red = 0xffff - c.r; 1173 mask_c.red = 0xffff - c.r;
1162 mask_c.green = 0xffff - c.g; 1174 mask_c.green = 0xffff - c.g;
1163 mask_c.blue = 0xffff - c.b; 1175 mask_c.blue = 0xffff - c.b;
1164 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1177
1165 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1178 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1166 1179
1167 if (shade > 100) 1180 if (shade > 100)
1168 { 1181 {
1169 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1170 mask_c.alpha = 0; 1182 mask_c.alpha = 0;
1183 mask_c.red =
1184 mask_c.green =
1185 mask_c.blue = 0xffff * (shade - 100) / 100;
1171 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1186 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1172 1187
1173 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1188 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1174 } 1189 }
1175 1190
1176 ret = true; 1191 ret = true;
1177 1192
1178 XRenderFreePicture (dpy, mask_pic); 1193 XRenderFreePicture (dpy, mask_pic);
1179 XRenderFreePicture (dpy, overlay_pic); 1194 XRenderFreePicture (dpy, overlay_pic);
1180 XRenderFreePicture (dpy, back_pic); 1195 XRenderFreePicture (dpy, back_pic);
1196 }
1181# endif 1197# endif
1182 }
1183 1198
1184 return ret; 1199 return ret;
1185} 1200}
1186 1201
1187/* 1202/*
… …
1238#if XRENDER 1253#if XRENDER
1239 if (bg_flags & BG_HAS_RENDER) 1254 if (bg_flags & BG_HAS_RENDER)
1240 { 1255 {
1241 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1256 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1242 1257
1243 XRenderPictureAttributes pa;
1244
1245 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1258 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1246 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1259 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1247 1260
1248 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1261 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1249 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1262 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1250 1263
1251 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1264 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1252 1265
1253 XRenderFreePicture (dpy, src); 1266 XRenderFreePicture (dpy, src);
1254 XRenderFreePicture (dpy, dst); 1267 XRenderFreePicture (dpy, dst);
… …
1271 bg_pmap_width = window_width; 1284 bg_pmap_width = window_width;
1272 bg_pmap_height = window_height; 1285 bg_pmap_height = window_height;
1273 } 1286 }
1274 1287
1275 /* straightforward pixmap copy */ 1288 /* straightforward pixmap copy */
1276 while (sx < 0) sx += root_width; 1289 while (sx < 0) sx += root_pmap_width;
1277 while (sy < 0) sy += root_height; 1290 while (sy < 0) sy += root_pmap_height;
1278 1291
1279 gcv.tile = recoded_root_pmap; 1292 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled; 1293 gcv.fill_style = FillTiled;
1281 gcv.ts_x_origin = -sx; 1294 gcv.ts_x_origin = -sx;
1282 gcv.ts_y_origin = -sy; 1295 gcv.ts_y_origin = -sy;
… …
1284 1297
1285 if (gc) 1298 if (gc)
1286 { 1299 {
1287 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1300 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1288 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1301 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1289 XFreeGC (dpy, gc);
1290 1302
1291 if (!(bg_flags & BG_CLIENT_RENDER)) 1303 if (!(bg_flags & BG_CLIENT_RENDER))
1292 { 1304 {
1293 if ((bg_flags & BG_NEEDS_BLUR) 1305 if (bg_flags & BG_NEEDS_BLUR)
1294 && (bg_flags & BG_HAS_RENDER_CONV))
1295 { 1306 {
1296 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1307 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1297 result &= ~BG_NEEDS_BLUR; 1308 result &= ~BG_NEEDS_BLUR;
1298 } 1309 }
1299 if ((bg_flags & BG_NEEDS_TINT) 1310 if (bg_flags & BG_NEEDS_TINT)
1300 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1301 { 1311 {
1302 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1303 result &= ~BG_NEEDS_TINT; 1313 result &= ~BG_NEEDS_TINT;
1304 } 1314 }
1315# ifndef HAVE_AFTERIMAGE
1316 if (result & BG_NEEDS_TINT)
1317 {
1318 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1319 if (ximage)
1320 {
1321 /* our own client-side tinting */
1322 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1323
1324 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1325 XDestroyImage (ximage);
1326 }
1327 }
1328# endif
1305 } /* server side rendering completed */ 1329 } /* server side rendering completed */
1330
1331 XFreeGC (dpy, gc);
1306 } 1332 }
1307 1333
1308 if (recoded_root_pmap != root_pixmap) 1334 if (recoded_root_pmap != root_pixmap)
1309 XFreePixmap (dpy, recoded_root_pmap); 1335 XFreePixmap (dpy, recoded_root_pmap);
1310 1336
… …
1319 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1345 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1320 1346
1321 root_pixmap = new_root_pixmap; 1347 root_pixmap = new_root_pixmap;
1322} 1348}
1323# endif /* ENABLE_TRANSPARENCY */ 1349# endif /* ENABLE_TRANSPARENCY */
1324
1325#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1326static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1327# endif
1328 1350
1329bool 1351bool
1330rxvt_term::bg_render () 1352rxvt_term::bg_render ()
1331{ 1353{
1332 unsigned long tr_flags = 0; 1354 unsigned long tr_flags = 0;
… …
1337 { 1359 {
1338 /* we need to re-generate transparency pixmap in that case ! */ 1360 /* we need to re-generate transparency pixmap in that case ! */
1339 tr_flags = make_transparency_pixmap (); 1361 tr_flags = make_transparency_pixmap ();
1340 if (tr_flags == 0) 1362 if (tr_flags == 0)
1341 return false; 1363 return false;
1342 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1343 bg_flags |= BG_IS_VALID; 1364 bg_flags |= BG_IS_VALID;
1344 } 1365 }
1345# endif 1366# endif
1346 1367
1347# ifdef BG_IMAGE_FROM_FILE 1368# ifdef BG_IMAGE_FROM_FILE
1348 if ((bg_flags & BG_IS_FROM_FILE) 1369 if ((bg_flags & BG_IS_FROM_FILE)
… …
1351 if (render_image (tr_flags)) 1372 if (render_image (tr_flags))
1352 bg_flags |= BG_IS_VALID; 1373 bg_flags |= BG_IS_VALID;
1353 } 1374 }
1354# endif 1375# endif
1355 1376
1356# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1357 XImage *result = NULL;
1358
1359 if (tr_flags && !(bg_flags & BG_IS_VALID))
1360 {
1361 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1362 }
1363
1364 if (result)
1365 {
1366 /* our own client-side tinting */
1367 if (tr_flags & BG_NEEDS_TINT)
1368 {
1369 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1370 if (bg_flags & BG_TINT_SET)
1371 tint.get (c);
1372 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1373 }
1374
1375 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1376
1377 if (gc)
1378 {
1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1380
1381 XFreeGC (dpy, gc);
1382 bg_flags |= BG_IS_VALID;
1383 }
1384
1385 XDestroyImage (result);
1386 }
1387# endif
1388
1389 if (!(bg_flags & BG_IS_VALID)) 1377 if (!(bg_flags & BG_IS_VALID))
1390 { 1378 {
1391 if (bg_pixmap != None) 1379 if (bg_pixmap != None)
1392 { 1380 {
1393 XFreePixmap (dpy, bg_pixmap); 1381 XFreePixmap (dpy, bg_pixmap);
… …
1405 1393
1406void 1394void
1407rxvt_term::bg_init () 1395rxvt_term::bg_init ()
1408{ 1396{
1409#ifdef ENABLE_TRANSPARENCY 1397#ifdef ENABLE_TRANSPARENCY
1398 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1399 tint.set (this, c);
1410 shade = 100; 1400 shade = 100;
1411#endif 1401#endif
1412 1402
1413 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1403 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1414#if XRENDER 1404#if XRENDER
… …
1428} 1418}
1429 1419
1430#endif /* HAVE_BG_PIXMAP */ 1420#endif /* HAVE_BG_PIXMAP */
1431 1421
1432#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1422#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1433/* taken from aterm-0.4.2 */ 1423/* based on code from aterm-0.4.2 */
1434 1424
1435static void 1425static inline void
1436shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1426fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1427{
1428 for (int i = 0; i <= mask >> sh; i++)
1429 {
1430 uint32_t tmp;
1431 tmp = i * high;
1432 tmp += (mask >> sh) * low;
1433 lookup[i] = (tmp / 0xffff) << sh;
1434 }
1435}
1436
1437void
1438rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1437{ 1439{
1438 int sh_r, sh_g, sh_b; 1440 int sh_r, sh_g, sh_b;
1439 uint32_t mask_r, mask_g, mask_b; 1441 uint32_t mask_r, mask_g, mask_b;
1440 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1442 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1441 rgba low; 1443 unsigned short low;
1442 rgba high;
1443 int i;
1444 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1444 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1445 1445
1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1447 1447
1448 /* for convenience */ 1448 /* for convenience */
1449 mask_r = visual->red_mask; 1449 mask_r = visual->red_mask;
… …
1507 break; 1507 break;
1508 default: 1508 default:
1509 return; /* we do not support this color depth */ 1509 return; /* we do not support this color depth */
1510 } 1510 }
1511 1511
1512 rgba c;
1513
1514 tint.get (c);
1515
1512 /* prepare limits for color transformation (each channel is handled separately) */ 1516 /* prepare limits for color transformation (each channel is handled separately) */
1513 if (shade > 100) 1517 if (shade > 100)
1514 { 1518 {
1515 shade = 200 - shade;
1516
1517 high.r = c.r * shade / 100;
1518 high.g = c.g * shade / 100;
1519 high.b = c.b * shade / 100;
1520
1521 low.r = 65535 * (100 - shade) / 100; 1519 c.r = c.r * (200 - shade) / 100;
1522 low.g = 65535 * (100 - shade) / 100; 1520 c.g = c.g * (200 - shade) / 100;
1523 low.b = 65535 * (100 - shade) / 100; 1521 c.b = c.b * (200 - shade) / 100;
1522
1523 low = 0xffff * (shade - 100) / 100;
1524 } 1524 }
1525 else 1525 else
1526 { 1526 {
1527 high.r = c.r * shade / 100; 1527 c.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100; 1528 c.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100; 1529 c.b = c.b * shade / 100;
1530 1530
1531 low.r = low.g = low.b = 0; 1531 low = 0;
1532 } 1532 }
1533 1533
1534 /* fill our lookup tables */ 1534 /* fill our lookup tables */
1535 for (i = 0; i <= mask_r>>sh_r; i++) 1535 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1536 { 1536 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1537 uint32_t tmp; 1537 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1538 tmp = i * high.r;
1539 tmp += (mask_r>>sh_r) * low.r;
1540 lookup_r[i] = (tmp/65535)<<sh_r;
1541 }
1542 for (i = 0; i <= mask_g>>sh_g; i++)
1543 {
1544 uint32_t tmp;
1545 tmp = i * high.g;
1546 tmp += (mask_g>>sh_g) * low.g;
1547 lookup_g[i] = (tmp/65535)<<sh_g;
1548 }
1549 for (i = 0; i <= mask_b>>sh_b; i++)
1550 {
1551 uint32_t tmp;
1552 tmp = i * high.b;
1553 tmp += (mask_b>>sh_b) * low.b;
1554 lookup_b[i] = (tmp/65535)<<sh_b;
1555 }
1556 1538
1557 /* apply table to input image (replacing colors by newly calculated ones) */ 1539 /* apply table to input image (replacing colors by newly calculated ones) */
1558 if (ximage->bits_per_pixel == 32 1540 if (ximage->bits_per_pixel == 32
1559 && (ximage->depth == 24 || ximage->depth == 32) 1541 && (ximage->depth == 24 || ximage->depth == 32)
1560 && ximage->byte_order == host_byte_order) 1542 && ximage->byte_order == host_byte_order)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines