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.155 by sf-exg, Mon May 30 18:39:02 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 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_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 }
239 288
240 if (!update) 289 if (!update)
241 { 290 {
242 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
252 w = h; 301 w = h;
253 302
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 304 }
256 305
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; 306 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; 307 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; 308 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; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
314 310
… …
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 322{
327 int target_width = szHint.width; 323 int target_width = szHint.width;
328 int target_height = szHint.height; 324 int target_height = szHint.height;
329 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
330 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
331 { 330 {
332 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
336 } 335 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 336
343 if (!w) w = image_width; 337 if (!w) w = image_width;
344 if (!h) h = image_height; 338 if (!h) h = image_height;
345 339
346 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 347 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
355 } 349 }
356 350
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 352 if (!(bg_flags & BG_TILE)
353 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 357}
363 358
… …
390 } 385 }
391 386
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 388 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 392 if (tmp)
398 { 393 {
399 destroy_asimage (&background); 394 destroy_asimage (&background);
400 background = tmp; 395 background = tmp;
… …
419 414
420 if (!original_asim 415 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 417 && (x >= target_width
423 || y >= target_height 418 || y >= target_height
424 || (x + w <= 0) 419 || x + w <= 0
425 || (y + h <= 0)))) 420 || y + h <= 0)))
426 { 421 {
427 if (background) 422 if (background)
428 { 423 {
429 new_pmap_width = background->width; 424 new_pmap_width = background->width;
430 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
444 } 439 }
445 else 440 else
446 { 441 {
447 result = original_asim; 442 result = original_asim;
448 443
449 if ((w != original_asim->width) 444 if (w != original_asim->width
450 || (h != original_asim->height)) 445 || h != original_asim->height)
451 { 446 {
452 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
453 w, h, 448 w, h,
454 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
456 } 451 }
457 452
458 if (background == NULL) 453 if (background == NULL)
459 { 454 {
460 if (h_scale == 0 || v_scale == 0) 455 if (bg_flags & BG_TILE)
461 { 456 {
462 /* if tiling - pixmap has to be sized exactly as the image, 457 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 458 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 459 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 460 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 485 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 486 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 487 layers[0].tint = background_tint;
493 layers[1].im = result; 488 layers[1].im = result;
494 489
495 if (h_scale == 0 || v_scale == 0) 490 if (bg_flags & BG_TILE)
496 { 491 {
497 /* tile horizontally */ 492 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 493 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 494 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 495 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 499 /* clip horizontally */
505 layers[1].dst_x = x; 500 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 501 layers[1].clip_width = result->width;
507 } 502 }
508 503
509 if (h_scale == 0 || v_scale == 0) 504 if (bg_flags & BG_TILE)
510 { 505 {
511 while (y > 0) y -= (int)result->height; 506 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 507 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 508 layers[1].clip_height = result->height + target_height;
514 } 509 }
… …
564 559
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 560 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 561 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 562 if (background == NULL)
568 { 563 {
569 if (!(h_scale == 0 || v_scale == 0)) 564 if (!(bg_flags & BG_TILE))
570 { 565 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 566 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); 567 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 568 }
574 569
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
710 705
711 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 707 && (x >= target_width
713 || y >= target_height 708 || y >= target_height
714 || (x + w <= 0) 709 || x + w <= 0
715 || (y + h <= 0))) 710 || y + h <= 0))
716 return false; 711 return false;
717 712
718 result = pixbuf; 713 result = pixbuf;
719 714
720 if ((w != image_width) 715 if (w != image_width
721 || (h != image_height)) 716 || h != image_height)
722 { 717 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 719 w, h,
725 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
726 } 721 }
… …
742 root_pmap = bg_pixmap; 737 root_pmap = bg_pixmap;
743 bg_pixmap = None; 738 bg_pixmap = None;
744 } 739 }
745 else 740 else
746 { 741 {
747 if (h_scale == 0 || v_scale == 0) 742 if (bg_flags & BG_TILE)
748 { 743 {
749 new_pmap_width = min (image_width, target_width); 744 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 745 new_pmap_height = min (image_height, target_height);
751 } 746 }
752 } 747 }
… …
765 gcv.foreground = pix_colors[Color_bg]; 760 gcv.foreground = pix_colors[Color_bg];
766 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 761 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
767 762
768 if (gc) 763 if (gc)
769 { 764 {
770 if (h_scale == 0 || v_scale == 0) 765 if (bg_flags & BG_TILE)
771 { 766 {
772 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 767 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
773 pixbuf_to_pixmap (result, tile, gc, 768 pixbuf_to_pixmap (result, tile, gc,
774 0, 0, 769 0, 0,
775 0, 0, 770 0, 0,
… …
855rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
856{ 851{
857 if (!file || !*file) 852 if (!file || !*file)
858 return false; 853 return false;
859 854
855 bool ret = false;
860 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
861 { 859 {
862 size_t len = p - file; 860 size_t len = p - file;
863 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
864 memcpy (f, file, len); 862 memcpy (f, file, len);
865 f[len] = '\0'; 863 f[len] = '\0';
… …
874 { 872 {
875 if (original_asim) 873 if (original_asim)
876 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
877 original_asim = image; 875 original_asim = image;
878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
879 return true; 877 ret = true;
880 } 878 }
881# endif 879# endif
882 880
883# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
886 { 884 {
887 if (pixbuf) 885 if (pixbuf)
888 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
889 pixbuf = image; 887 pixbuf = image;
890 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
891 return true; 889 ret = true;
892 } 890 }
893# endif 891# endif
894 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
895 return false; 901 return ret;
896} 902}
897 903
898# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
899 905
900# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
1271 bg_pmap_width = window_width; 1277 bg_pmap_width = window_width;
1272 bg_pmap_height = window_height; 1278 bg_pmap_height = window_height;
1273 } 1279 }
1274 1280
1275 /* straightforward pixmap copy */ 1281 /* straightforward pixmap copy */
1276 while (sx < 0) sx += root_width; 1282 while (sx < 0) sx += root_pmap_width;
1277 while (sy < 0) sy += root_height; 1283 while (sy < 0) sy += root_pmap_height;
1278 1284
1279 gcv.tile = recoded_root_pmap; 1285 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled; 1286 gcv.fill_style = FillTiled;
1281 gcv.ts_x_origin = -sx; 1287 gcv.ts_x_origin = -sx;
1282 gcv.ts_y_origin = -sy; 1288 gcv.ts_y_origin = -sy;
… …
1337 { 1343 {
1338 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1339 tr_flags = make_transparency_pixmap (); 1345 tr_flags = make_transparency_pixmap ();
1340 if (tr_flags == 0) 1346 if (tr_flags == 0)
1341 return false; 1347 return false;
1342 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1343 bg_flags |= BG_IS_VALID; 1348 bg_flags |= BG_IS_VALID;
1344 } 1349 }
1345# endif 1350# endif
1346 1351
1347# ifdef BG_IMAGE_FROM_FILE 1352# ifdef BG_IMAGE_FROM_FILE
1348 if ((bg_flags & BG_IS_FROM_FILE) 1353 if ((bg_flags & BG_IS_FROM_FILE)
… …
1354# endif 1359# endif
1355 1360
1356# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1361# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1357 XImage *result = NULL; 1362 XImage *result = NULL;
1358 1363
1359 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1364 if (tr_flags & BG_NEEDS_TINT)
1360 { 1365 {
1361 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1366 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1362 } 1367 }
1363 1368
1364 if (result) 1369 if (result)
1365 { 1370 {
1366 /* our own client-side tinting */ 1371 /* our own client-side tinting */
1367 if (tr_flags & BG_NEEDS_TINT) 1372 //if (tr_flags & BG_NEEDS_TINT)
1373 if (1)
1368 { 1374 {
1369 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1370 if (bg_flags & BG_TINT_SET) 1376 if (bg_flags & BG_TINT_SET)
1371 tint.get (c); 1377 tint.get (c);
1372 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1377 if (gc) 1383 if (gc)
1378 { 1384 {
1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1380 1386
1381 XFreeGC (dpy, gc); 1387 XFreeGC (dpy, gc);
1382 bg_flags |= BG_IS_VALID;
1383 } 1388 }
1384 1389
1385 XDestroyImage (result); 1390 XDestroyImage (result);
1386 } 1391 }
1387# endif 1392# endif
… …
1428} 1433}
1429 1434
1430#endif /* HAVE_BG_PIXMAP */ 1435#endif /* HAVE_BG_PIXMAP */
1431 1436
1432#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1437#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1433/* taken from aterm-0.4.2 */ 1438/* based on code from aterm-0.4.2 */
1439
1440static inline void
1441fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1442{
1443 for (int i = 0; i <= mask >> sh; i++)
1444 {
1445 uint32_t tmp;
1446 tmp = i * high;
1447 tmp += (mask >> sh) * low;
1448 lookup[i] = (tmp / 0xffff) << sh;
1449 }
1450}
1434 1451
1435static void 1452static void
1436shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1453shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1437{ 1454{
1438 int sh_r, sh_g, sh_b; 1455 int sh_r, sh_g, sh_b;
1439 uint32_t mask_r, mask_g, mask_b; 1456 uint32_t mask_r, mask_g, mask_b;
1440 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1457 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1441 rgba low; 1458 unsigned short low;
1442 rgba high; 1459 rgba high;
1443 int i;
1444 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1460 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1445 1461
1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1462 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1447 1463
1448 /* for convenience */ 1464 /* for convenience */
… …
1516 1532
1517 high.r = c.r * shade / 100; 1533 high.r = c.r * shade / 100;
1518 high.g = c.g * shade / 100; 1534 high.g = c.g * shade / 100;
1519 high.b = c.b * shade / 100; 1535 high.b = c.b * shade / 100;
1520 1536
1521 low.r = 65535 * (100 - shade) / 100; 1537 low = 0xffff * (100 - shade) / 100;
1522 low.g = 65535 * (100 - shade) / 100;
1523 low.b = 65535 * (100 - shade) / 100;
1524 } 1538 }
1525 else 1539 else
1526 { 1540 {
1527 high.r = c.r * shade / 100; 1541 high.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100; 1542 high.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100; 1543 high.b = c.b * shade / 100;
1530 1544
1531 low.r = low.g = low.b = 0; 1545 low = 0;
1532 } 1546 }
1533 1547
1534 /* fill our lookup tables */ 1548 /* fill our lookup tables */
1535 for (i = 0; i <= mask_r>>sh_r; i++) 1549 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1536 { 1550 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1537 uint32_t tmp; 1551 fill_lut (lookup_b, mask_b, sh_b, low, high.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 1552
1557 /* apply table to input image (replacing colors by newly calculated ones) */ 1553 /* apply table to input image (replacing colors by newly calculated ones) */
1558 if (ximage->bits_per_pixel == 32 1554 if (ximage->bits_per_pixel == 32
1559 && (ximage->depth == 24 || ximage->depth == 32) 1555 && (ximage->depth == 24 || ximage->depth == 32)
1560 && ximage->byte_order == host_byte_order) 1556 && ximage->byte_order == host_byte_order)

Diff Legend

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