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.161 by sf-exg, Thu Aug 11 08:39:10 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 */
52
53#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
54void 38void
55rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
56{ 40{
57#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
166 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
167 151
168 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
169 return diff * align / 100; 153 return diff * align / 100;
170 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
174 return 0; 158 return 0;
175} 159}
176 160
177static inline int 161static inline int
178make_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)
… …
197{ 181{
198 bool changed = false; 182 bool changed = false;
199 int geom_flags = 0; 183 int geom_flags = 0;
200 int x = 0, y = 0; 184 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
202 unsigned int n; 186 unsigned long new_flags = 0;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
204 const char *ops;
205 187
206 if (geom == NULL) 188 if (geom == NULL)
207 return false; 189 return false;
208 190
209 char str[256]; 191 if (geom[0])
210
211 ops = strchr (geom, ':');
212 if (ops == NULL)
213 n = strlen (geom);
214 else
215 n = ops - geom;
216
217 if (n >= sizeof (str))
218 return false;
219
220 memcpy (str, geom, n);
221 str[n] = '\0';
222 rxvt_strtrim (str);
223
224 if (str[0])
225 { 192 {
226 /* 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
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
229 290
230 if (!update) 291 if (!update)
231 { 292 {
232 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
242 w = h; 303 w = h;
243 304
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 305 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 306 }
246 307
247 if (ops)
248 {
249 char **arr = rxvt_strsplit (':', ops + 1);
250
251 for (int i = 0; arr[i]; i++)
252 {
253 if (!strcasecmp (arr[i], "style=tiled"))
254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 else if (!strcasecmp (arr[i], "propscale"))
300 {
301 new_flags |= BG_PROP_SCALE;
302 }
303 else if (!strcasecmp (arr[i], "hscale"))
304 {
305 w = windowScale;
306 h = noScale;
307 geom_flags |= WidthValue|HeightValue;
308 }
309 else if (!strcasecmp (arr[i], "vscale"))
310 {
311 h = windowScale;
312 w = noScale;
313 geom_flags |= WidthValue|HeightValue;
314 }
315 else if (!strcasecmp (arr[i], "scale"))
316 {
317 w = h = windowScale;
318 geom_flags |= WidthValue|HeightValue;
319 }
320 else if (!strcasecmp (arr[i], "auto"))
321 {
322 w = h = windowScale;
323 x = y = centerAlign;
324 geom_flags |= WidthValue|HeightValue|XValue|YValue;
325 }
326 else if (!strcasecmp (arr[i], "root"))
327 {
328 new_flags |= BG_TILE|BG_ROOT_ALIGN;
329 w = h = noScale;
330 geom_flags |= WidthValue|HeightValue;
331 }
332 } /* done parsing ops */
333
334 rxvt_free_strsplit (arr);
335 }
336
337 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;
338 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;
339 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;
340 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;
341 312
… …
352rxvt_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)
353{ 324{
354 int target_width = szHint.width; 325 int target_width = szHint.width;
355 int target_height = szHint.height; 326 int target_height = szHint.height;
356 327
328 w = h_scale * target_width / 100;
329 h = v_scale * target_height / 100;
330
357 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
358 { 332 {
359 float scale = (float)target_width / image_width; 333 float scale = (float)w / image_width;
360 min_it (scale, (float)target_height / image_height); 334 min_it (scale, (float)h / image_height);
361 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
362 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
363 } 337 }
364 else
365 {
366 w = h_scale * target_width / 100;
367 h = v_scale * target_height / 100;
368 }
369 338
370 if (!w) w = image_width; 339 if (!w) w = image_width;
371 if (!h) h = image_height; 340 if (!h) h = image_height;
372 341
373 if (bg_flags & BG_ROOT_ALIGN) 342 if (bg_flags & BG_ROOT_ALIGN)
… …
381 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
382 } 351 }
383 352
384 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 353 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
385 if (!(bg_flags & BG_TILE) 354 if (!(bg_flags & BG_TILE)
386 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 355 || h_scale || v_scale
387 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 356 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
388 || w > target_width || h > target_height) 357 || w > target_width || h > target_height)
389 bg_flags |= BG_IS_SIZE_SENSITIVE; 358 bg_flags |= BG_IS_SIZE_SENSITIVE;
390} 359}
391 360
… …
405 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
406 { 375 {
407 ShadingInfo as_shade; 376 ShadingInfo as_shade;
408 as_shade.shading = shade; 377 as_shade.shading = shade;
409 378
410 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
411 if (bg_flags & BG_TINT_SET)
412 tint.get (c); 380 tint.get (c);
413 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
414 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
415 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
416 384
417 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
418 } 386 }
419 387
420 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
421 { 389 {
422 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,
423 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 ASA_XImage,
424 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
425 if (tmp) 393 if (tmp)
426 { 394 {
427 destroy_asimage (&background); 395 destroy_asimage (&background);
428 background = tmp; 396 background = tmp;
… …
447 415
448 if (!original_asim 416 if (!original_asim
449 || (!(bg_flags & BG_ROOT_ALIGN) 417 || (!(bg_flags & BG_ROOT_ALIGN)
450 && (x >= target_width 418 && (x >= target_width
451 || y >= target_height 419 || y >= target_height
452 || (x + w <= 0) 420 || x + w <= 0
453 || (y + h <= 0)))) 421 || y + h <= 0)))
454 { 422 {
455 if (background) 423 if (background)
456 { 424 {
457 new_pmap_width = background->width; 425 new_pmap_width = background->width;
458 new_pmap_height = background->height; 426 new_pmap_height = background->height;
… …
472 } 440 }
473 else 441 else
474 { 442 {
475 result = original_asim; 443 result = original_asim;
476 444
477 if ((w != original_asim->width) 445 if (w != original_asim->width
478 || (h != original_asim->height)) 446 || h != original_asim->height)
479 { 447 {
480 result = scale_asimage (asv, original_asim, 448 result = scale_asimage (asv, original_asim,
481 w, h, 449 w, h,
482 background ? ASA_ASImage : ASA_XImage, 450 ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
484 } 452 }
485 453
486 if (background == NULL) 454 if (background == NULL)
487 { 455 {
… …
737 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
738 706
739 if (!(bg_flags & BG_ROOT_ALIGN) 707 if (!(bg_flags & BG_ROOT_ALIGN)
740 && (x >= target_width 708 && (x >= target_width
741 || y >= target_height 709 || y >= target_height
742 || (x + w <= 0) 710 || x + w <= 0
743 || (y + h <= 0))) 711 || y + h <= 0))
744 return false; 712 return false;
745 713
746 result = pixbuf; 714 result = pixbuf;
747 715
748 if ((w != image_width) 716 if (w != image_width
749 || (h != image_height)) 717 || h != image_height)
750 { 718 {
751 result = gdk_pixbuf_scale_simple (pixbuf, 719 result = gdk_pixbuf_scale_simple (pixbuf,
752 w, h, 720 w, h,
753 GDK_INTERP_BILINEAR); 721 GDK_INTERP_BILINEAR);
754 } 722 }
… …
883rxvt_term::bg_set_file (const char *file) 851rxvt_term::bg_set_file (const char *file)
884{ 852{
885 if (!file || !*file) 853 if (!file || !*file)
886 return false; 854 return false;
887 855
856 bool ret = false;
888 if (const char *p = strchr (file, ';')) 857 const char *p = strchr (file, ';');
858
859 if (p)
889 { 860 {
890 size_t len = p - file; 861 size_t len = p - file;
891 char *f = rxvt_temp_buf<char> (len + 1); 862 char *f = rxvt_temp_buf<char> (len + 1);
892 memcpy (f, file, len); 863 memcpy (f, file, len);
893 f[len] = '\0'; 864 f[len] = '\0';
… …
902 { 873 {
903 if (original_asim) 874 if (original_asim)
904 safe_asimage_destroy (original_asim); 875 safe_asimage_destroy (original_asim);
905 original_asim = image; 876 original_asim = image;
906 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
907 return true; 878 ret = true;
908 } 879 }
909# endif 880# endif
910 881
911# ifdef HAVE_PIXBUF 882# ifdef HAVE_PIXBUF
912 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
914 { 885 {
915 if (pixbuf) 886 if (pixbuf)
916 g_object_unref (pixbuf); 887 g_object_unref (pixbuf);
917 pixbuf = image; 888 pixbuf = image;
918 bg_flags |= BG_IS_FROM_FILE; 889 bg_flags |= BG_IS_FROM_FILE;
919 return true; 890 ret = true;
920 } 891 }
921# endif 892# endif
922 893
894 if (ret)
895 {
896 if (p)
897 bg_set_geometry (p + 1);
898 else
899 bg_set_default_geometry ();
900 }
901
923 return false; 902 return ret;
924} 903}
925 904
926# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
927 906
928# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
… …
975} 954}
976 955
977void 956void
978rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
979{ 958{
980 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
981 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
982 961
983 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
984 963
985 if (bg_flags & BG_TINT_SET)
986 {
987 tint.get (c); 964 tint.get (c);
965
988 if (!has_shade 966 if (!has_shade
989 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
990 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
991 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
992 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
993 }
994 971
995 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
996 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
997} 977}
998 978
999bool 979bool
1000rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
1001{ 981{
1002 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
1003 { 983 {
1004 tint = new_tint; 984 tint = new_tint;
1005 bg_flags |= BG_TINT_SET;
1006 set_tint_shade_flags (); 985 set_tint_shade_flags ();
1007 return true; 986 return true;
1008 } 987 }
1009 988
1010 return false; 989 return false;
1011} 990}
1012 991
1013bool 992bool
1014rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
1015{ 994{
1016 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
1017 996
1018 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
1019 if (new_shade < 0) 998 if (new_shade < 0)
1020 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
1021 1000
… …
1055bool 1034bool
1056rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1057{ 1036{
1058 bool ret = false; 1037 bool ret = false;
1059#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063 1045
1064 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
… …
1137 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1138 ret = true; 1120 ret = true;
1139 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1140 } 1122 }
1141 } 1123 }
1142 else
1143 {
1144# if XRENDER 1124# if XRENDER
1145 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1146 1128
1147 if (bg_flags & BG_TINT_SET)
1148 tint.get (c); 1129 tint.get (c);
1149 1130
1150 if (shade <= 100) 1131 if (shade <= 100)
1151 { 1132 {
1152 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1153 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1204 ret = true; 1185 ret = true;
1205 1186
1206 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1207 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1208 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1209# endif 1191# endif
1210 }
1211 1192
1212 return ret; 1193 return ret;
1213} 1194}
1214 1195
1215/* 1196/*
… …
1299 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1300 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1301 } 1282 }
1302 1283
1303 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1304 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1305 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1306 1287
1307 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1308 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1309 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1310 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1316 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1317 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1318 1299
1319 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1320 { 1301 {
1321 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1322 && (bg_flags & BG_HAS_RENDER_CONV))
1323 { 1303 {
1324 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1325 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1326 } 1306 }
1327 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1328 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1329 { 1308 {
1330 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1331 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1332 } 1311 }
1333 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1347 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1348 1327
1349 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1350} 1329}
1351# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1352
1353#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1354static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1355# endif
1356 1331
1357bool 1332bool
1358rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1359{ 1334{
1360 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1365 { 1340 {
1366 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1367 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1368 if (tr_flags == 0) 1343 if (tr_flags == 0)
1369 return false; 1344 return false;
1370 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1371 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1372 } 1346 }
1373# endif 1347# endif
1374 1348
1375# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1376 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1382# endif 1356# endif
1383 1357
1384# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1385 XImage *result = NULL; 1359 XImage *result = NULL;
1386 1360
1387 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1388 { 1362 {
1389 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);
1390 } 1364 }
1391 1365
1392 if (result) 1366 if (result)
1393 { 1367 {
1394 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1395 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1396 { 1370 if (1)
1397 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1398 if (bg_flags & BG_TINT_SET)
1399 tint.get (c);
1400 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1401 }
1402 1372
1403 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1404 1374
1405 if (gc) 1375 if (gc)
1406 { 1376 {
1407 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);
1408 1378
1409 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1410 bg_flags |= BG_IS_VALID;
1411 } 1380 }
1412 1381
1413 XDestroyImage (result); 1382 XDestroyImage (result);
1414 } 1383 }
1415# endif 1384# endif
… …
1433 1402
1434void 1403void
1435rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1436{ 1405{
1437#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1438 shade = 100; 1409 shade = 100;
1439#endif 1410#endif
1440 1411
1441 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1442#if XRENDER 1413#if XRENDER
… …
1456} 1427}
1457 1428
1458#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1459 1430
1460#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1461/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1462 1433
1463static void 1434static inline void
1464shade_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)
1465{ 1448{
1466 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1467 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1468 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1469 rgba low; 1452 unsigned short low;
1470 rgba high;
1471 int i;
1472 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1473 1454
1474 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1475 1456
1476 /* for convenience */ 1457 /* for convenience */
… …
1535 break; 1516 break;
1536 default: 1517 default:
1537 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1538 } 1519 }
1539 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1540 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1541 if (shade > 100) 1526 if (shade > 100)
1542 { 1527 {
1543 shade = 200 - shade;
1544
1545 high.r = c.r * shade / 100;
1546 high.g = c.g * shade / 100;
1547 high.b = c.b * shade / 100;
1548
1549 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1550 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1551 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1552 } 1533 }
1553 else 1534 else
1554 { 1535 {
1555 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1556 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1557 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1558 1539
1559 low.r = low.g = low.b = 0; 1540 low = 0;
1560 } 1541 }
1561 1542
1562 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1563 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1564 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1565 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1566 tmp = i * high.r;
1567 tmp += (mask_r>>sh_r) * low.r;
1568 lookup_r[i] = (tmp/65535)<<sh_r;
1569 }
1570 for (i = 0; i <= mask_g>>sh_g; i++)
1571 {
1572 uint32_t tmp;
1573 tmp = i * high.g;
1574 tmp += (mask_g>>sh_g) * low.g;
1575 lookup_g[i] = (tmp/65535)<<sh_g;
1576 }
1577 for (i = 0; i <= mask_b>>sh_b; i++)
1578 {
1579 uint32_t tmp;
1580 tmp = i * high.b;
1581 tmp += (mask_b>>sh_b) * low.b;
1582 lookup_b[i] = (tmp/65535)<<sh_b;
1583 }
1584 1547
1585 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1586 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1587 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1588 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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