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.153 by sf-exg, Sun May 8 21:07:43 2011 UTC vs.
Revision 1.187 by sf-exg, Wed Dec 28 13:13:33 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
64void 38void
65rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
66{ 40{
67#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
176 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
177 151
178 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
179 return diff * align / 100; 153 return diff * align / 100;
180 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
181 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
182 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
183 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
184 return 0; 158 return 0;
185} 159}
186 160
187static inline int 161static inline int
188make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
207{ 181{
208 bool changed = false; 182 bool changed = false;
209 int geom_flags = 0; 183 int geom_flags = 0;
210 int x = 0, y = 0; 184 int x = 0, y = 0;
211 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
212 unsigned int n; 186 unsigned long new_flags = 0;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
214 const char *ops;
215 187
216 if (geom == NULL) 188 if (geom == NULL)
217 return false; 189 return false;
218 190
219 char str[256]; 191 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 { 192 {
236 /* we have geometry string - let's handle it prior to applying ops */ 193 char **arr = rxvt_strsplit (':', geom);
194
195 for (int i = 0; arr[i]; i++)
196 {
197 if (!strcasecmp (arr[i], "style=tiled"))
198 {
199 new_flags = BG_TILE;
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
249 }
250 else if (!strcasecmp (arr[i], "hscale"))
251 {
252 new_flags |= BG_TILE;
253 w = windowScale;
254 h = noScale;
255 geom_flags |= WidthValue|HeightValue;
256 }
257 else if (!strcasecmp (arr[i], "vscale"))
258 {
259 new_flags |= BG_TILE;
260 h = windowScale;
261 w = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "scale"))
265 {
266 w = h = windowScale;
267 geom_flags |= WidthValue|HeightValue;
268 }
269 else if (!strcasecmp (arr[i], "auto"))
270 {
271 w = h = windowScale;
272 x = y = centerAlign;
273 geom_flags |= WidthValue|HeightValue|XValue|YValue;
274 }
275 else if (!strcasecmp (arr[i], "root"))
276 {
277 new_flags |= BG_TILE|BG_ROOT_ALIGN;
278 w = h = noScale;
279 geom_flags |= WidthValue|HeightValue;
280 }
281
282 else
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
239 290
240 if (!update) 291 if (!update)
241 { 292 {
242 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
252 w = h; 303 w = h;
253 304
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 305 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 306 }
256 307
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; 308 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; 309 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; 310 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; 311 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
314 312
… …
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 323rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 324{
327 int target_width = szHint.width; 325 int target_width = szHint.width;
328 int target_height = szHint.height; 326 int target_height = szHint.height;
329 327
328 w = h_scale * target_width / 100;
329 h = v_scale * target_height / 100;
330
330 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
331 { 332 {
332 float scale = (float)target_width / image_width; 333 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 334 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
336 } 337 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 338
343 if (!w) w = image_width; 339 if (!w) w = image_width;
344 if (!h) h = image_height; 340 if (!h) h = image_height;
345 341
346 if (bg_flags & BG_ROOT_ALIGN) 342 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 349 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
355 } 351 }
356 352
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 353 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 354 if (!(bg_flags & BG_TILE)
355 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 356 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 357 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 358 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 359}
363 360
… …
377 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
378 { 375 {
379 ShadingInfo as_shade; 376 ShadingInfo as_shade;
380 as_shade.shading = shade; 377 as_shade.shading = shade;
381 378
382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
383 if (bg_flags & BG_TINT_SET)
384 tint.get (c); 380 tint.get (c);
385 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
386 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
387 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
388 384
389 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
390 } 386 }
391 387
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 389 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 390 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 393 if (tmp)
398 { 394 {
399 destroy_asimage (&background); 395 destroy_asimage (&background);
400 background = tmp; 396 background = tmp;
… …
419 415
420 if (!original_asim 416 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 417 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 418 && (x >= target_width
423 || y >= target_height 419 || y >= target_height
424 || (x + w <= 0) 420 || x + w <= 0
425 || (y + h <= 0)))) 421 || y + h <= 0)))
426 { 422 {
427 if (background) 423 if (background)
428 { 424 {
429 new_pmap_width = background->width; 425 new_pmap_width = background->width;
430 new_pmap_height = background->height; 426 new_pmap_height = background->height;
… …
444 } 440 }
445 else 441 else
446 { 442 {
447 result = original_asim; 443 result = original_asim;
448 444
449 if ((w != original_asim->width) 445 if (w != original_asim->width
450 || (h != original_asim->height)) 446 || h != original_asim->height)
451 { 447 {
452 result = scale_asimage (asv, original_asim, 448 result = scale_asimage (asv, original_asim,
453 w, h, 449 w, h,
454 background ? ASA_ASImage : ASA_XImage, 450 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
456 } 452 }
457 453
458 if (background == NULL) 454 if (background == NULL)
459 { 455 {
460 if (h_scale == 0 || v_scale == 0) 456 if (bg_flags & BG_TILE)
461 { 457 {
462 /* if tiling - pixmap has to be sized exactly as the image, 458 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 459 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 460 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 461 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 486 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 487 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 488 layers[0].tint = background_tint;
493 layers[1].im = result; 489 layers[1].im = result;
494 490
495 if (h_scale == 0 || v_scale == 0) 491 if (bg_flags & BG_TILE)
496 { 492 {
497 /* tile horizontally */ 493 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 494 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 495 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 496 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 500 /* clip horizontally */
505 layers[1].dst_x = x; 501 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 502 layers[1].clip_width = result->width;
507 } 503 }
508 504
509 if (h_scale == 0 || v_scale == 0) 505 if (bg_flags & BG_TILE)
510 { 506 {
511 while (y > 0) y -= (int)result->height; 507 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 508 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 509 layers[1].clip_height = result->height + target_height;
514 } 510 }
… …
564 560
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 562 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 563 if (background == NULL)
568 { 564 {
569 if (!(h_scale == 0 || v_scale == 0)) 565 if (!(bg_flags & BG_TILE))
570 { 566 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 567 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); 568 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 569 }
574 570
… …
620 else if (depth == 15 || depth == 16) 616 else if (depth == 15 || depth == 16)
621 bytes_per_pixel = 2; 617 bytes_per_pixel = 2;
622 else 618 else
623 return false; 619 return false;
624 620
625 width_r = rxvt_popcount (visual->red_mask); 621 width_r = ecb_popcount32 (visual->red_mask);
626 width_g = rxvt_popcount (visual->green_mask); 622 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = rxvt_popcount (visual->blue_mask); 623 width_b = ecb_popcount32 (visual->blue_mask);
628 624
629 if (width_r > 8 || width_g > 8 || width_b > 8) 625 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false; 626 return false;
631 627
632 sh_r = rxvt_ctz (visual->red_mask); 628 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = rxvt_ctz (visual->green_mask); 629 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = rxvt_ctz (visual->blue_mask); 630 sh_b = ecb_ctz32 (visual->blue_mask);
635 631
636 if (width > INT_MAX / height / bytes_per_pixel) 632 if (width > INT_MAX / height / bytes_per_pixel)
637 return false; 633 return false;
638 634
639 data = (char *)malloc (width * height * bytes_per_pixel); 635 data = (char *)malloc (width * height * bytes_per_pixel);
… …
646 { 642 {
647 free (data); 643 free (data);
648 return false; 644 return false;
649 } 645 }
650 646
651 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 647 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
652 648
653 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 649 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
654 channels = gdk_pixbuf_get_n_channels (pixbuf); 650 channels = gdk_pixbuf_get_n_channels (pixbuf);
655 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
656 line = data; 652 line = data;
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
710 706
711 if (!(bg_flags & BG_ROOT_ALIGN) 707 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 708 && (x >= target_width
713 || y >= target_height 709 || y >= target_height
714 || (x + w <= 0) 710 || x + w <= 0
715 || (y + h <= 0))) 711 || y + h <= 0))
716 return false; 712 return false;
717 713
718 result = pixbuf; 714 result = pixbuf;
719 715
720 if ((w != image_width) 716 if (w != image_width
721 || (h != image_height)) 717 || h != image_height)
722 { 718 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 719 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 720 w, h,
725 GDK_INTERP_BILINEAR); 721 GDK_INTERP_BILINEAR);
726 } 722 }
… …
742 root_pmap = bg_pixmap; 738 root_pmap = bg_pixmap;
743 bg_pixmap = None; 739 bg_pixmap = None;
744 } 740 }
745 else 741 else
746 { 742 {
747 if (h_scale == 0 || v_scale == 0) 743 if (bg_flags & BG_TILE)
748 { 744 {
749 new_pmap_width = min (image_width, target_width); 745 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 746 new_pmap_height = min (image_height, target_height);
751 } 747 }
752 } 748 }
… …
760 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 756 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
761 bg_pmap_width = new_pmap_width; 757 bg_pmap_width = new_pmap_width;
762 bg_pmap_height = new_pmap_height; 758 bg_pmap_height = new_pmap_height;
763 } 759 }
764 760
765 if (bg_pixmap != None)
766 {
767 gcv.foreground = pix_colors[Color_bg]; 761 gcv.foreground = pix_colors[Color_bg];
768 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 762 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
769 763
770 if (gc) 764 if (gc)
771 { 765 {
772 if (h_scale == 0 || v_scale == 0) 766 if (bg_flags & BG_TILE)
773 { 767 {
774 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 768 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
775
776 if (tile != None)
777 {
778 pixbuf_to_pixmap (result, tile, gc, 769 pixbuf_to_pixmap (result, tile, gc,
779 0, 0, 770 0, 0,
780 0, 0, 771 0, 0,
781 image_width, image_height); 772 image_width, image_height);
782 773
783 gcv.tile = tile; 774 gcv.tile = tile;
784 gcv.fill_style = FillTiled; 775 gcv.fill_style = FillTiled;
785 gcv.ts_x_origin = x; 776 gcv.ts_x_origin = x;
786 gcv.ts_y_origin = y; 777 gcv.ts_y_origin = y;
787 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 778 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
788 779
789 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 780 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
790 XFreePixmap (dpy, tile); 781 XFreePixmap (dpy, tile);
791 }
792 } 782 }
793 else 783 else
794 { 784 {
795 int src_x, src_y, dst_x, dst_y; 785 int src_x, src_y, dst_x, dst_y;
796 int dst_width, dst_height; 786 int dst_width, dst_height;
797 787
798 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width ); 788 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
799 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 789 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
800 790
801 if (dst_x > 0 || dst_y > 0 791 if (dst_x > 0 || dst_y > 0
802 || dst_x + dst_width < new_pmap_width 792 || dst_x + dst_width < new_pmap_width
803 || dst_y + dst_height < new_pmap_height) 793 || dst_y + dst_height < new_pmap_height)
804 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 794 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
805 795
806 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 796 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
807 pixbuf_to_pixmap (result, bg_pixmap, gc, 797 pixbuf_to_pixmap (result, bg_pixmap, gc,
808 src_x, src_y, 798 src_x, src_y,
809 dst_x, dst_y, 799 dst_x, dst_y,
810 dst_width, dst_height); 800 dst_width, dst_height);
811 } 801 }
812 802
813#if XRENDER 803#if XRENDER
814 if (tr_flags) 804 if (tr_flags)
815 { 805 {
816 XRenderPictureAttributes pa; 806 XRenderPictureAttributes pa;
817 807
818 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 808 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
819 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 809 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
820 810
821 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 811 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
822 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 812 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
823 813
824 pa.repeat = True; 814 pa.repeat = True;
825 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); 815 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
826 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 816 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
827 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 817 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
828 XFreePixmap (dpy, mask_pmap); 818 XFreePixmap (dpy, mask_pmap);
829 819
830 if (src && dst && mask)
831 {
832 XRenderColor mask_c; 820 XRenderColor mask_c;
833 821
834 mask_c.alpha = 0x8000; 822 mask_c.alpha = 0x8000;
835 mask_c.red = 0; 823 mask_c.red = 0;
836 mask_c.green = 0; 824 mask_c.green = 0;
837 mask_c.blue = 0; 825 mask_c.blue = 0;
838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 826 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 827 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
840 }
841 828
842 XRenderFreePicture (dpy, src); 829 XRenderFreePicture (dpy, src);
843 XRenderFreePicture (dpy, dst); 830 XRenderFreePicture (dpy, dst);
844 XRenderFreePicture (dpy, mask); 831 XRenderFreePicture (dpy, mask);
845 } 832 }
846#endif 833#endif
847 834
848 XFreeGC (dpy, gc); 835 XFreeGC (dpy, gc);
849 836
850 ret = true; 837 ret = true;
851 }
852 } 838 }
853 839
854 if (result != pixbuf) 840 if (result != pixbuf)
855 g_object_unref (result); 841 g_object_unref (result);
856 842
… …
865rxvt_term::bg_set_file (const char *file) 851rxvt_term::bg_set_file (const char *file)
866{ 852{
867 if (!file || !*file) 853 if (!file || !*file)
868 return false; 854 return false;
869 855
856 bool ret = false;
870 if (const char *p = strchr (file, ';')) 857 const char *p = strchr (file, ';');
858
859 if (p)
871 { 860 {
872 size_t len = p - file; 861 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 862 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 863 memcpy (f, file, len);
875 f[len] = '\0'; 864 f[len] = '\0';
… …
884 { 873 {
885 if (original_asim) 874 if (original_asim)
886 safe_asimage_destroy (original_asim); 875 safe_asimage_destroy (original_asim);
887 original_asim = image; 876 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 878 ret = true;
890 } 879 }
891# endif 880# endif
892 881
893# ifdef HAVE_PIXBUF 882# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
896 { 885 {
897 if (pixbuf) 886 if (pixbuf)
898 g_object_unref (pixbuf); 887 g_object_unref (pixbuf);
899 pixbuf = image; 888 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 889 bg_flags |= BG_IS_FROM_FILE;
901 return true; 890 ret = true;
902 } 891 }
903# endif 892# endif
904 893
894 if (ret)
895 {
896 if (p)
897 bg_set_geometry (p + 1);
898 else
899 bg_set_default_geometry ();
900 }
901
905 return false; 902 return ret;
906} 903}
907 904
908# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
909 906
910# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
… …
957} 954}
958 955
959void 956void
960rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
961{ 958{
962 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
963 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
964 961
965 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
966 963
967 if (bg_flags & BG_TINT_SET)
968 {
969 tint.get (c); 964 tint.get (c);
965
970 if (!has_shade 966 if (!has_shade
971 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
972 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
973 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
974 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
975 }
976 971
977 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
978 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
979} 977}
980 978
981bool 979bool
982rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
983{ 981{
984 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
985 { 983 {
986 tint = new_tint; 984 tint = new_tint;
987 bg_flags |= BG_TINT_SET;
988 set_tint_shade_flags (); 985 set_tint_shade_flags ();
989 return true; 986 return true;
990 } 987 }
991 988
992 return false; 989 return false;
993} 990}
994 991
995bool 992bool
996rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
997{ 994{
998 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
999 996
1000 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
1001 if (new_shade < 0) 998 if (new_shade < 0)
1002 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
1003 1000
… …
1037bool 1034bool
1038rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1039{ 1036{
1040 bool ret = false; 1037 bool ret = false;
1041#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1043 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1045 1045
1046 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
1047 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1047 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1048 1048
1049 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1049 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1050 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1050 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1051 1051
1052 if (kernel && params && src && dst) 1052 if (kernel && params)
1053 { 1053 {
1054 if (h_blurRadius) 1054 if (h_blurRadius)
1055 { 1055 {
1056 size = h_blurRadius * 2 + 1; 1056 size = h_blurRadius * 2 + 1;
1057 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1057 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1120 ret = true; 1120 ret = true;
1121 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1122 } 1122 }
1123 } 1123 }
1124 else
1125 {
1126# if XRENDER 1124# if XRENDER
1127 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1128 1128
1129 if (bg_flags & BG_TINT_SET)
1130 tint.get (c); 1129 tint.get (c);
1131 1130
1132 if (shade <= 100) 1131 if (shade <= 100)
1133 { 1132 {
1134 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1135 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1157 pa.component_alpha = True; 1156 pa.component_alpha = True;
1158 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1157 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1159 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa); 1158 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1160 XFreePixmap (dpy, mask_pmap); 1159 XFreePixmap (dpy, mask_pmap);
1161 1160
1162 if (mask_pic && overlay_pic && back_pic)
1163 {
1164 XRenderColor mask_c; 1161 XRenderColor mask_c;
1165 1162
1166 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1167 mask_c.red = 1164 mask_c.red =
1168 mask_c.green = 1165 mask_c.green =
1169 mask_c.blue = 0; 1166 mask_c.blue = 0;
1167 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1168
1169 mask_c.alpha = 0;
1170 mask_c.red = 0xffff - c.r;
1171 mask_c.green = 0xffff - c.g;
1172 mask_c.blue = 0xffff - c.b;
1173 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175
1176 if (shade > 100)
1177 {
1178 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1179 mask_c.alpha = 0;
1170 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1171 1181
1172 mask_c.alpha = 0;
1173 mask_c.red = 0xffff - c.r;
1174 mask_c.green = 0xffff - c.g;
1175 mask_c.blue = 0xffff - c.b;
1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1177 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1178
1179 if (shade > 100)
1180 {
1181 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1182 mask_c.alpha = 0;
1183 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1184
1185 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1186 } 1183 }
1187 1184
1188 ret = true; 1185 ret = true;
1189 }
1190 1186
1191 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1192 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1193 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1194# endif 1191# endif
1195 }
1196 1192
1197 return ret; 1193 return ret;
1198} 1194}
1199 1195
1200/* 1196/*
… …
1251#if XRENDER 1247#if XRENDER
1252 if (bg_flags & BG_HAS_RENDER) 1248 if (bg_flags & BG_HAS_RENDER)
1253 { 1249 {
1254 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1255 1251
1256 if (recoded_root_pmap != None)
1257 {
1258 XRenderPictureAttributes pa; 1252 XRenderPictureAttributes pa;
1259 1253
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1262 1256
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1257 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1258 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1265 1259
1266 if (src && dst)
1267 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1268 else
1269 {
1270 XFreePixmap (dpy, recoded_root_pmap);
1271 recoded_root_pmap = None;
1272 }
1273 1261
1274 XRenderFreePicture (dpy, src); 1262 XRenderFreePicture (dpy, src);
1275 XRenderFreePicture (dpy, dst); 1263 XRenderFreePicture (dpy, dst);
1276 }
1277 } 1264 }
1278 else 1265 else
1279#endif 1266#endif
1280 recoded_root_pmap = None; 1267 recoded_root_pmap = None;
1281 } 1268 }
… …
1292 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1279 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1293 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1294 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1295 } 1282 }
1296 1283
1297 if (bg_pixmap != None)
1298 {
1299 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1300 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1301 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1302 1287
1303 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1304 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1305 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1292 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1293
1309 if (gc) 1294 if (gc)
1310 { 1295 {
1311 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1296 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1312 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1313 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1314 1299
1315 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1316 { 1301 {
1317 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1318 && (bg_flags & BG_HAS_RENDER_CONV))
1319 { 1303 {
1320 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1321 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1322 } 1306 }
1323 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1324 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1325 { 1308 {
1326 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1327 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1328 } 1311 }
1329 } /* server side rendering completed */ 1312 } /* server side rendering completed */
1330 }
1331 } 1313 }
1332 1314
1333 if (recoded_root_pmap != root_pixmap) 1315 if (recoded_root_pmap != root_pixmap)
1334 XFreePixmap (dpy, recoded_root_pmap); 1316 XFreePixmap (dpy, recoded_root_pmap);
1335 1317
… …
1344 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1345 1327
1346 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1347} 1329}
1348# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1349
1350#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1351static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1352# endif
1353 1331
1354bool 1332bool
1355rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1356{ 1334{
1357 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1362 { 1340 {
1363 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1364 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1365 if (tr_flags == 0) 1343 if (tr_flags == 0)
1366 return false; 1344 return false;
1367 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1368 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1369 } 1346 }
1370# endif 1347# endif
1371 1348
1372# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1373 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1379# endif 1356# endif
1380 1357
1381# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1382 XImage *result = NULL; 1359 XImage *result = NULL;
1383 1360
1384 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1385 { 1362 {
1386 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1363 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1387 } 1364 }
1388 1365
1389 if (result) 1366 if (result)
1390 { 1367 {
1391 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1392 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1393 { 1370 if (1)
1394 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1395 if (bg_flags & BG_TINT_SET)
1396 tint.get (c);
1397 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1398 }
1399 1372
1400 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1401 1374
1402 if (gc) 1375 if (gc)
1403 { 1376 {
1404 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1377 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1405 1378
1406 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1407 bg_flags |= BG_IS_VALID;
1408 } 1380 }
1409 1381
1410 XDestroyImage (result); 1382 XDestroyImage (result);
1411 } 1383 }
1412# endif 1384# endif
… …
1430 1402
1431void 1403void
1432rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1433{ 1405{
1434#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1435 shade = 100; 1409 shade = 100;
1436#endif 1410#endif
1437 1411
1438 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1439#if XRENDER 1413#if XRENDER
… …
1453} 1427}
1454 1428
1455#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1456 1430
1457#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1459 1433
1460static void 1434static inline void
1461shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1435fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1436{
1437 for (int i = 0; i <= mask >> sh; i++)
1438 {
1439 uint32_t tmp;
1440 tmp = i * high;
1441 tmp += (mask >> sh) * low;
1442 lookup[i] = (tmp / 0xffff) << sh;
1443 }
1444}
1445
1446void
1447rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1462{ 1448{
1463 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1464 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1465 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1466 rgba low; 1452 unsigned short low;
1467 rgba high;
1468 int i;
1469 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1470 1454
1471 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1472 1456
1473 /* for convenience */ 1457 /* for convenience */
1474 mask_r = visual->red_mask; 1458 mask_r = visual->red_mask;
… …
1532 break; 1516 break;
1533 default: 1517 default:
1534 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1535 } 1519 }
1536 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1537 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1538 if (shade > 100) 1526 if (shade > 100)
1539 { 1527 {
1540 shade = 200 - shade;
1541
1542 high.r = c.r * shade / 100;
1543 high.g = c.g * shade / 100;
1544 high.b = c.b * shade / 100;
1545
1546 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1547 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1548 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1549 } 1533 }
1550 else 1534 else
1551 { 1535 {
1552 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1553 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1554 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1555 1539
1556 low.r = low.g = low.b = 0; 1540 low = 0;
1557 } 1541 }
1558 1542
1559 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1560 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1561 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1562 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1563 tmp = i * high.r;
1564 tmp += (mask_r>>sh_r) * low.r;
1565 lookup_r[i] = (tmp/65535)<<sh_r;
1566 }
1567 for (i = 0; i <= mask_g>>sh_g; i++)
1568 {
1569 uint32_t tmp;
1570 tmp = i * high.g;
1571 tmp += (mask_g>>sh_g) * low.g;
1572 lookup_g[i] = (tmp/65535)<<sh_g;
1573 }
1574 for (i = 0; i <= mask_b>>sh_b; i++)
1575 {
1576 uint32_t tmp;
1577 tmp = i * high.b;
1578 tmp += (mask_b>>sh_b) * low.b;
1579 lookup_b[i] = (tmp/65535)<<sh_b;
1580 }
1581 1547
1582 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1583 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1584 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1585 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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