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.164 by sf-exg, Sun Aug 14 22:01:25 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 long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = 0;
203 187
204 if (geom == NULL) 188 if (geom == NULL)
205 return false; 189 return false;
206 190
207 if (geom[0]) 191 if (geom[0])
208 { 192 {
209 char **arr = rxvt_strsplit (':', geom); 193 char **arr = rxvt_strsplit (':', geom);
210 194
211 for (int i = 0; arr[i]; i++) 195 for (int i = 0; arr[i]; i++)
212 { 196 {
213 if (!strcasecmp (arr[i], "style=tiled")) 197 if (!strcasecmp (arr[i], "style=tiled"))
214 { 198 {
215 new_flags = BG_TILE; 199 new_flags = BG_TILE;
216 w = h = noScale; 200 w = h = noScale;
217 x = y = 0; 201 x = y = 0;
218 geom_flags = WidthValue|HeightValue|XValue|YValue; 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
219 } 203 }
220 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
221 { 205 {
222 new_flags = BG_PROP_SCALE; 206 new_flags = BG_KEEP_ASPECT;
223 w = h = windowScale; 207 w = h = windowScale;
224 x = y = centerAlign; 208 x = y = centerAlign;
225 geom_flags = WidthValue|HeightValue|XValue|YValue; 209 geom_flags = WidthValue|HeightValue|XValue|YValue;
226 } 210 }
227 else if (!strcasecmp (arr[i], "style=stretched")) 211 else if (!strcasecmp (arr[i], "style=stretched"))
… …
243 w = h = noScale; 227 w = h = noScale;
244 geom_flags = WidthValue|HeightValue; 228 geom_flags = WidthValue|HeightValue;
245 } 229 }
246 else if (!strcasecmp (arr[i], "op=tile")) 230 else if (!strcasecmp (arr[i], "op=tile"))
247 new_flags |= BG_TILE; 231 new_flags |= BG_TILE;
248 else if (!strcasecmp (arr[i], "op=pscale")) 232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
249 new_flags |= BG_PROP_SCALE; 233 new_flags |= BG_KEEP_ASPECT;
250 else if (!strcasecmp (arr[i], "op=root")) 234 else if (!strcasecmp (arr[i], "op=root-align"))
251 new_flags |= BG_ROOT_ALIGN; 235 new_flags |= BG_ROOT_ALIGN;
252 236
253 // deprecated 237 // deprecated
254 else if (!strcasecmp (arr[i], "tile")) 238 else if (!strcasecmp (arr[i], "tile"))
255 { 239 {
… …
257 w = h = noScale; 241 w = h = noScale;
258 geom_flags |= WidthValue|HeightValue; 242 geom_flags |= WidthValue|HeightValue;
259 } 243 }
260 else if (!strcasecmp (arr[i], "propscale")) 244 else if (!strcasecmp (arr[i], "propscale"))
261 { 245 {
262 new_flags |= BG_PROP_SCALE; 246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
263 } 249 }
264 else if (!strcasecmp (arr[i], "hscale")) 250 else if (!strcasecmp (arr[i], "hscale"))
265 { 251 {
266 new_flags |= BG_TILE; 252 new_flags |= BG_TILE;
267 w = windowScale; 253 w = windowScale;
… …
297 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
298 } /* done parsing ops */ 284 } /* done parsing ops */
299 285
300 rxvt_free_strsplit (arr); 286 rxvt_free_strsplit (arr);
301 } 287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
302 290
303 if (!update) 291 if (!update)
304 { 292 {
305 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
306 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
338 int target_height = szHint.height; 326 int target_height = szHint.height;
339 327
340 w = h_scale * target_width / 100; 328 w = h_scale * target_width / 100;
341 h = v_scale * target_height / 100; 329 h = v_scale * target_height / 100;
342 330
343 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
344 { 332 {
345 float scale = (float)w / image_width; 333 float scale = (float)w / image_width;
346 min_it (scale, (float)h / image_height); 334 min_it (scale, (float)h / image_height);
347 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
348 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
… …
386 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
387 { 375 {
388 ShadingInfo as_shade; 376 ShadingInfo as_shade;
389 as_shade.shading = shade; 377 as_shade.shading = shade;
390 378
391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
392 if (bg_flags & BG_TINT_SET)
393 tint.get (c); 380 tint.get (c);
394 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
395 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
396 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
397 384
398 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
399 } 386 }
400 387
401 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
402 { 389 {
403 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,
404 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 ASA_XImage,
405 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
406 if (tmp) 393 if (tmp)
407 { 394 {
408 destroy_asimage (&background); 395 destroy_asimage (&background);
409 background = tmp; 396 background = tmp;
… …
428 415
429 if (!original_asim 416 if (!original_asim
430 || (!(bg_flags & BG_ROOT_ALIGN) 417 || (!(bg_flags & BG_ROOT_ALIGN)
431 && (x >= target_width 418 && (x >= target_width
432 || y >= target_height 419 || y >= target_height
433 || (x + w <= 0) 420 || x + w <= 0
434 || (y + h <= 0)))) 421 || y + h <= 0)))
435 { 422 {
436 if (background) 423 if (background)
437 { 424 {
438 new_pmap_width = background->width; 425 new_pmap_width = background->width;
439 new_pmap_height = background->height; 426 new_pmap_height = background->height;
… …
453 } 440 }
454 else 441 else
455 { 442 {
456 result = original_asim; 443 result = original_asim;
457 444
458 if ((w != original_asim->width) 445 if (w != original_asim->width
459 || (h != original_asim->height)) 446 || h != original_asim->height)
460 { 447 {
461 result = scale_asimage (asv, original_asim, 448 result = scale_asimage (asv, original_asim,
462 w, h, 449 w, h,
463 background ? ASA_ASImage : ASA_XImage, 450 ASA_XImage,
464 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
465 } 452 }
466 453
467 if (background == NULL) 454 if (background == NULL)
468 { 455 {
… …
718 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
719 706
720 if (!(bg_flags & BG_ROOT_ALIGN) 707 if (!(bg_flags & BG_ROOT_ALIGN)
721 && (x >= target_width 708 && (x >= target_width
722 || y >= target_height 709 || y >= target_height
723 || (x + w <= 0) 710 || x + w <= 0
724 || (y + h <= 0))) 711 || y + h <= 0))
725 return false; 712 return false;
726 713
727 result = pixbuf; 714 result = pixbuf;
728 715
729 if ((w != image_width) 716 if (w != image_width
730 || (h != image_height)) 717 || h != image_height)
731 { 718 {
732 result = gdk_pixbuf_scale_simple (pixbuf, 719 result = gdk_pixbuf_scale_simple (pixbuf,
733 w, h, 720 w, h,
734 GDK_INTERP_BILINEAR); 721 GDK_INTERP_BILINEAR);
735 } 722 }
… …
864rxvt_term::bg_set_file (const char *file) 851rxvt_term::bg_set_file (const char *file)
865{ 852{
866 if (!file || !*file) 853 if (!file || !*file)
867 return false; 854 return false;
868 855
856 bool ret = false;
869 if (const char *p = strchr (file, ';')) 857 const char *p = strchr (file, ';');
858
859 if (p)
870 { 860 {
871 size_t len = p - file; 861 size_t len = p - file;
872 char *f = rxvt_temp_buf<char> (len + 1); 862 char *f = rxvt_temp_buf<char> (len + 1);
873 memcpy (f, file, len); 863 memcpy (f, file, len);
874 f[len] = '\0'; 864 f[len] = '\0';
… …
883 { 873 {
884 if (original_asim) 874 if (original_asim)
885 safe_asimage_destroy (original_asim); 875 safe_asimage_destroy (original_asim);
886 original_asim = image; 876 original_asim = image;
887 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
888 return true; 878 ret = true;
889 } 879 }
890# endif 880# endif
891 881
892# ifdef HAVE_PIXBUF 882# ifdef HAVE_PIXBUF
893 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
895 { 885 {
896 if (pixbuf) 886 if (pixbuf)
897 g_object_unref (pixbuf); 887 g_object_unref (pixbuf);
898 pixbuf = image; 888 pixbuf = image;
899 bg_flags |= BG_IS_FROM_FILE; 889 bg_flags |= BG_IS_FROM_FILE;
900 return true; 890 ret = true;
901 } 891 }
902# endif 892# endif
903 893
894 if (ret)
895 {
896 if (p)
897 bg_set_geometry (p + 1);
898 else
899 bg_set_default_geometry ();
900 }
901
904 return false; 902 return ret;
905} 903}
906 904
907# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
908 906
909# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
… …
956} 954}
957 955
958void 956void
959rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
960{ 958{
961 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
962 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
963 961
964 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
965 963
966 if (bg_flags & BG_TINT_SET)
967 {
968 tint.get (c); 964 tint.get (c);
965
969 if (!has_shade 966 if (!has_shade
970 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
971 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
972 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
973 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
974 }
975 971
976 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
977 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
978} 977}
979 978
980bool 979bool
981rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
982{ 981{
983 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
984 { 983 {
985 tint = new_tint; 984 tint = new_tint;
986 bg_flags |= BG_TINT_SET;
987 set_tint_shade_flags (); 985 set_tint_shade_flags ();
988 return true; 986 return true;
989 } 987 }
990 988
991 return false; 989 return false;
992} 990}
993 991
994bool 992bool
995rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
996{ 994{
997 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
998 996
999 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
1000 if (new_shade < 0) 998 if (new_shade < 0)
1001 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
1002 1000
… …
1036bool 1034bool
1037rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1038{ 1036{
1039 bool ret = false; 1037 bool ret = false;
1040#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1042 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1044 1045
1045 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
… …
1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1119 ret = true; 1120 ret = true;
1120 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1121 } 1122 }
1122 } 1123 }
1123 else
1124 {
1125# if XRENDER 1124# if XRENDER
1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1127 1128
1128 if (bg_flags & BG_TINT_SET)
1129 tint.get (c); 1129 tint.get (c);
1130 1130
1131 if (shade <= 100) 1131 if (shade <= 100)
1132 { 1132 {
1133 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1134 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1185 ret = true; 1185 ret = true;
1186 1186
1187 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1188 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1189 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1190# endif 1191# endif
1191 }
1192 1192
1193 return ret; 1193 return ret;
1194} 1194}
1195 1195
1196/* 1196/*
… …
1280 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1281 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1282 } 1282 }
1283 1283
1284 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1285 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1286 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1287 1287
1288 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1289 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1290 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1291 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1298 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1299 1299
1300 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1301 { 1301 {
1302 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1303 && (bg_flags & BG_HAS_RENDER_CONV))
1304 { 1303 {
1305 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1306 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1307 } 1306 }
1308 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1309 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1310 { 1308 {
1311 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1312 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1313 } 1311 }
1314 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1328 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1329 1327
1330 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1331} 1329}
1332# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1333
1334#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1335static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1336# endif
1337 1331
1338bool 1332bool
1339rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1340{ 1334{
1341 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1346 { 1340 {
1347 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1348 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1349 if (tr_flags == 0) 1343 if (tr_flags == 0)
1350 return false; 1344 return false;
1351 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1352 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1353 } 1346 }
1354# endif 1347# endif
1355 1348
1356# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1357 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1363# endif 1356# endif
1364 1357
1365# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1366 XImage *result = NULL; 1359 XImage *result = NULL;
1367 1360
1368 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1369 { 1362 {
1370 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);
1371 } 1364 }
1372 1365
1373 if (result) 1366 if (result)
1374 { 1367 {
1375 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1376 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1377 { 1370 if (1)
1378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1379 if (bg_flags & BG_TINT_SET)
1380 tint.get (c);
1381 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1382 }
1383 1372
1384 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1385 1374
1386 if (gc) 1375 if (gc)
1387 { 1376 {
1388 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);
1389 1378
1390 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1391 bg_flags |= BG_IS_VALID;
1392 } 1380 }
1393 1381
1394 XDestroyImage (result); 1382 XDestroyImage (result);
1395 } 1383 }
1396# endif 1384# endif
… …
1414 1402
1415void 1403void
1416rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1417{ 1405{
1418#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1419 shade = 100; 1409 shade = 100;
1420#endif 1410#endif
1421 1411
1422 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1423#if XRENDER 1413#if XRENDER
… …
1437} 1427}
1438 1428
1439#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1440 1430
1441#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1442/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1443 1433
1444static void 1434static inline void
1445shade_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)
1446{ 1448{
1447 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1448 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1450 rgba low; 1452 unsigned short low;
1451 rgba high;
1452 int i;
1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1454 1454
1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1456 1456
1457 /* for convenience */ 1457 /* for convenience */
… …
1516 break; 1516 break;
1517 default: 1517 default:
1518 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1519 } 1519 }
1520 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1521 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1522 if (shade > 100) 1526 if (shade > 100)
1523 { 1527 {
1524 shade = 200 - shade;
1525
1526 high.r = c.r * shade / 100;
1527 high.g = c.g * shade / 100;
1528 high.b = c.b * shade / 100;
1529
1530 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1531 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1532 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1533 } 1533 }
1534 else 1534 else
1535 { 1535 {
1536 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1537 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1538 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1539 1539
1540 low.r = low.g = low.b = 0; 1540 low = 0;
1541 } 1541 }
1542 1542
1543 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1544 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1545 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1546 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1547 tmp = i * high.r;
1548 tmp += (mask_r>>sh_r) * low.r;
1549 lookup_r[i] = (tmp/65535)<<sh_r;
1550 }
1551 for (i = 0; i <= mask_g>>sh_g; i++)
1552 {
1553 uint32_t tmp;
1554 tmp = i * high.g;
1555 tmp += (mask_g>>sh_g) * low.g;
1556 lookup_g[i] = (tmp/65535)<<sh_g;
1557 }
1558 for (i = 0; i <= mask_b>>sh_b; i++)
1559 {
1560 uint32_t tmp;
1561 tmp = i * high.b;
1562 tmp += (mask_b>>sh_b) * low.b;
1563 lookup_b[i] = (tmp/65535)<<sh_b;
1564 }
1565 1547
1566 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1567 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1568 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1569 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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