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.143 by sf-exg, Fri Jan 28 00:08:57 2011 UTC vs.
Revision 1.193 by sf-exg, Sun Jan 1 14:31:29 2012 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
… …
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)
69 safe_asimage_destroy (original_asim); 61 safe_asimage_destroy (original_asim);
62 if (asv)
63 destroy_asvisual (asv, 0);
64 if (asimman)
65 destroy_image_manager (asimman, 0);
70#endif 66#endif
71 67
72#ifdef HAVE_PIXBUF 68#ifdef HAVE_PIXBUF
73 if (pixbuf) 69 if (pixbuf)
74 g_object_unref (pixbuf); 70 g_object_unref (pixbuf);
… …
99 if (bg_flags & BG_IS_TRANSPARENT) 95 if (bg_flags & BG_IS_TRANSPARENT)
100 return true; 96 return true;
101# endif 97# endif
102 98
103# ifdef BG_IMAGE_FROM_FILE 99# ifdef BG_IMAGE_FROM_FILE
104 if (have_image) 100 if (bg_flags & BG_IS_FROM_FILE)
105 { 101 {
106 if (bg_flags & BG_IS_SIZE_SENSITIVE) 102 if (bg_flags & BG_IS_SIZE_SENSITIVE)
107 return true; 103 return true;
108 } 104 }
109# endif 105# endif
… …
118 if (bg_flags & BG_IS_TRANSPARENT) 114 if (bg_flags & BG_IS_TRANSPARENT)
119 return true; 115 return true;
120# endif 116# endif
121 117
122# ifdef BG_IMAGE_FROM_FILE 118# ifdef BG_IMAGE_FROM_FILE
123 if (have_image) 119 if (bg_flags & BG_IS_FROM_FILE)
124 { 120 {
125 if (bg_flags & BG_ROOT_ALIGN) 121 if (bg_flags & BG_ROOT_ALIGN)
126 return true; 122 return true;
127 } 123 }
128# endif 124# endif
… …
172 int smaller = min (image_size, window_size); 168 int smaller = min (image_size, window_size);
173 169
174 if (align >= 0 && align <= 100) 170 if (align >= 0 && align <= 100)
175 return diff * align / 100; 171 return diff * align / 100;
176 else if (align > 100 && align <= 200) 172 else if (align > 100 && align <= 200)
177 return ((align - 100) * smaller / 100) + window_size - smaller; 173 return (align - 100) * smaller / 100 + window_size - smaller;
178 else if (align >= -100 && align < 0) 174 else if (align >= -100 && align < 0)
179 return ((align + 100) * smaller / 100) - image_size; 175 return (align + 100) * smaller / 100 - image_size;
180 return 0; 176 return 0;
181} 177}
182 178
183static inline int 179static inline int
184make_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)
… …
203{ 199{
204 bool changed = false; 200 bool changed = false;
205 int geom_flags = 0; 201 int geom_flags = 0;
206 int x = 0, y = 0; 202 int x = 0, y = 0;
207 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
208 unsigned int n; 204 unsigned long new_flags = 0;
209 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
210 const char *ops;
211 205
212 if (geom == NULL) 206 if (geom == NULL)
213 return false; 207 return false;
214 208
215 char str[256]; 209 if (geom[0])
216
217 ops = strchr (geom, ':');
218 if (ops == NULL)
219 n = strlen (geom);
220 else
221 n = ops - geom;
222
223 if (n >= sizeof (str))
224 return false;
225
226 memcpy (str, geom, n);
227 str[n] = '\0';
228 rxvt_strtrim (str);
229
230 if (str[0])
231 { 210 {
232 /* 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
233 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
234 } /* done parsing geometry string */ 302 } /* done parsing ops */
303
304 rxvt_free_strsplit (arr);
305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
235 308
236 if (!update) 309 if (!update)
237 { 310 {
238 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
239 x = y = defaultAlign; 312 x = y = defaultAlign;
… …
248 w = h; 321 w = h;
249 322
250 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
251 } 324 }
252 325
253 if (ops)
254 {
255 char **arr = rxvt_strsplit (':', ops + 1);
256
257 for (int i = 0; arr[i]; i++)
258 {
259 if (!strcasecmp (arr[i], "tile"))
260 {
261 w = h = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "propscale"))
265 {
266 new_flags |= BG_PROP_SCALE;
267 }
268 else if (!strcasecmp (arr[i], "hscale"))
269 {
270 if (w == 0) w = windowScale;
271
272 h = noScale;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (!strcasecmp (arr[i], "vscale"))
276 {
277 if (h == 0) h = windowScale;
278
279 w = noScale;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (!strcasecmp (arr[i], "scale"))
283 {
284 if (h == 0) h = windowScale;
285 if (w == 0) w = windowScale;
286
287 geom_flags |= WidthValue|HeightValue;
288 }
289 else if (!strcasecmp (arr[i], "auto"))
290 {
291 w = h = windowScale;
292 x = y = centerAlign;
293 geom_flags |= WidthValue|HeightValue|XValue|YValue;
294 }
295 else if (!strcasecmp (arr[i], "root"))
296 {
297 new_flags |= BG_ROOT_ALIGN;
298 w = h = noScale;
299 geom_flags |= WidthValue|HeightValue;
300 }
301 } /* done parsing ops */
302
303 rxvt_free_strsplit (arr);
304 }
305
306 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;
307 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;
308 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;
309 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;
310 330
… …
321rxvt_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)
322{ 342{
323 int target_width = szHint.width; 343 int target_width = szHint.width;
324 int target_height = szHint.height; 344 int target_height = szHint.height;
325 345
346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
326 if (bg_flags & BG_PROP_SCALE) 349 if (bg_flags & BG_KEEP_ASPECT)
327 { 350 {
328 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
329 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
330 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
331 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
332 } 355 }
333 else
334 {
335 w = h_scale * target_width / 100;
336 h = v_scale * target_height / 100;
337 }
338 356
339 if (!w) w = image_width; 357 if (!w) w = image_width;
340 if (!h) h = image_height; 358 if (!h) h = image_height;
341 359
342 if (bg_flags & BG_ROOT_ALIGN) 360 if (bg_flags & BG_ROOT_ALIGN)
… …
349 x = make_align_position (h_align, target_width, w); 367 x = make_align_position (h_align, target_width, w);
350 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
351 } 369 }
352 370
353 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
354 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 372 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale
355 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
356 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
357 bg_flags |= BG_IS_SIZE_SENSITIVE; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
358} 377}
359 378
… …
373 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
374 { 393 {
375 ShadingInfo as_shade; 394 ShadingInfo as_shade;
376 as_shade.shading = shade; 395 as_shade.shading = shade;
377 396
378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
379 if (bg_flags & BG_TINT_SET)
380 tint.get (c); 398 tint.get (c);
381 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
382 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
383 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
384 402
385 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
386 } 404 }
387 405
388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
389 { 407 {
390 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,
391 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
392 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
393 if (tmp) 411 if (tmp)
394 { 412 {
395 destroy_asimage (&background); 413 destroy_asimage (&background);
396 background = tmp; 414 background = tmp;
… …
415 433
416 if (!original_asim 434 if (!original_asim
417 || (!(bg_flags & BG_ROOT_ALIGN) 435 || (!(bg_flags & BG_ROOT_ALIGN)
418 && (x >= target_width 436 && (x >= target_width
419 || y >= target_height 437 || y >= target_height
420 || (x + w <= 0) 438 || x + w <= 0
421 || (y + h <= 0)))) 439 || y + h <= 0)))
422 { 440 {
423 if (background) 441 if (background)
424 { 442 {
425 new_pmap_width = background->width; 443 new_pmap_width = background->width;
426 new_pmap_height = background->height; 444 new_pmap_height = background->height;
… …
440 } 458 }
441 else 459 else
442 { 460 {
443 result = original_asim; 461 result = original_asim;
444 462
445 if ((w != original_asim->width) 463 if (w != original_asim->width
446 || (h != original_asim->height)) 464 || h != original_asim->height)
447 { 465 {
448 result = scale_asimage (asv, original_asim, 466 result = scale_asimage (asv, original_asim,
449 w, h, 467 w, h,
450 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
451 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
452 } 470 }
453 471
454 if (background == NULL) 472 if (background == NULL)
455 { 473 {
456 if (h_scale == 0 || v_scale == 0) 474 if (bg_flags & BG_TILE)
457 { 475 {
458 /* if tiling - pixmap has to be sized exactly as the image, 476 /* if tiling - pixmap has to be sized exactly as the image,
459 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! */
460 new_pmap_width = min (result->width, target_width); 478 new_pmap_width = min (result->width, target_width);
461 new_pmap_height = min (result->height, target_height); 479 new_pmap_height = min (result->height, target_height);
… …
486 layers[0].clip_width = target_width; 504 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 505 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 506 layers[0].tint = background_tint;
489 layers[1].im = result; 507 layers[1].im = result;
490 508
491 if (h_scale == 0 || v_scale == 0) 509 if (bg_flags & BG_TILE)
492 { 510 {
493 /* tile horizontally */ 511 /* tile horizontally */
494 while (x > 0) x -= (int)result->width; 512 while (x > 0) x -= (int)result->width;
495 layers[1].dst_x = x; 513 layers[1].dst_x = x;
496 layers[1].clip_width = result->width+target_width; 514 layers[1].clip_width = result->width+target_width;
… …
500 /* clip horizontally */ 518 /* clip horizontally */
501 layers[1].dst_x = x; 519 layers[1].dst_x = x;
502 layers[1].clip_width = result->width; 520 layers[1].clip_width = result->width;
503 } 521 }
504 522
505 if (h_scale == 0 || v_scale == 0) 523 if (bg_flags & BG_TILE)
506 { 524 {
507 while (y > 0) y -= (int)result->height; 525 while (y > 0) y -= (int)result->height;
508 layers[1].dst_y = y; 526 layers[1].dst_y = y;
509 layers[1].clip_height = result->height + target_height; 527 layers[1].clip_height = result->height + target_height;
510 } 528 }
… …
560 578
561 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;
562 int dst_width = result->width, dst_height = result->height; 580 int dst_width = result->width, dst_height = result->height;
563 if (background == NULL) 581 if (background == NULL)
564 { 582 {
565 if (!(h_scale == 0 || v_scale == 0)) 583 if (!(bg_flags & BG_TILE))
566 { 584 {
567 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 );
568 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);
569 } 587 }
570 588
… …
616 else if (depth == 15 || depth == 16) 634 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2; 635 bytes_per_pixel = 2;
618 else 636 else
619 return false; 637 return false;
620 638
621 width_r = rxvt_popcount (visual->red_mask); 639 width_r = ecb_popcount32 (visual->red_mask);
622 width_g = rxvt_popcount (visual->green_mask); 640 width_g = ecb_popcount32 (visual->green_mask);
623 width_b = rxvt_popcount (visual->blue_mask); 641 width_b = ecb_popcount32 (visual->blue_mask);
624 642
625 if (width_r > 8 || width_g > 8 || width_b > 8) 643 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false; 644 return false;
627 645
628 sh_r = rxvt_ctz (visual->red_mask); 646 sh_r = ecb_ctz32 (visual->red_mask);
629 sh_g = rxvt_ctz (visual->green_mask); 647 sh_g = ecb_ctz32 (visual->green_mask);
630 sh_b = rxvt_ctz (visual->blue_mask); 648 sh_b = ecb_ctz32 (visual->blue_mask);
631 649
632 if (width > INT_MAX / height / bytes_per_pixel) 650 if (width > INT_MAX / height / bytes_per_pixel)
633 return false; 651 return false;
634 652
635 data = (char *)malloc (width * height * bytes_per_pixel); 653 data = (char *)malloc (width * height * bytes_per_pixel);
… …
642 { 660 {
643 free (data); 661 free (data);
644 return false; 662 return false;
645 } 663 }
646 664
647 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 665 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
648 666
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 667 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf); 668 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 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;
652 line = data; 670 line = data;
… …
705 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
706 724
707 if (!(bg_flags & BG_ROOT_ALIGN) 725 if (!(bg_flags & BG_ROOT_ALIGN)
708 && (x >= target_width 726 && (x >= target_width
709 || y >= target_height 727 || y >= target_height
710 || (x + w <= 0) 728 || x + w <= 0
711 || (y + h <= 0))) 729 || y + h <= 0))
712 return false; 730 return false;
713 731
714 result = pixbuf; 732 result = pixbuf;
715 733
716 if ((w != image_width) 734 if (w != image_width
717 || (h != image_height)) 735 || h != image_height)
718 { 736 {
719 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
720 w, h, 738 w, h,
721 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
722 } 740 }
723 741
742 if (!result)
743 return false;
744
724 bool ret = false; 745 bool ret = false;
725 746
726 if (result)
727 {
728 XGCValues gcv; 747 XGCValues gcv;
729 GC gc; 748 GC gc;
730 Pixmap root_pmap; 749 Pixmap root_pmap;
731 750
732 image_width = gdk_pixbuf_get_width (result); 751 image_width = gdk_pixbuf_get_width (result);
733 image_height = gdk_pixbuf_get_height (result); 752 image_height = gdk_pixbuf_get_height (result);
734 753
735 if (tr_flags) 754 if (tr_flags)
736 { 755 {
737 root_pmap = bg_pixmap; 756 root_pmap = bg_pixmap;
738 bg_pixmap = None; 757 bg_pixmap = None;
758 }
759 else
760 {
761 if (bg_flags & BG_TILE)
739 } 762 {
740 else
741 {
742 if (h_scale == 0 || v_scale == 0)
743 {
744 new_pmap_width = min (image_width, target_width); 763 new_pmap_width = min (image_width, target_width);
745 new_pmap_height = min (image_height, target_height); 764 new_pmap_height = min (image_height, target_height);
746 } 765 }
747 } 766 }
748 767
749 if (bg_pixmap == None 768 if (bg_pixmap == None
750 || bg_pmap_width != new_pmap_width 769 || bg_pmap_width != new_pmap_width
751 || bg_pmap_height != new_pmap_height) 770 || bg_pmap_height != new_pmap_height)
752 { 771 {
753 if (bg_pixmap) 772 if (bg_pixmap)
754 XFreePixmap (dpy, bg_pixmap); 773 XFreePixmap (dpy, bg_pixmap);
755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 774 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
756 bg_pmap_width = new_pmap_width; 775 bg_pmap_width = new_pmap_width;
757 bg_pmap_height = new_pmap_height; 776 bg_pmap_height = new_pmap_height;
758 } 777 }
759 778
760 gcv.foreground = pix_colors[Color_bg]; 779 gcv.foreground = pix_colors[Color_bg];
761 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 780 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
762 781
763 if (h_scale == 0 || v_scale == 0) 782 if (gc)
783 {
784 if (bg_flags & BG_TILE)
764 { 785 {
765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 786 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
766 pixbuf_to_pixmap (result, tile, gc, 787 pixbuf_to_pixmap (result, tile, gc,
767 0, 0, 788 0, 0,
768 0, 0, 789 0, 0,
… …
798 } 819 }
799 820
800#if XRENDER 821#if XRENDER
801 if (tr_flags) 822 if (tr_flags)
802 { 823 {
803 XRenderPictureAttributes pa;
804
805 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825
806 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
807 827
808 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
809 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 828 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
810 829
811 pa.repeat = True; 830 Picture mask = create_xrender_mask (dpy, vt, False, False);
812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
815 XFreePixmap (dpy, mask_pmap);
816 831
817 if (src && dst && mask)
818 {
819 XRenderColor mask_c; 832 XRenderColor mask_c;
820 833
821 mask_c.alpha = 0x8000; 834 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 835 mask_c.red =
823 mask_c.green = 0; 836 mask_c.green =
824 mask_c.blue = 0; 837 mask_c.blue = 0;
825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839
826 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);
827 }
828 841
829 XRenderFreePicture (dpy, src); 842 XRenderFreePicture (dpy, src);
830 XRenderFreePicture (dpy, dst); 843 XRenderFreePicture (dpy, dst);
831 XRenderFreePicture (dpy, mask); 844 XRenderFreePicture (dpy, mask);
832
833 XFreePixmap (dpy, root_pmap);
834 } 845 }
835#endif 846#endif
836 847
837 if (result != pixbuf)
838 g_object_unref (result);
839
840 XFreeGC (dpy, gc); 848 XFreeGC (dpy, gc);
841 849
842 ret = true; 850 ret = true;
843 } 851 }
852
853 if (result != pixbuf)
854 g_object_unref (result);
855
856 if (tr_flags)
857 XFreePixmap (dpy, root_pmap);
844 858
845 return ret; 859 return ret;
846} 860}
847# endif /* HAVE_PIXBUF */ 861# endif /* HAVE_PIXBUF */
848 862
… …
850rxvt_term::bg_set_file (const char *file) 864rxvt_term::bg_set_file (const char *file)
851{ 865{
852 if (!file || !*file) 866 if (!file || !*file)
853 return false; 867 return false;
854 868
869 bool ret = false;
855 if (const char *p = strchr (file, ';')) 870 const char *p = strchr (file, ';');
871
872 if (p)
856 { 873 {
857 size_t len = p - file; 874 size_t len = p - file;
858 char *f = rxvt_temp_buf<char> (len + 1); 875 char *f = rxvt_temp_buf<char> (len + 1);
859 memcpy (f, file, len); 876 memcpy (f, file, len);
860 f[len] = '\0'; 877 f[len] = '\0';
… …
868 if (image) 885 if (image)
869 { 886 {
870 if (original_asim) 887 if (original_asim)
871 safe_asimage_destroy (original_asim); 888 safe_asimage_destroy (original_asim);
872 original_asim = image; 889 original_asim = image;
873 bg_flags |= BG_CLIENT_RENDER; 890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 have_image = true;
875 return true; 891 ret = true;
876 } 892 }
877# endif 893# endif
878 894
879# ifdef HAVE_PIXBUF 895# ifdef HAVE_PIXBUF
880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
881 if (image) 897 if (image)
882 { 898 {
883 if (pixbuf) 899 if (pixbuf)
884 g_object_unref (pixbuf); 900 g_object_unref (pixbuf);
885 pixbuf = image; 901 pixbuf = image;
886 have_image = true; 902 bg_flags |= BG_IS_FROM_FILE;
887 return true; 903 ret = true;
888 } 904 }
889# endif 905# endif
890 906
907 if (ret)
908 {
909 if (p)
910 bg_set_geometry (p + 1);
911 else
912 bg_set_default_geometry ();
913 }
914
891 return false; 915 return ret;
892} 916}
893 917
894# endif /* BG_IMAGE_FROM_FILE */ 918# endif /* BG_IMAGE_FROM_FILE */
895 919
896# ifdef ENABLE_TRANSPARENCY 920# ifdef ENABLE_TRANSPARENCY
… …
932 { 956 {
933 changed = true; 957 changed = true;
934 v_blurRadius = vr; 958 v_blurRadius = vr;
935 } 959 }
936 960
937 if (v_blurRadius == 0 && h_blurRadius == 0) 961 if (h_blurRadius == 0 || v_blurRadius == 0)
938 bg_flags &= ~BG_NEEDS_BLUR; 962 bg_flags &= ~BG_NEEDS_BLUR;
939 else 963 else
940 bg_flags |= BG_NEEDS_BLUR; 964 bg_flags |= BG_NEEDS_BLUR;
941 965
942 return changed; 966 return changed;
943} 967}
944 968
945static inline unsigned long 969void
946compute_tint_shade_flags (rxvt_color *tint, int shade) 970rxvt_term::set_tint_shade_flags ()
947{ 971{
948 unsigned long flags = 0; 972 rgba c;
949 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
950 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
951 974
952 if (tint) 975 bg_flags &= ~BG_TINT_FLAGS;
953 { 976
954 tint->get (c); 977 tint.get (c);
978
955 if (!has_shade 979 if (!has_shade
956 && (c.r <= 0x00ff || c.r >= 0xff00) 980 && (c.r <= 0x00ff || c.r >= 0xff00)
957 && (c.g <= 0x00ff || c.g >= 0xff00) 981 && (c.g <= 0x00ff || c.g >= 0xff00)
958 && (c.b <= 0x00ff || c.b >= 0xff00)) 982 && (c.b <= 0x00ff || c.b >= 0xff00))
959 flags |= rxvt_term::BG_TINT_BITAND; 983 bg_flags |= BG_TINT_BITAND;
960 }
961 984
962 if (has_shade || tint) 985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
963 flags |= rxvt_term::BG_NEEDS_TINT; 989 bg_flags |= BG_NEEDS_TINT;
964
965 return flags;
966} 990}
967 991
968bool 992bool
969rxvt_term::bg_set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
970{ 994{
971 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 995 if (tint != new_tint)
972 { 996 {
973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
974 tint = new_tint; 997 tint = new_tint;
975 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags | BG_TINT_SET; 998 set_tint_shade_flags ();
976 return true; 999 return true;
977 } 1000 }
978 1001
979 return false; 1002 return false;
980} 1003}
981 1004
982bool 1005bool
983rxvt_term::bg_set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
984{ 1007{
985 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
986 1009
987 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
988 if (new_shade < 0) 1011 if (new_shade < 0)
989 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
990 1013
991 if (new_shade != shade) 1014 if (new_shade != shade)
992 { 1015 {
993 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & BG_TINT_SET) ? &tint : NULL, new_shade);
994 shade = new_shade; 1016 shade = new_shade;
995 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags; 1017 set_tint_shade_flags ();
996 return true; 1018 return true;
997 } 1019 }
998 1020
999 return false; 1021 return false;
1000} 1022}
… …
1025bool 1047bool
1026rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1027{ 1049{
1028 bool ret = false; 1050 bool ret = false;
1029#if XRENDER 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1030 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1031 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1032 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1033 1058
1034 XRenderPictureAttributes pa;
1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1036 1060
1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1039 1063
1040 if (kernel && params && src && dst) 1064 if (kernel && params)
1041 { 1065 {
1042 if (h_blurRadius)
1043 {
1044 size = h_blurRadius * 2 + 1; 1066 size = h_blurRadius * 2 + 1;
1045 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1067 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1046 1068
1047 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1069 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1048 XRenderComposite (dpy, 1070 XRenderComposite (dpy,
1049 PictOpSrc, 1071 PictOpSrc,
1050 src, 1072 src,
1051 None, 1073 None,
1052 dst, 1074 dst,
1053 0, 0, 1075 0, 0,
1054 0, 0, 1076 0, 0,
1055 0, 0, 1077 0, 0,
1056 width, height); 1078 width, height);
1057 }
1058 1079
1059 if (v_blurRadius)
1060 {
1061 size = v_blurRadius * 2 + 1; 1080 size = v_blurRadius * 2 + 1;
1062 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1081 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1063 ::swap (params[0], params[1]); 1082 ::swap (params[0], params[1]);
1064 1083
1065 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1084 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1066 XRenderComposite (dpy, 1085 XRenderComposite (dpy,
1067 PictOpSrc, 1086 PictOpSrc,
1068 src, 1087 src,
1069 None, 1088 None,
1070 dst, 1089 dst,
1071 0, 0, 1090 0, 0,
1072 0, 0, 1091 0, 0,
1073 0, 0, 1092 0, 0,
1074 width, height); 1093 width, height);
1075 }
1076 1094
1077 ret = true; 1095 ret = true;
1078 } 1096 }
1079 1097
1080 free (kernel); 1098 free (kernel);
… …
1107 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1125 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1108 ret = true; 1126 ret = true;
1109 XFreeGC (dpy, gc); 1127 XFreeGC (dpy, gc);
1110 } 1128 }
1111 } 1129 }
1112 else
1113 {
1114# if XRENDER 1130# if XRENDER
1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1131 else if (bg_flags & BG_HAS_RENDER)
1132 {
1133 rgba c;
1116 1134
1117 if (bg_flags & BG_TINT_SET)
1118 tint.get (c); 1135 tint.get (c);
1119 1136
1120 if (shade <= 100) 1137 if (shade <= 100)
1121 { 1138 {
1122 c.r = (c.r * shade) / 100; 1139 c.r = c.r * shade / 100;
1123 c.g = (c.g * shade) / 100; 1140 c.g = c.g * shade / 100;
1124 c.b = (c.b * shade) / 100; 1141 c.b = c.b * shade / 100;
1125 } 1142 }
1126 else 1143 else
1127 { 1144 {
1128 c.r = (c.r * (200 - shade)) / 100; 1145 c.r = c.r * (200 - shade) / 100;
1129 c.g = (c.g * (200 - shade)) / 100; 1146 c.g = c.g * (200 - shade) / 100;
1130 c.b = (c.b * (200 - shade)) / 100; 1147 c.b = c.b * (200 - shade) / 100;
1131 } 1148 }
1132 1149
1133 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1134 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1135 XRenderPictureAttributes pa;
1136 1151
1137 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1152 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1138 1153
1139 pa.repeat = True; 1154 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1140 1155
1141 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1156 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1142 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1143 XFreePixmap (dpy, overlay_pmap);
1144 1157
1145 pa.component_alpha = True;
1146 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1147 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1148 XFreePixmap (dpy, mask_pmap);
1149
1150 if (mask_pic && overlay_pic && back_pic)
1151 {
1152 XRenderColor mask_c; 1158 XRenderColor mask_c;
1153 1159
1154 mask_c.red = mask_c.green = mask_c.blue = 0;
1155 mask_c.alpha = 0xffff; 1160 mask_c.alpha = 0xffff;
1161 mask_c.red =
1162 mask_c.green =
1163 mask_c.blue = 0;
1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1165
1166 mask_c.alpha = 0;
1167 mask_c.red = 0xffff - c.r;
1168 mask_c.green = 0xffff - c.g;
1169 mask_c.blue = 0xffff - c.b;
1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1171
1172 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1173
1174 if (shade > 100)
1175 {
1176 mask_c.alpha = 0;
1177 mask_c.red =
1178 mask_c.green =
1179 mask_c.blue = 0xffff * (shade - 100) / 100;
1156 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1157 1181
1158 mask_c.alpha = 0;
1159 mask_c.red = 0xffff - c.r;
1160 mask_c.green = 0xffff - c.g;
1161 mask_c.blue = 0xffff - c.b;
1162 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1163 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1164
1165 if (shade > 100)
1166 {
1167 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1168 mask_c.alpha = 0;
1169 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1170
1171 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);
1172 } 1183 }
1173 1184
1174 ret = true; 1185 ret = true;
1175 }
1176 1186
1177 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1178 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1179 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1180# endif 1191# endif
1181 }
1182 1192
1183 return ret; 1193 return ret;
1184} 1194}
1185 1195
1186/* make_transparency_pixmap() 1196/*
1187 * Builds a pixmap of the same size as the terminal window that contains 1197 * Builds a pixmap of the same size as the terminal window that contains
1188 * the tiled portion of the root pixmap that is supposed to be covered by 1198 * the tiled portion of the root pixmap that is supposed to be covered by
1189 * our window. 1199 * our window.
1190 */ 1200 */
1191unsigned long 1201unsigned long
… …
1235 if (root_pixmap != None && root_depth != depth) 1245 if (root_pixmap != None && root_depth != depth)
1236 { 1246 {
1237#if XRENDER 1247#if XRENDER
1238 if (bg_flags & BG_HAS_RENDER) 1248 if (bg_flags & BG_HAS_RENDER)
1239 { 1249 {
1240 XRenderPictureAttributes pa; 1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1241 1251
1242 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1252 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1243 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1253 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1244 1254
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1255 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1247 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1256 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1248 1257
1249 if (src && dst)
1250 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1258 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1251 else
1252 {
1253 XFreePixmap (dpy, recoded_root_pmap);
1254 root_pixmap = None;
1255 }
1256 1259
1257 XRenderFreePicture (dpy, src); 1260 XRenderFreePicture (dpy, src);
1258 XRenderFreePicture (dpy, dst); 1261 XRenderFreePicture (dpy, dst);
1259 } 1262 }
1260 else 1263 else
1261#endif 1264#endif
1262 root_pixmap = None; 1265 recoded_root_pmap = None;
1263 } 1266 }
1264 1267
1265 if (root_pixmap == None) 1268 if (recoded_root_pmap == None)
1266 return 0; 1269 return 0;
1267 1270
1268 if (bg_pixmap == None 1271 if (bg_pixmap == None
1269 || bg_pmap_width != window_width 1272 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height) 1273 || bg_pmap_height != window_height)
… …
1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1277 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1275 bg_pmap_width = window_width; 1278 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1279 bg_pmap_height = window_height;
1277 } 1280 }
1278 1281
1279 if (bg_pixmap == None)
1280 return 0;
1281
1282 /* straightforward pixmap copy */ 1282 /* straightforward pixmap copy */
1283 while (sx < 0) sx += (int)root_width; 1283 while (sx < 0) sx += root_pmap_width;
1284 while (sy < 0) sy += (int)root_height; 1284 while (sy < 0) sy += root_pmap_height;
1285 1285
1286 gcv.tile = recoded_root_pmap; 1286 gcv.tile = recoded_root_pmap;
1287 gcv.fill_style = FillTiled; 1287 gcv.fill_style = FillTiled;
1288 gcv.ts_x_origin = -sx; 1288 gcv.ts_x_origin = -sx;
1289 gcv.ts_y_origin = -sy; 1289 gcv.ts_y_origin = -sy;
… …
1291 1291
1292 if (gc) 1292 if (gc)
1293 { 1293 {
1294 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1294 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1295 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1295 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1296 XFreeGC (dpy, gc);
1297 1296
1298 if (!(bg_flags & BG_CLIENT_RENDER)) 1297 if (!(bg_flags & BG_CLIENT_RENDER))
1299 { 1298 {
1300 if ((bg_flags & BG_NEEDS_BLUR) 1299 if (bg_flags & BG_NEEDS_BLUR)
1301 && (bg_flags & BG_HAS_RENDER_CONV))
1302 { 1300 {
1303 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1301 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1304 result &= ~BG_NEEDS_BLUR; 1302 result &= ~BG_NEEDS_BLUR;
1305 } 1303 }
1306 if ((bg_flags & BG_NEEDS_TINT) 1304 if (bg_flags & BG_NEEDS_TINT)
1307 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1308 { 1305 {
1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1310 result &= ~BG_NEEDS_TINT; 1307 result &= ~BG_NEEDS_TINT;
1311 } 1308 }
1309# ifndef HAVE_AFTERIMAGE
1310 if (result & BG_NEEDS_TINT)
1311 {
1312 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1313 if (ximage)
1314 {
1315 /* our own client-side tinting */
1316 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1317
1318 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1319 XDestroyImage (ximage);
1320 }
1321 }
1322# endif
1312 } /* server side rendering completed */ 1323 } /* server side rendering completed */
1324
1325 XFreeGC (dpy, gc);
1313 } 1326 }
1314 1327
1315 if (recoded_root_pmap != root_pixmap) 1328 if (recoded_root_pmap != root_pixmap)
1316 XFreePixmap (dpy, recoded_root_pmap); 1329 XFreePixmap (dpy, recoded_root_pmap);
1317 1330
… …
1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1339 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1327 1340
1328 root_pixmap = new_root_pixmap; 1341 root_pixmap = new_root_pixmap;
1329} 1342}
1330# endif /* ENABLE_TRANSPARENCY */ 1343# endif /* ENABLE_TRANSPARENCY */
1331
1332#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1333static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1334# endif
1335 1344
1336bool 1345bool
1337rxvt_term::bg_render () 1346rxvt_term::bg_render ()
1338{ 1347{
1339 unsigned long tr_flags = 0; 1348 unsigned long tr_flags = 0;
… …
1344 { 1353 {
1345 /* we need to re-generate transparency pixmap in that case ! */ 1354 /* we need to re-generate transparency pixmap in that case ! */
1346 tr_flags = make_transparency_pixmap (); 1355 tr_flags = make_transparency_pixmap ();
1347 if (tr_flags == 0) 1356 if (tr_flags == 0)
1348 return false; 1357 return false;
1349 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1350 bg_flags |= BG_IS_VALID; 1358 bg_flags |= BG_IS_VALID;
1351 } 1359 }
1352# endif 1360# endif
1353 1361
1354# ifdef BG_IMAGE_FROM_FILE 1362# ifdef BG_IMAGE_FROM_FILE
1355 if (have_image 1363 if ((bg_flags & BG_IS_FROM_FILE)
1356 || (tr_flags & BG_EFFECTS_FLAGS)) 1364 || (tr_flags & BG_EFFECTS_FLAGS))
1357 { 1365 {
1358 if (render_image (tr_flags)) 1366 if (render_image (tr_flags))
1359 bg_flags |= BG_IS_VALID; 1367 bg_flags |= BG_IS_VALID;
1360 } 1368 }
1361# endif 1369# endif
1362 1370
1363# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1364 XImage *result = NULL;
1365
1366 if (tr_flags && !(bg_flags & BG_IS_VALID))
1367 {
1368 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1369 }
1370
1371 if (result)
1372 {
1373 /* our own client-side tinting */
1374 if (tr_flags & BG_NEEDS_TINT)
1375 {
1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1377 if (bg_flags & BG_TINT_SET)
1378 tint.get (c);
1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1380 }
1381
1382 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1383
1384 if (gc)
1385 {
1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1387
1388 XFreeGC (dpy, gc);
1389 bg_flags |= BG_IS_VALID;
1390 }
1391
1392 XDestroyImage (result);
1393 }
1394# endif
1395
1396 if (!(bg_flags & BG_IS_VALID)) 1371 if (!(bg_flags & BG_IS_VALID))
1397 { 1372 {
1398 if (bg_pixmap != None) 1373 if (bg_pixmap != None)
1399 { 1374 {
1400 XFreePixmap (dpy, bg_pixmap); 1375 XFreePixmap (dpy, bg_pixmap);
… …
1412 1387
1413void 1388void
1414rxvt_term::bg_init () 1389rxvt_term::bg_init ()
1415{ 1390{
1416#ifdef ENABLE_TRANSPARENCY 1391#ifdef ENABLE_TRANSPARENCY
1392 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1393 tint.set (this, c);
1417 shade = 100; 1394 shade = 100;
1418#endif 1395#endif
1419 1396
1420 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1397 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1421#if XRENDER 1398#if XRENDER
… …
1435} 1412}
1436 1413
1437#endif /* HAVE_BG_PIXMAP */ 1414#endif /* HAVE_BG_PIXMAP */
1438 1415
1439#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1416#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1440/* taken from aterm-0.4.2 */ 1417/* based on code from aterm-0.4.2 */
1441 1418
1442static void 1419static inline void
1443shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1420fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1421{
1422 for (int i = 0; i <= mask >> sh; i++)
1423 {
1424 uint32_t tmp;
1425 tmp = i * high;
1426 tmp += (mask >> sh) * low;
1427 lookup[i] = (tmp / 0xffff) << sh;
1428 }
1429}
1430
1431void
1432rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1444{ 1433{
1445 int sh_r, sh_g, sh_b; 1434 int sh_r, sh_g, sh_b;
1446 uint32_t mask_r, mask_g, mask_b; 1435 uint32_t mask_r, mask_g, mask_b;
1447 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1436 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1448 rgba low; 1437 unsigned short low;
1449 rgba high;
1450 int i;
1451 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1438 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1452 1439
1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1440 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1454 1441
1455 /* for convenience */ 1442 /* for convenience */
1456 mask_r = visual->red_mask; 1443 mask_r = visual->red_mask;
… …
1514 break; 1501 break;
1515 default: 1502 default:
1516 return; /* we do not support this color depth */ 1503 return; /* we do not support this color depth */
1517 } 1504 }
1518 1505
1506 rgba c;
1507
1508 tint.get (c);
1509
1519 /* prepare limits for color transformation (each channel is handled separately) */ 1510 /* prepare limits for color transformation (each channel is handled separately) */
1520 if (shade > 100) 1511 if (shade > 100)
1521 { 1512 {
1522 shade = 200 - shade;
1523
1524 high.r = c.r * shade / 100;
1525 high.g = c.g * shade / 100;
1526 high.b = c.b * shade / 100;
1527
1528 low.r = 65535 * (100 - shade) / 100; 1513 c.r = c.r * (200 - shade) / 100;
1529 low.g = 65535 * (100 - shade) / 100; 1514 c.g = c.g * (200 - shade) / 100;
1530 low.b = 65535 * (100 - shade) / 100; 1515 c.b = c.b * (200 - shade) / 100;
1516
1517 low = 0xffff * (shade - 100) / 100;
1531 } 1518 }
1532 else 1519 else
1533 { 1520 {
1534 high.r = c.r * shade / 100; 1521 c.r = c.r * shade / 100;
1535 high.g = c.g * shade / 100; 1522 c.g = c.g * shade / 100;
1536 high.b = c.b * shade / 100; 1523 c.b = c.b * shade / 100;
1537 1524
1538 low.r = low.g = low.b = 0; 1525 low = 0;
1539 } 1526 }
1540 1527
1541 /* fill our lookup tables */ 1528 /* fill our lookup tables */
1542 for (i = 0; i <= mask_r>>sh_r; i++) 1529 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1543 { 1530 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1544 uint32_t tmp; 1531 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1545 tmp = i * high.r;
1546 tmp += (mask_r>>sh_r) * low.r;
1547 lookup_r[i] = (tmp/65535)<<sh_r;
1548 }
1549 for (i = 0; i <= mask_g>>sh_g; i++)
1550 {
1551 uint32_t tmp;
1552 tmp = i * high.g;
1553 tmp += (mask_g>>sh_g) * low.g;
1554 lookup_g[i] = (tmp/65535)<<sh_g;
1555 }
1556 for (i = 0; i <= mask_b>>sh_b; i++)
1557 {
1558 uint32_t tmp;
1559 tmp = i * high.b;
1560 tmp += (mask_b>>sh_b) * low.b;
1561 lookup_b[i] = (tmp/65535)<<sh_b;
1562 }
1563 1532
1564 /* apply table to input image (replacing colors by newly calculated ones) */ 1533 /* apply table to input image (replacing colors by newly calculated ones) */
1565 if (ximage->bits_per_pixel == 32 1534 if (ximage->bits_per_pixel == 32
1566 && (ximage->depth == 24 || ximage->depth == 32) 1535 && (ximage->depth == 24 || ximage->depth == 32)
1567 && ximage->byte_order == host_byte_order) 1536 && ximage->byte_order == host_byte_order)

Diff Legend

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