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.160 by sf-exg, Thu Aug 11 08:37:17 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], "scale"))
304 {
305 if (h == 0) h = windowScale;
306 if (w == 0) w = windowScale;
307
308 geom_flags |= WidthValue|HeightValue;
309 }
310 else if (!strcasecmp (arr[i], "root"))
311 {
312 new_flags |= BG_TILE|BG_ROOT_ALIGN;
313 w = h = noScale;
314 geom_flags |= WidthValue|HeightValue;
315 }
316 } /* done parsing ops */
317
318 rxvt_free_strsplit (arr);
319 }
320
321 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;
322 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;
323 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;
324 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;
325 312
… …
336rxvt_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)
337{ 324{
338 int target_width = szHint.width; 325 int target_width = szHint.width;
339 int target_height = szHint.height; 326 int target_height = szHint.height;
340 327
328 w = h_scale * target_width / 100;
329 h = v_scale * target_height / 100;
330
341 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
342 { 332 {
343 float scale = (float)target_width / image_width; 333 float scale = (float)w / image_width;
344 min_it (scale, (float)target_height / image_height); 334 min_it (scale, (float)h / image_height);
345 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
346 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
347 } 337 }
348 else
349 {
350 w = h_scale * target_width / 100;
351 h = v_scale * target_height / 100;
352 }
353 338
354 if (!w) w = image_width; 339 if (!w) w = image_width;
355 if (!h) h = image_height; 340 if (!h) h = image_height;
356 341
357 if (bg_flags & BG_ROOT_ALIGN) 342 if (bg_flags & BG_ROOT_ALIGN)
… …
365 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
366 } 351 }
367 352
368 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 353 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
369 if (!(bg_flags & BG_TILE) 354 if (!(bg_flags & BG_TILE)
370 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 355 || h_scale || v_scale
371 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 356 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
372 || w > target_width || h > target_height) 357 || w > target_width || h > target_height)
373 bg_flags |= BG_IS_SIZE_SENSITIVE; 358 bg_flags |= BG_IS_SIZE_SENSITIVE;
374} 359}
375 360
… …
389 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
390 { 375 {
391 ShadingInfo as_shade; 376 ShadingInfo as_shade;
392 as_shade.shading = shade; 377 as_shade.shading = shade;
393 378
394 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
395 if (bg_flags & BG_TINT_SET)
396 tint.get (c); 380 tint.get (c);
397 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
398 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
399 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
400 384
401 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
402 } 386 }
403 387
404 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
405 { 389 {
406 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,
407 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 ASA_XImage,
408 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
409 if (tmp) 393 if (tmp)
410 { 394 {
411 destroy_asimage (&background); 395 destroy_asimage (&background);
412 background = tmp; 396 background = tmp;
… …
431 415
432 if (!original_asim 416 if (!original_asim
433 || (!(bg_flags & BG_ROOT_ALIGN) 417 || (!(bg_flags & BG_ROOT_ALIGN)
434 && (x >= target_width 418 && (x >= target_width
435 || y >= target_height 419 || y >= target_height
436 || (x + w <= 0) 420 || x + w <= 0
437 || (y + h <= 0)))) 421 || y + h <= 0)))
438 { 422 {
439 if (background) 423 if (background)
440 { 424 {
441 new_pmap_width = background->width; 425 new_pmap_width = background->width;
442 new_pmap_height = background->height; 426 new_pmap_height = background->height;
… …
456 } 440 }
457 else 441 else
458 { 442 {
459 result = original_asim; 443 result = original_asim;
460 444
461 if ((w != original_asim->width) 445 if (w != original_asim->width
462 || (h != original_asim->height)) 446 || h != original_asim->height)
463 { 447 {
464 result = scale_asimage (asv, original_asim, 448 result = scale_asimage (asv, original_asim,
465 w, h, 449 w, h,
466 background ? ASA_ASImage : ASA_XImage, 450 ASA_XImage,
467 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
468 } 452 }
469 453
470 if (background == NULL) 454 if (background == NULL)
471 { 455 {
… …
721 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
722 706
723 if (!(bg_flags & BG_ROOT_ALIGN) 707 if (!(bg_flags & BG_ROOT_ALIGN)
724 && (x >= target_width 708 && (x >= target_width
725 || y >= target_height 709 || y >= target_height
726 || (x + w <= 0) 710 || x + w <= 0
727 || (y + h <= 0))) 711 || y + h <= 0))
728 return false; 712 return false;
729 713
730 result = pixbuf; 714 result = pixbuf;
731 715
732 if ((w != image_width) 716 if (w != image_width
733 || (h != image_height)) 717 || h != image_height)
734 { 718 {
735 result = gdk_pixbuf_scale_simple (pixbuf, 719 result = gdk_pixbuf_scale_simple (pixbuf,
736 w, h, 720 w, h,
737 GDK_INTERP_BILINEAR); 721 GDK_INTERP_BILINEAR);
738 } 722 }
… …
867rxvt_term::bg_set_file (const char *file) 851rxvt_term::bg_set_file (const char *file)
868{ 852{
869 if (!file || !*file) 853 if (!file || !*file)
870 return false; 854 return false;
871 855
856 bool ret = false;
872 if (const char *p = strchr (file, ';')) 857 const char *p = strchr (file, ';');
858
859 if (p)
873 { 860 {
874 size_t len = p - file; 861 size_t len = p - file;
875 char *f = rxvt_temp_buf<char> (len + 1); 862 char *f = rxvt_temp_buf<char> (len + 1);
876 memcpy (f, file, len); 863 memcpy (f, file, len);
877 f[len] = '\0'; 864 f[len] = '\0';
… …
886 { 873 {
887 if (original_asim) 874 if (original_asim)
888 safe_asimage_destroy (original_asim); 875 safe_asimage_destroy (original_asim);
889 original_asim = image; 876 original_asim = image;
890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
891 return true; 878 ret = true;
892 } 879 }
893# endif 880# endif
894 881
895# ifdef HAVE_PIXBUF 882# ifdef HAVE_PIXBUF
896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
898 { 885 {
899 if (pixbuf) 886 if (pixbuf)
900 g_object_unref (pixbuf); 887 g_object_unref (pixbuf);
901 pixbuf = image; 888 pixbuf = image;
902 bg_flags |= BG_IS_FROM_FILE; 889 bg_flags |= BG_IS_FROM_FILE;
903 return true; 890 ret = true;
904 } 891 }
905# endif 892# endif
906 893
894 if (ret)
895 {
896 if (p)
897 bg_set_geometry (p + 1);
898 else
899 bg_set_default_geometry ();
900 }
901
907 return false; 902 return ret;
908} 903}
909 904
910# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
911 906
912# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
… …
959} 954}
960 955
961void 956void
962rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
963{ 958{
964 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
965 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
966 961
967 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
968 963
969 if (bg_flags & BG_TINT_SET)
970 {
971 tint.get (c); 964 tint.get (c);
965
972 if (!has_shade 966 if (!has_shade
973 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
974 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
975 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
976 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
977 }
978 971
979 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
980 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
981} 977}
982 978
983bool 979bool
984rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
985{ 981{
986 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
987 { 983 {
988 tint = new_tint; 984 tint = new_tint;
989 bg_flags |= BG_TINT_SET;
990 set_tint_shade_flags (); 985 set_tint_shade_flags ();
991 return true; 986 return true;
992 } 987 }
993 988
994 return false; 989 return false;
995} 990}
996 991
997bool 992bool
998rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
999{ 994{
1000 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
1001 996
1002 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
1003 if (new_shade < 0) 998 if (new_shade < 0)
1004 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
1005 1000
… …
1039bool 1034bool
1040rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1041{ 1036{
1042 bool ret = false; 1037 bool ret = false;
1043#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1044 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1045 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1046 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1047 1045
1048 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
… …
1121 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1122 ret = true; 1120 ret = true;
1123 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1124 } 1122 }
1125 } 1123 }
1126 else
1127 {
1128# if XRENDER 1124# if XRENDER
1129 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1130 1128
1131 if (bg_flags & BG_TINT_SET)
1132 tint.get (c); 1129 tint.get (c);
1133 1130
1134 if (shade <= 100) 1131 if (shade <= 100)
1135 { 1132 {
1136 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1137 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1188 ret = true; 1185 ret = true;
1189 1186
1190 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1191 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1192 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1193# endif 1191# endif
1194 }
1195 1192
1196 return ret; 1193 return ret;
1197} 1194}
1198 1195
1199/* 1196/*
… …
1283 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1284 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1285 } 1282 }
1286 1283
1287 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1288 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1289 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1290 1287
1291 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1292 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1293 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1294 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1300 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1301 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1302 1299
1303 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1304 { 1301 {
1305 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1306 && (bg_flags & BG_HAS_RENDER_CONV))
1307 { 1303 {
1308 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1309 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1310 } 1306 }
1311 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1312 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1313 { 1308 {
1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1315 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1316 } 1311 }
1317 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1331 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1332 1327
1333 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1334} 1329}
1335# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1336
1337#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1338static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1339# endif
1340 1331
1341bool 1332bool
1342rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1343{ 1334{
1344 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1349 { 1340 {
1350 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1351 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1352 if (tr_flags == 0) 1343 if (tr_flags == 0)
1353 return false; 1344 return false;
1354 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1355 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1356 } 1346 }
1357# endif 1347# endif
1358 1348
1359# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1360 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1366# endif 1356# endif
1367 1357
1368# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1369 XImage *result = NULL; 1359 XImage *result = NULL;
1370 1360
1371 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1372 { 1362 {
1373 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);
1374 } 1364 }
1375 1365
1376 if (result) 1366 if (result)
1377 { 1367 {
1378 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1379 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1380 { 1370 if (1)
1381 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1382 if (bg_flags & BG_TINT_SET)
1383 tint.get (c);
1384 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1385 }
1386 1372
1387 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1388 1374
1389 if (gc) 1375 if (gc)
1390 { 1376 {
1391 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);
1392 1378
1393 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1394 bg_flags |= BG_IS_VALID;
1395 } 1380 }
1396 1381
1397 XDestroyImage (result); 1382 XDestroyImage (result);
1398 } 1383 }
1399# endif 1384# endif
… …
1417 1402
1418void 1403void
1419rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1420{ 1405{
1421#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1422 shade = 100; 1409 shade = 100;
1423#endif 1410#endif
1424 1411
1425 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1426#if XRENDER 1413#if XRENDER
… …
1440} 1427}
1441 1428
1442#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1443 1430
1444#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1445/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1446 1433
1447static void 1434static inline void
1448shade_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)
1449{ 1448{
1450 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1451 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1452 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1453 rgba low; 1452 unsigned short low;
1454 rgba high;
1455 int i;
1456 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1457 1454
1458 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1459 1456
1460 /* for convenience */ 1457 /* for convenience */
… …
1519 break; 1516 break;
1520 default: 1517 default:
1521 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1522 } 1519 }
1523 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1524 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1525 if (shade > 100) 1526 if (shade > 100)
1526 { 1527 {
1527 shade = 200 - shade;
1528
1529 high.r = c.r * shade / 100;
1530 high.g = c.g * shade / 100;
1531 high.b = c.b * shade / 100;
1532
1533 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1534 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1535 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1536 } 1533 }
1537 else 1534 else
1538 { 1535 {
1539 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1540 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1541 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1542 1539
1543 low.r = low.g = low.b = 0; 1540 low = 0;
1544 } 1541 }
1545 1542
1546 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1547 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1548 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1549 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1550 tmp = i * high.r;
1551 tmp += (mask_r>>sh_r) * low.r;
1552 lookup_r[i] = (tmp/65535)<<sh_r;
1553 }
1554 for (i = 0; i <= mask_g>>sh_g; i++)
1555 {
1556 uint32_t tmp;
1557 tmp = i * high.g;
1558 tmp += (mask_g>>sh_g) * low.g;
1559 lookup_g[i] = (tmp/65535)<<sh_g;
1560 }
1561 for (i = 0; i <= mask_b>>sh_b; i++)
1562 {
1563 uint32_t tmp;
1564 tmp = i * high.b;
1565 tmp += (mask_b>>sh_b) * low.b;
1566 lookup_b[i] = (tmp/65535)<<sh_b;
1567 }
1568 1547
1569 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1570 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1571 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1572 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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