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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.154 by sf-exg, Mon May 9 16:35:37 2011 UTC vs.
Revision 1.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 }
… …
765 gcv.foreground = pix_colors[Color_bg]; 761 gcv.foreground = pix_colors[Color_bg];
766 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 762 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
767 763
768 if (gc) 764 if (gc)
769 { 765 {
770 if (h_scale == 0 || v_scale == 0) 766 if (bg_flags & BG_TILE)
771 { 767 {
772 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 768 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
773 pixbuf_to_pixmap (result, tile, gc, 769 pixbuf_to_pixmap (result, tile, gc,
774 0, 0, 770 0, 0,
775 0, 0, 771 0, 0,
… …
855rxvt_term::bg_set_file (const char *file) 851rxvt_term::bg_set_file (const char *file)
856{ 852{
857 if (!file || !*file) 853 if (!file || !*file)
858 return false; 854 return false;
859 855
856 bool ret = false;
860 if (const char *p = strchr (file, ';')) 857 const char *p = strchr (file, ';');
858
859 if (p)
861 { 860 {
862 size_t len = p - file; 861 size_t len = p - file;
863 char *f = rxvt_temp_buf<char> (len + 1); 862 char *f = rxvt_temp_buf<char> (len + 1);
864 memcpy (f, file, len); 863 memcpy (f, file, len);
865 f[len] = '\0'; 864 f[len] = '\0';
… …
874 { 873 {
875 if (original_asim) 874 if (original_asim)
876 safe_asimage_destroy (original_asim); 875 safe_asimage_destroy (original_asim);
877 original_asim = image; 876 original_asim = image;
878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
879 return true; 878 ret = true;
880 } 879 }
881# endif 880# endif
882 881
883# ifdef HAVE_PIXBUF 882# ifdef HAVE_PIXBUF
884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
886 { 885 {
887 if (pixbuf) 886 if (pixbuf)
888 g_object_unref (pixbuf); 887 g_object_unref (pixbuf);
889 pixbuf = image; 888 pixbuf = image;
890 bg_flags |= BG_IS_FROM_FILE; 889 bg_flags |= BG_IS_FROM_FILE;
891 return true; 890 ret = true;
892 } 891 }
893# endif 892# endif
894 893
894 if (ret)
895 {
896 if (p)
897 bg_set_geometry (p + 1);
898 else
899 bg_set_default_geometry ();
900 }
901
895 return false; 902 return ret;
896} 903}
897 904
898# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
899 906
900# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
… …
947} 954}
948 955
949void 956void
950rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
951{ 958{
952 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
953 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
954 961
955 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
956 963
957 if (bg_flags & BG_TINT_SET)
958 {
959 tint.get (c); 964 tint.get (c);
965
960 if (!has_shade 966 if (!has_shade
961 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
962 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
963 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
964 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
965 }
966 971
967 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
968 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
969} 977}
970 978
971bool 979bool
972rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
973{ 981{
974 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
975 { 983 {
976 tint = new_tint; 984 tint = new_tint;
977 bg_flags |= BG_TINT_SET;
978 set_tint_shade_flags (); 985 set_tint_shade_flags ();
979 return true; 986 return true;
980 } 987 }
981 988
982 return false; 989 return false;
983} 990}
984 991
985bool 992bool
986rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
987{ 994{
988 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
989 996
990 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
991 if (new_shade < 0) 998 if (new_shade < 0)
992 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
993 1000
… …
1027bool 1034bool
1028rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1029{ 1036{
1030 bool ret = false; 1037 bool ret = false;
1031#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1032 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1033 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1034 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1035 1045
1036 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
… …
1109 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1110 ret = true; 1120 ret = true;
1111 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1112 } 1122 }
1113 } 1123 }
1114 else
1115 {
1116# if XRENDER 1124# if XRENDER
1117 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1118 1128
1119 if (bg_flags & BG_TINT_SET)
1120 tint.get (c); 1129 tint.get (c);
1121 1130
1122 if (shade <= 100) 1131 if (shade <= 100)
1123 { 1132 {
1124 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1125 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1176 ret = true; 1185 ret = true;
1177 1186
1178 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1179 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1180 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1181# endif 1191# endif
1182 }
1183 1192
1184 return ret; 1193 return ret;
1185} 1194}
1186 1195
1187/* 1196/*
… …
1271 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1272 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1273 } 1282 }
1274 1283
1275 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1276 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1277 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1278 1287
1279 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1281 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1282 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1288 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1289 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1290 1299
1291 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1292 { 1301 {
1293 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1294 && (bg_flags & BG_HAS_RENDER_CONV))
1295 { 1303 {
1296 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1297 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1298 } 1306 }
1299 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1300 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1301 { 1308 {
1302 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1303 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1304 } 1311 }
1305 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1319 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1320 1327
1321 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1322} 1329}
1323# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1324
1325#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1326static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1327# endif
1328 1331
1329bool 1332bool
1330rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1331{ 1334{
1332 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1337 { 1340 {
1338 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1339 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1340 if (tr_flags == 0) 1343 if (tr_flags == 0)
1341 return false; 1344 return false;
1342 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1343 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1344 } 1346 }
1345# endif 1347# endif
1346 1348
1347# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1348 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1354# endif 1356# endif
1355 1357
1356# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1357 XImage *result = NULL; 1359 XImage *result = NULL;
1358 1360
1359 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1360 { 1362 {
1361 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);
1362 } 1364 }
1363 1365
1364 if (result) 1366 if (result)
1365 { 1367 {
1366 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1367 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1368 { 1370 if (1)
1369 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1370 if (bg_flags & BG_TINT_SET)
1371 tint.get (c);
1372 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1373 }
1374 1372
1375 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1376 1374
1377 if (gc) 1375 if (gc)
1378 { 1376 {
1379 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);
1380 1378
1381 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1382 bg_flags |= BG_IS_VALID;
1383 } 1380 }
1384 1381
1385 XDestroyImage (result); 1382 XDestroyImage (result);
1386 } 1383 }
1387# endif 1384# endif
… …
1405 1402
1406void 1403void
1407rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1408{ 1405{
1409#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1410 shade = 100; 1409 shade = 100;
1411#endif 1410#endif
1412 1411
1413 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1414#if XRENDER 1413#if XRENDER
… …
1428} 1427}
1429 1428
1430#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1431 1430
1432#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1433/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1434 1433
1435static void 1434static inline void
1436shade_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)
1437{ 1448{
1438 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1439 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1440 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1441 rgba low; 1452 unsigned short low;
1442 rgba high;
1443 int i;
1444 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1445 1454
1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1447 1456
1448 /* for convenience */ 1457 /* for convenience */
1449 mask_r = visual->red_mask; 1458 mask_r = visual->red_mask;
… …
1507 break; 1516 break;
1508 default: 1517 default:
1509 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1510 } 1519 }
1511 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1512 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1513 if (shade > 100) 1526 if (shade > 100)
1514 { 1527 {
1515 shade = 200 - shade;
1516
1517 high.r = c.r * shade / 100;
1518 high.g = c.g * shade / 100;
1519 high.b = c.b * shade / 100;
1520
1521 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1522 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1523 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1524 } 1533 }
1525 else 1534 else
1526 { 1535 {
1527 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1530 1539
1531 low.r = low.g = low.b = 0; 1540 low = 0;
1532 } 1541 }
1533 1542
1534 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1535 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1536 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1537 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1538 tmp = i * high.r;
1539 tmp += (mask_r>>sh_r) * low.r;
1540 lookup_r[i] = (tmp/65535)<<sh_r;
1541 }
1542 for (i = 0; i <= mask_g>>sh_g; i++)
1543 {
1544 uint32_t tmp;
1545 tmp = i * high.g;
1546 tmp += (mask_g>>sh_g) * low.g;
1547 lookup_g[i] = (tmp/65535)<<sh_g;
1548 }
1549 for (i = 0; i <= mask_b>>sh_b; i++)
1550 {
1551 uint32_t tmp;
1552 tmp = i * high.b;
1553 tmp += (mask_b>>sh_b) * low.b;
1554 lookup_b[i] = (tmp/65535)<<sh_b;
1555 }
1556 1547
1557 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1558 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1559 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1560 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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