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.172 by sf-exg, Tue Aug 30 15:00:27 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;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 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_PROP_SCALE;
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=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
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_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
239 286
240 if (!update) 287 if (!update)
241 { 288 {
242 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
252 w = h; 299 w = h;
253 300
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 302 }
256 303
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; 304 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; 305 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; 306 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; 307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
314 308
… …
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 320{
327 int target_width = szHint.width; 321 int target_width = szHint.width;
328 int target_height = szHint.height; 322 int target_height = szHint.height;
329 323
324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
330 if (bg_flags & BG_PROP_SCALE) 327 if (bg_flags & BG_PROP_SCALE)
331 { 328 {
332 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
336 } 333 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 334
343 if (!w) w = image_width; 335 if (!w) w = image_width;
344 if (!h) h = image_height; 336 if (!h) h = image_height;
345 337
346 if (bg_flags & BG_ROOT_ALIGN) 338 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 345 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
355 } 347 }
356 348
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 350 if (!(bg_flags & BG_TILE)
351 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 355}
363 356
… …
390 } 383 }
391 384
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 386 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 390 if (tmp)
398 { 391 {
399 destroy_asimage (&background); 392 destroy_asimage (&background);
400 background = tmp; 393 background = tmp;
… …
419 412
420 if (!original_asim 413 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 414 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 415 && (x >= target_width
423 || y >= target_height 416 || y >= target_height
424 || (x + w <= 0) 417 || x + w <= 0
425 || (y + h <= 0)))) 418 || y + h <= 0)))
426 { 419 {
427 if (background) 420 if (background)
428 { 421 {
429 new_pmap_width = background->width; 422 new_pmap_width = background->width;
430 new_pmap_height = background->height; 423 new_pmap_height = background->height;
… …
444 } 437 }
445 else 438 else
446 { 439 {
447 result = original_asim; 440 result = original_asim;
448 441
449 if ((w != original_asim->width) 442 if (w != original_asim->width
450 || (h != original_asim->height)) 443 || h != original_asim->height)
451 { 444 {
452 result = scale_asimage (asv, original_asim, 445 result = scale_asimage (asv, original_asim,
453 w, h, 446 w, h,
454 background ? ASA_ASImage : ASA_XImage, 447 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
456 } 449 }
457 450
458 if (background == NULL) 451 if (background == NULL)
459 { 452 {
460 if (h_scale == 0 || v_scale == 0) 453 if (bg_flags & BG_TILE)
461 { 454 {
462 /* if tiling - pixmap has to be sized exactly as the image, 455 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 456 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 457 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 458 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 483 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 484 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 485 layers[0].tint = background_tint;
493 layers[1].im = result; 486 layers[1].im = result;
494 487
495 if (h_scale == 0 || v_scale == 0) 488 if (bg_flags & BG_TILE)
496 { 489 {
497 /* tile horizontally */ 490 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 491 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 492 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 493 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 497 /* clip horizontally */
505 layers[1].dst_x = x; 498 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 499 layers[1].clip_width = result->width;
507 } 500 }
508 501
509 if (h_scale == 0 || v_scale == 0) 502 if (bg_flags & BG_TILE)
510 { 503 {
511 while (y > 0) y -= (int)result->height; 504 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 505 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 506 layers[1].clip_height = result->height + target_height;
514 } 507 }
… …
564 557
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 558 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 559 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 560 if (background == NULL)
568 { 561 {
569 if (!(h_scale == 0 || v_scale == 0)) 562 if (!(bg_flags & BG_TILE))
570 { 563 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 564 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); 565 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 566 }
574 567
… …
620 else if (depth == 15 || depth == 16) 613 else if (depth == 15 || depth == 16)
621 bytes_per_pixel = 2; 614 bytes_per_pixel = 2;
622 else 615 else
623 return false; 616 return false;
624 617
625 width_r = rxvt_popcount (visual->red_mask); 618 width_r = ecb_popcount32 (visual->red_mask);
626 width_g = rxvt_popcount (visual->green_mask); 619 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = rxvt_popcount (visual->blue_mask); 620 width_b = ecb_popcount32 (visual->blue_mask);
628 621
629 if (width_r > 8 || width_g > 8 || width_b > 8) 622 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false; 623 return false;
631 624
632 sh_r = rxvt_ctz (visual->red_mask); 625 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = rxvt_ctz (visual->green_mask); 626 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = rxvt_ctz (visual->blue_mask); 627 sh_b = ecb_ctz32 (visual->blue_mask);
635 628
636 if (width > INT_MAX / height / bytes_per_pixel) 629 if (width > INT_MAX / height / bytes_per_pixel)
637 return false; 630 return false;
638 631
639 data = (char *)malloc (width * height * bytes_per_pixel); 632 data = (char *)malloc (width * height * bytes_per_pixel);
… …
646 { 639 {
647 free (data); 640 free (data);
648 return false; 641 return false;
649 } 642 }
650 643
651 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 644 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
652 645
653 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 646 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
654 channels = gdk_pixbuf_get_n_channels (pixbuf); 647 channels = gdk_pixbuf_get_n_channels (pixbuf);
655 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 648 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
656 line = data; 649 line = data;
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
710 703
711 if (!(bg_flags & BG_ROOT_ALIGN) 704 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 705 && (x >= target_width
713 || y >= target_height 706 || y >= target_height
714 || (x + w <= 0) 707 || x + w <= 0
715 || (y + h <= 0))) 708 || y + h <= 0))
716 return false; 709 return false;
717 710
718 result = pixbuf; 711 result = pixbuf;
719 712
720 if ((w != image_width) 713 if (w != image_width
721 || (h != image_height)) 714 || h != image_height)
722 { 715 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 717 w, h,
725 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
726 } 719 }
… …
742 root_pmap = bg_pixmap; 735 root_pmap = bg_pixmap;
743 bg_pixmap = None; 736 bg_pixmap = None;
744 } 737 }
745 else 738 else
746 { 739 {
747 if (h_scale == 0 || v_scale == 0) 740 if (bg_flags & BG_TILE)
748 { 741 {
749 new_pmap_width = min (image_width, target_width); 742 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 743 new_pmap_height = min (image_height, target_height);
751 } 744 }
752 } 745 }
… …
760 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 753 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
761 bg_pmap_width = new_pmap_width; 754 bg_pmap_width = new_pmap_width;
762 bg_pmap_height = new_pmap_height; 755 bg_pmap_height = new_pmap_height;
763 } 756 }
764 757
765 if (bg_pixmap != None)
766 {
767 gcv.foreground = pix_colors[Color_bg]; 758 gcv.foreground = pix_colors[Color_bg];
768 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 759 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
769 760
770 if (gc) 761 if (gc)
771 { 762 {
772 if (h_scale == 0 || v_scale == 0) 763 if (bg_flags & BG_TILE)
773 { 764 {
774 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
775
776 if (tile != None)
777 {
778 pixbuf_to_pixmap (result, tile, gc, 766 pixbuf_to_pixmap (result, tile, gc,
779 0, 0, 767 0, 0,
780 0, 0, 768 0, 0,
781 image_width, image_height); 769 image_width, image_height);
782 770
783 gcv.tile = tile; 771 gcv.tile = tile;
784 gcv.fill_style = FillTiled; 772 gcv.fill_style = FillTiled;
785 gcv.ts_x_origin = x; 773 gcv.ts_x_origin = x;
786 gcv.ts_y_origin = y; 774 gcv.ts_y_origin = y;
787 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 775 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
788 776
789 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 777 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
790 XFreePixmap (dpy, tile); 778 XFreePixmap (dpy, tile);
791 }
792 } 779 }
793 else 780 else
794 { 781 {
795 int src_x, src_y, dst_x, dst_y; 782 int src_x, src_y, dst_x, dst_y;
796 int dst_width, dst_height; 783 int dst_width, dst_height;
797 784
798 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width ); 785 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); 786 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
800 787
801 if (dst_x > 0 || dst_y > 0 788 if (dst_x > 0 || dst_y > 0
802 || dst_x + dst_width < new_pmap_width 789 || dst_x + dst_width < new_pmap_width
803 || dst_y + dst_height < new_pmap_height) 790 || dst_y + dst_height < new_pmap_height)
804 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 791 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
805 792
806 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 793 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
807 pixbuf_to_pixmap (result, bg_pixmap, gc, 794 pixbuf_to_pixmap (result, bg_pixmap, gc,
808 src_x, src_y, 795 src_x, src_y,
809 dst_x, dst_y, 796 dst_x, dst_y,
810 dst_width, dst_height); 797 dst_width, dst_height);
811 } 798 }
812 799
813#if XRENDER 800#if XRENDER
814 if (tr_flags) 801 if (tr_flags)
815 { 802 {
816 XRenderPictureAttributes pa; 803 XRenderPictureAttributes pa;
817 804
818 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 805 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
819 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 806 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
820 807
821 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 808 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
822 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 809 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
823 810
824 pa.repeat = True; 811 pa.repeat = True;
825 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); 812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
826 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
827 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
828 XFreePixmap (dpy, mask_pmap); 815 XFreePixmap (dpy, mask_pmap);
829 816
830 if (src && dst && mask)
831 {
832 XRenderColor mask_c; 817 XRenderColor mask_c;
833 818
834 mask_c.alpha = 0x8000; 819 mask_c.alpha = 0x8000;
835 mask_c.red = 0; 820 mask_c.red = 0;
836 mask_c.green = 0; 821 mask_c.green = 0;
837 mask_c.blue = 0; 822 mask_c.blue = 0;
838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 823 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); 824 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
840 }
841 825
842 XRenderFreePicture (dpy, src); 826 XRenderFreePicture (dpy, src);
843 XRenderFreePicture (dpy, dst); 827 XRenderFreePicture (dpy, dst);
844 XRenderFreePicture (dpy, mask); 828 XRenderFreePicture (dpy, mask);
845 } 829 }
846#endif 830#endif
847 831
848 XFreeGC (dpy, gc); 832 XFreeGC (dpy, gc);
849 833
850 ret = true; 834 ret = true;
851 }
852 } 835 }
853 836
854 if (result != pixbuf) 837 if (result != pixbuf)
855 g_object_unref (result); 838 g_object_unref (result);
856 839
… …
865rxvt_term::bg_set_file (const char *file) 848rxvt_term::bg_set_file (const char *file)
866{ 849{
867 if (!file || !*file) 850 if (!file || !*file)
868 return false; 851 return false;
869 852
853 bool ret = false;
870 if (const char *p = strchr (file, ';')) 854 const char *p = strchr (file, ';');
855
856 if (p)
871 { 857 {
872 size_t len = p - file; 858 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 859 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 860 memcpy (f, file, len);
875 f[len] = '\0'; 861 f[len] = '\0';
… …
884 { 870 {
885 if (original_asim) 871 if (original_asim)
886 safe_asimage_destroy (original_asim); 872 safe_asimage_destroy (original_asim);
887 original_asim = image; 873 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 874 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 875 ret = true;
890 } 876 }
891# endif 877# endif
892 878
893# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
896 { 882 {
897 if (pixbuf) 883 if (pixbuf)
898 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
899 pixbuf = image; 885 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 886 bg_flags |= BG_IS_FROM_FILE;
901 return true; 887 ret = true;
902 } 888 }
903# endif 889# endif
904 890
891 if (ret)
892 {
893 if (p)
894 bg_set_geometry (p + 1);
895 else
896 bg_set_default_geometry ();
897 }
898
905 return false; 899 return ret;
906} 900}
907 901
908# endif /* BG_IMAGE_FROM_FILE */ 902# endif /* BG_IMAGE_FROM_FILE */
909 903
910# ifdef ENABLE_TRANSPARENCY 904# ifdef ENABLE_TRANSPARENCY
… …
1047 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1041 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1048 1042
1049 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1043 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1050 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1044 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1051 1045
1052 if (kernel && params && src && dst) 1046 if (kernel && params)
1053 { 1047 {
1054 if (h_blurRadius) 1048 if (h_blurRadius)
1055 { 1049 {
1056 size = h_blurRadius * 2 + 1; 1050 size = h_blurRadius * 2 + 1;
1057 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1051 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1157 pa.component_alpha = True; 1151 pa.component_alpha = True;
1158 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1152 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1159 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa); 1153 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1160 XFreePixmap (dpy, mask_pmap); 1154 XFreePixmap (dpy, mask_pmap);
1161 1155
1162 if (mask_pic && overlay_pic && back_pic)
1163 {
1164 XRenderColor mask_c; 1156 XRenderColor mask_c;
1165 1157
1166 mask_c.alpha = 0xffff; 1158 mask_c.alpha = 0xffff;
1167 mask_c.red = 1159 mask_c.red =
1168 mask_c.green = 1160 mask_c.green =
1169 mask_c.blue = 0; 1161 mask_c.blue = 0;
1162 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1163
1164 mask_c.alpha = 0;
1165 mask_c.red = 0xffff - c.r;
1166 mask_c.green = 0xffff - c.g;
1167 mask_c.blue = 0xffff - c.b;
1168 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1169 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1170
1171 if (shade > 100)
1172 {
1173 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1174 mask_c.alpha = 0;
1170 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1175 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1171 1176
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); 1177 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1186 } 1178 }
1187 1179
1188 ret = true; 1180 ret = true;
1189 }
1190 1181
1191 XRenderFreePicture (dpy, mask_pic); 1182 XRenderFreePicture (dpy, mask_pic);
1192 XRenderFreePicture (dpy, overlay_pic); 1183 XRenderFreePicture (dpy, overlay_pic);
1193 XRenderFreePicture (dpy, back_pic); 1184 XRenderFreePicture (dpy, back_pic);
1194# endif 1185# endif
… …
1251#if XRENDER 1242#if XRENDER
1252 if (bg_flags & BG_HAS_RENDER) 1243 if (bg_flags & BG_HAS_RENDER)
1253 { 1244 {
1254 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1255 1246
1256 if (recoded_root_pmap != None)
1257 {
1258 XRenderPictureAttributes pa; 1247 XRenderPictureAttributes pa;
1259 1248
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1249 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1250 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1262 1251
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1252 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1253 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1265 1254
1266 if (src && dst)
1267 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1255 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 1256
1274 XRenderFreePicture (dpy, src); 1257 XRenderFreePicture (dpy, src);
1275 XRenderFreePicture (dpy, dst); 1258 XRenderFreePicture (dpy, dst);
1276 }
1277 } 1259 }
1278 else 1260 else
1279#endif 1261#endif
1280 recoded_root_pmap = None; 1262 recoded_root_pmap = None;
1281 } 1263 }
… …
1292 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1293 bg_pmap_width = window_width; 1275 bg_pmap_width = window_width;
1294 bg_pmap_height = window_height; 1276 bg_pmap_height = window_height;
1295 } 1277 }
1296 1278
1297 if (bg_pixmap != None)
1298 {
1299 /* straightforward pixmap copy */ 1279 /* straightforward pixmap copy */
1300 while (sx < 0) sx += root_width; 1280 while (sx < 0) sx += root_width;
1301 while (sy < 0) sy += root_height; 1281 while (sy < 0) sy += root_height;
1302 1282
1303 gcv.tile = recoded_root_pmap; 1283 gcv.tile = recoded_root_pmap;
1304 gcv.fill_style = FillTiled; 1284 gcv.fill_style = FillTiled;
1305 gcv.ts_x_origin = -sx; 1285 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1286 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1287 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1288
1309 if (gc) 1289 if (gc)
1310 { 1290 {
1311 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1291 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1312 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1292 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1313 XFreeGC (dpy, gc); 1293 XFreeGC (dpy, gc);
1314 1294
1315 if (!(bg_flags & BG_CLIENT_RENDER)) 1295 if (!(bg_flags & BG_CLIENT_RENDER))
1316 { 1296 {
1317 if ((bg_flags & BG_NEEDS_BLUR) 1297 if ((bg_flags & BG_NEEDS_BLUR)
1318 && (bg_flags & BG_HAS_RENDER_CONV)) 1298 && (bg_flags & BG_HAS_RENDER_CONV))
1319 { 1299 {
1320 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1300 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1321 result &= ~BG_NEEDS_BLUR; 1301 result &= ~BG_NEEDS_BLUR;
1322 } 1302 }
1323 if ((bg_flags & BG_NEEDS_TINT) 1303 if ((bg_flags & BG_NEEDS_TINT)
1324 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER))) 1304 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1325 { 1305 {
1326 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1327 result &= ~BG_NEEDS_TINT; 1307 result &= ~BG_NEEDS_TINT;
1328 } 1308 }
1329 } /* server side rendering completed */ 1309 } /* server side rendering completed */
1330 }
1331 } 1310 }
1332 1311
1333 if (recoded_root_pmap != root_pixmap) 1312 if (recoded_root_pmap != root_pixmap)
1334 XFreePixmap (dpy, recoded_root_pmap); 1313 XFreePixmap (dpy, recoded_root_pmap);
1335 1314
… …
1362 { 1341 {
1363 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1364 tr_flags = make_transparency_pixmap (); 1343 tr_flags = make_transparency_pixmap ();
1365 if (tr_flags == 0) 1344 if (tr_flags == 0)
1366 return false; 1345 return false;
1367 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1368 bg_flags |= BG_IS_VALID; 1346 bg_flags |= BG_IS_VALID;
1369 } 1347 }
1370# endif 1348# endif
1371 1349
1372# ifdef BG_IMAGE_FROM_FILE 1350# ifdef BG_IMAGE_FROM_FILE
1373 if ((bg_flags & BG_IS_FROM_FILE) 1351 if ((bg_flags & BG_IS_FROM_FILE)
… …
1379# endif 1357# endif
1380 1358
1381# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1359# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1382 XImage *result = NULL; 1360 XImage *result = NULL;
1383 1361
1384 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1362 if (tr_flags & BG_NEEDS_TINT)
1385 { 1363 {
1386 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1364 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1387 } 1365 }
1388 1366
1389 if (result) 1367 if (result)
1390 { 1368 {
1391 /* our own client-side tinting */ 1369 /* our own client-side tinting */
1392 if (tr_flags & BG_NEEDS_TINT) 1370 //if (tr_flags & BG_NEEDS_TINT)
1371 if (1)
1393 { 1372 {
1394 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1395 if (bg_flags & BG_TINT_SET) 1374 if (bg_flags & BG_TINT_SET)
1396 tint.get (c); 1375 tint.get (c);
1397 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1402 if (gc) 1381 if (gc)
1403 { 1382 {
1404 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1405 1384
1406 XFreeGC (dpy, gc); 1385 XFreeGC (dpy, gc);
1407 bg_flags |= BG_IS_VALID;
1408 } 1386 }
1409 1387
1410 XDestroyImage (result); 1388 XDestroyImage (result);
1411 } 1389 }
1412# endif 1390# endif
… …
1453} 1431}
1454 1432
1455#endif /* HAVE_BG_PIXMAP */ 1433#endif /* HAVE_BG_PIXMAP */
1456 1434
1457#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1435#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458/* taken from aterm-0.4.2 */ 1436/* based on code from aterm-0.4.2 */
1459 1437
1460static void 1438static void
1461shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1439shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1462{ 1440{
1463 int sh_r, sh_g, sh_b; 1441 int sh_r, sh_g, sh_b;
1464 uint32_t mask_r, mask_g, mask_b; 1442 uint32_t mask_r, mask_g, mask_b;
1465 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1443 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1466 rgba low; 1444 rgba low;
1467 rgba high; 1445 rgba high;
1468 int i; 1446 int i;
1469 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1447 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1470 1448
1471 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1449 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1472 1450
1473 /* for convenience */ 1451 /* for convenience */
1474 mask_r = visual->red_mask; 1452 mask_r = visual->red_mask;

Diff Legend

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