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.165 by sf-exg, Mon Aug 15 09:25:56 2011 UTC vs.
Revision 1.187 by sf-exg, Wed Dec 28 13:13:33 2011 UTC

… …
150 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
151 151
152 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
153 return diff * align / 100; 153 return diff * align / 100;
154 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
155 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
156 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
157 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
158 return 0; 158 return 0;
159} 159}
160 160
161static inline int 161static inline int
162make_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)
… …
181{ 181{
182 bool changed = false; 182 bool changed = false;
183 int geom_flags = 0; 183 int geom_flags = 0;
184 int x = 0, y = 0; 184 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
186 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = 0;
187 187
188 if (geom == NULL) 188 if (geom == NULL)
189 return false; 189 return false;
190 190
191 if (geom[0]) 191 if (geom[0])
192 { 192 {
193 char **arr = rxvt_strsplit (':', geom); 193 char **arr = rxvt_strsplit (':', geom);
194 194
195 for (int i = 0; arr[i]; i++) 195 for (int i = 0; arr[i]; i++)
196 { 196 {
197 if (!strcasecmp (arr[i], "style=tiled")) 197 if (!strcasecmp (arr[i], "style=tiled"))
198 { 198 {
199 new_flags = BG_TILE; 199 new_flags = BG_TILE;
200 w = h = noScale; 200 w = h = noScale;
201 x = y = 0; 201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue; 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 } 203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 { 205 {
206 new_flags = BG_PROP_SCALE; 206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale; 207 w = h = windowScale;
208 x = y = centerAlign; 208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue; 209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 } 210 }
211 else if (!strcasecmp (arr[i], "style=stretched")) 211 else if (!strcasecmp (arr[i], "style=stretched"))
… …
227 w = h = noScale; 227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue; 228 geom_flags = WidthValue|HeightValue;
229 } 229 }
230 else if (!strcasecmp (arr[i], "op=tile")) 230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE; 231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale")) 232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_PROP_SCALE; 233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root")) 234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN; 235 new_flags |= BG_ROOT_ALIGN;
236 236
237 // deprecated 237 // deprecated
238 else if (!strcasecmp (arr[i], "tile")) 238 else if (!strcasecmp (arr[i], "tile"))
239 { 239 {
… …
241 w = h = noScale; 241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue; 242 geom_flags |= WidthValue|HeightValue;
243 } 243 }
244 else if (!strcasecmp (arr[i], "propscale")) 244 else if (!strcasecmp (arr[i], "propscale"))
245 { 245 {
246 new_flags |= BG_PROP_SCALE; 246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
247 } 249 }
248 else if (!strcasecmp (arr[i], "hscale")) 250 else if (!strcasecmp (arr[i], "hscale"))
249 { 251 {
250 new_flags |= BG_TILE; 252 new_flags |= BG_TILE;
251 w = windowScale; 253 w = windowScale;
… …
281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
282 } /* done parsing ops */ 284 } /* done parsing ops */
283 285
284 rxvt_free_strsplit (arr); 286 rxvt_free_strsplit (arr);
285 } 287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
286 290
287 if (!update) 291 if (!update)
288 { 292 {
289 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
290 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
322 int target_height = szHint.height; 326 int target_height = szHint.height;
323 327
324 w = h_scale * target_width / 100; 328 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100; 329 h = v_scale * target_height / 100;
326 330
327 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
328 { 332 {
329 float scale = (float)w / image_width; 333 float scale = (float)w / image_width;
330 min_it (scale, (float)h / image_height); 334 min_it (scale, (float)h / image_height);
331 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
332 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
… …
370 if (tr_flags & BG_NEEDS_TINT) 374 if (tr_flags & BG_NEEDS_TINT)
371 { 375 {
372 ShadingInfo as_shade; 376 ShadingInfo as_shade;
373 as_shade.shading = shade; 377 as_shade.shading = shade;
374 378
375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 379 rgba c;
376 if (bg_flags & BG_TINT_SET)
377 tint.get (c); 380 tint.get (c);
378 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
379 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
380 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
381 384
382 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
383 } 386 }
384 387
385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
386 { 389 {
387 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,
388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 ASA_XImage,
389 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
390 if (tmp) 393 if (tmp)
391 { 394 {
392 destroy_asimage (&background); 395 destroy_asimage (&background);
393 background = tmp; 396 background = tmp;
… …
412 415
413 if (!original_asim 416 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 417 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 418 && (x >= target_width
416 || y >= target_height 419 || y >= target_height
417 || (x + w <= 0) 420 || x + w <= 0
418 || (y + h <= 0)))) 421 || y + h <= 0)))
419 { 422 {
420 if (background) 423 if (background)
421 { 424 {
422 new_pmap_width = background->width; 425 new_pmap_width = background->width;
423 new_pmap_height = background->height; 426 new_pmap_height = background->height;
… …
437 } 440 }
438 else 441 else
439 { 442 {
440 result = original_asim; 443 result = original_asim;
441 444
442 if ((w != original_asim->width) 445 if (w != original_asim->width
443 || (h != original_asim->height)) 446 || h != original_asim->height)
444 { 447 {
445 result = scale_asimage (asv, original_asim, 448 result = scale_asimage (asv, original_asim,
446 w, h, 449 w, h,
447 background ? ASA_ASImage : ASA_XImage, 450 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
449 } 452 }
450 453
451 if (background == NULL) 454 if (background == NULL)
452 { 455 {
… …
702 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
703 706
704 if (!(bg_flags & BG_ROOT_ALIGN) 707 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 708 && (x >= target_width
706 || y >= target_height 709 || y >= target_height
707 || (x + w <= 0) 710 || x + w <= 0
708 || (y + h <= 0))) 711 || y + h <= 0))
709 return false; 712 return false;
710 713
711 result = pixbuf; 714 result = pixbuf;
712 715
713 if ((w != image_width) 716 if (w != image_width
714 || (h != image_height)) 717 || h != image_height)
715 { 718 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 719 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 720 w, h,
718 GDK_INTERP_BILINEAR); 721 GDK_INTERP_BILINEAR);
719 } 722 }
… …
848rxvt_term::bg_set_file (const char *file) 851rxvt_term::bg_set_file (const char *file)
849{ 852{
850 if (!file || !*file) 853 if (!file || !*file)
851 return false; 854 return false;
852 855
856 bool ret = false;
853 if (const char *p = strchr (file, ';')) 857 const char *p = strchr (file, ';');
858
859 if (p)
854 { 860 {
855 size_t len = p - file; 861 size_t len = p - file;
856 char *f = rxvt_temp_buf<char> (len + 1); 862 char *f = rxvt_temp_buf<char> (len + 1);
857 memcpy (f, file, len); 863 memcpy (f, file, len);
858 f[len] = '\0'; 864 f[len] = '\0';
… …
867 { 873 {
868 if (original_asim) 874 if (original_asim)
869 safe_asimage_destroy (original_asim); 875 safe_asimage_destroy (original_asim);
870 original_asim = image; 876 original_asim = image;
871 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
872 return true; 878 ret = true;
873 } 879 }
874# endif 880# endif
875 881
876# ifdef HAVE_PIXBUF 882# ifdef HAVE_PIXBUF
877 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
879 { 885 {
880 if (pixbuf) 886 if (pixbuf)
881 g_object_unref (pixbuf); 887 g_object_unref (pixbuf);
882 pixbuf = image; 888 pixbuf = image;
883 bg_flags |= BG_IS_FROM_FILE; 889 bg_flags |= BG_IS_FROM_FILE;
884 return true; 890 ret = true;
885 } 891 }
886# endif 892# endif
887 893
894 if (ret)
895 {
896 if (p)
897 bg_set_geometry (p + 1);
898 else
899 bg_set_default_geometry ();
900 }
901
888 return false; 902 return ret;
889} 903}
890 904
891# endif /* BG_IMAGE_FROM_FILE */ 905# endif /* BG_IMAGE_FROM_FILE */
892 906
893# ifdef ENABLE_TRANSPARENCY 907# ifdef ENABLE_TRANSPARENCY
… …
940} 954}
941 955
942void 956void
943rxvt_term::set_tint_shade_flags () 957rxvt_term::set_tint_shade_flags ()
944{ 958{
945 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 959 rgba c;
946 bool has_shade = shade != 100; 960 bool has_shade = shade != 100;
947 961
948 bg_flags &= ~BG_TINT_FLAGS; 962 bg_flags &= ~BG_TINT_FLAGS;
949 963
950 if (bg_flags & BG_TINT_SET)
951 {
952 tint.get (c); 964 tint.get (c);
965
953 if (!has_shade 966 if (!has_shade
954 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
955 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
956 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
957 bg_flags |= BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
958 }
959 971
960 if (has_shade || (bg_flags & BG_TINT_SET)) 972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
961 bg_flags |= BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
962} 977}
963 978
964bool 979bool
965rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
966{ 981{
967 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (tint != new_tint)
968 { 983 {
969 tint = new_tint; 984 tint = new_tint;
970 bg_flags |= BG_TINT_SET;
971 set_tint_shade_flags (); 985 set_tint_shade_flags ();
972 return true; 986 return true;
973 } 987 }
974 988
975 return false; 989 return false;
976} 990}
977 991
978bool 992bool
979rxvt_term::bg_set_shade (const char *shade_str) 993rxvt_term::bg_set_shade (const char *shade_str)
980{ 994{
981 int new_shade = (shade_str) ? atoi (shade_str) : 100; 995 int new_shade = atoi (shade_str);
982 996
983 clamp_it (new_shade, -100, 200); 997 clamp_it (new_shade, -100, 200);
984 if (new_shade < 0) 998 if (new_shade < 0)
985 new_shade = 200 - (100 + new_shade); 999 new_shade = 200 - (100 + new_shade);
986 1000
… …
1020bool 1034bool
1021rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1022{ 1036{
1023 bool ret = false; 1037 bool ret = false;
1024#if XRENDER 1038#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false;
1041
1025 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1026 double *kernel = (double *)malloc (size * sizeof (double)); 1043 double *kernel = (double *)malloc (size * sizeof (double));
1027 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1028 1045
1029 XRenderPictureAttributes pa; 1046 XRenderPictureAttributes pa;
… …
1102 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1103 ret = true; 1120 ret = true;
1104 XFreeGC (dpy, gc); 1121 XFreeGC (dpy, gc);
1105 } 1122 }
1106 } 1123 }
1107 else
1108 {
1109# if XRENDER 1124# if XRENDER
1110 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1125 else if (bg_flags & BG_HAS_RENDER)
1126 {
1127 rgba c;
1111 1128
1112 if (bg_flags & BG_TINT_SET)
1113 tint.get (c); 1129 tint.get (c);
1114 1130
1115 if (shade <= 100) 1131 if (shade <= 100)
1116 { 1132 {
1117 c.r = c.r * shade / 100; 1133 c.r = c.r * shade / 100;
1118 c.g = c.g * shade / 100; 1134 c.g = c.g * shade / 100;
… …
1169 ret = true; 1185 ret = true;
1170 1186
1171 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1172 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1173 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1174# endif 1191# endif
1175 }
1176 1192
1177 return ret; 1193 return ret;
1178} 1194}
1179 1195
1180/* 1196/*
… …
1264 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1265 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1266 } 1282 }
1267 1283
1268 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1269 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1270 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1271 1287
1272 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1273 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1274 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1275 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1281 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1282 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1283 1299
1284 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1285 { 1301 {
1286 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1287 && (bg_flags & BG_HAS_RENDER_CONV))
1288 { 1303 {
1289 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1290 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1291 } 1306 }
1292 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1293 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1294 { 1308 {
1295 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1296 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1297 } 1311 }
1298 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1312 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1313 1327
1314 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1315} 1329}
1316# endif /* ENABLE_TRANSPARENCY */ 1330# endif /* ENABLE_TRANSPARENCY */
1317
1318#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1319static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1320# endif
1321 1331
1322bool 1332bool
1323rxvt_term::bg_render () 1333rxvt_term::bg_render ()
1324{ 1334{
1325 unsigned long tr_flags = 0; 1335 unsigned long tr_flags = 0;
… …
1330 { 1340 {
1331 /* we need to re-generate transparency pixmap in that case ! */ 1341 /* we need to re-generate transparency pixmap in that case ! */
1332 tr_flags = make_transparency_pixmap (); 1342 tr_flags = make_transparency_pixmap ();
1333 if (tr_flags == 0) 1343 if (tr_flags == 0)
1334 return false; 1344 return false;
1335 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1336 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1337 } 1346 }
1338# endif 1347# endif
1339 1348
1340# ifdef BG_IMAGE_FROM_FILE 1349# ifdef BG_IMAGE_FROM_FILE
1341 if ((bg_flags & BG_IS_FROM_FILE) 1350 if ((bg_flags & BG_IS_FROM_FILE)
… …
1347# endif 1356# endif
1348 1357
1349# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1350 XImage *result = NULL; 1359 XImage *result = NULL;
1351 1360
1352 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1361 if (tr_flags & BG_NEEDS_TINT)
1353 { 1362 {
1354 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);
1355 } 1364 }
1356 1365
1357 if (result) 1366 if (result)
1358 { 1367 {
1359 /* our own client-side tinting */ 1368 /* our own client-side tinting */
1360 if (tr_flags & BG_NEEDS_TINT) 1369 //if (tr_flags & BG_NEEDS_TINT)
1361 { 1370 if (1)
1362 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1363 if (bg_flags & BG_TINT_SET)
1364 tint.get (c);
1365 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1366 }
1367 1372
1368 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1369 1374
1370 if (gc) 1375 if (gc)
1371 { 1376 {
1372 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);
1373 1378
1374 XFreeGC (dpy, gc); 1379 XFreeGC (dpy, gc);
1375 bg_flags |= BG_IS_VALID;
1376 } 1380 }
1377 1381
1378 XDestroyImage (result); 1382 XDestroyImage (result);
1379 } 1383 }
1380# endif 1384# endif
… …
1398 1402
1399void 1403void
1400rxvt_term::bg_init () 1404rxvt_term::bg_init ()
1401{ 1405{
1402#ifdef ENABLE_TRANSPARENCY 1406#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1403 shade = 100; 1409 shade = 100;
1404#endif 1410#endif
1405 1411
1406 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1407#if XRENDER 1413#if XRENDER
… …
1421} 1427}
1422 1428
1423#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1424 1430
1425#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1426/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1427 1433
1428static void 1434static inline void
1429shade_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)
1430{ 1448{
1431 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1432 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1433 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1434 rgba low; 1452 unsigned short low;
1435 rgba high;
1436 int i;
1437 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1438 1454
1439 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1440 1456
1441 /* for convenience */ 1457 /* for convenience */
… …
1500 break; 1516 break;
1501 default: 1517 default:
1502 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1503 } 1519 }
1504 1520
1521 rgba c;
1522
1523 tint.get (c);
1524
1505 /* prepare limits for color transformation (each channel is handled separately) */ 1525 /* prepare limits for color transformation (each channel is handled separately) */
1506 if (shade > 100) 1526 if (shade > 100)
1507 { 1527 {
1508 shade = 200 - shade;
1509
1510 high.r = c.r * shade / 100;
1511 high.g = c.g * shade / 100;
1512 high.b = c.b * shade / 100;
1513
1514 low.r = 65535 * (100 - shade) / 100; 1528 c.r = c.r * (200 - shade) / 100;
1515 low.g = 65535 * (100 - shade) / 100; 1529 c.g = c.g * (200 - shade) / 100;
1516 low.b = 65535 * (100 - shade) / 100; 1530 c.b = c.b * (200 - shade) / 100;
1531
1532 low = 0xffff * (shade - 100) / 100;
1517 } 1533 }
1518 else 1534 else
1519 { 1535 {
1520 high.r = c.r * shade / 100; 1536 c.r = c.r * shade / 100;
1521 high.g = c.g * shade / 100; 1537 c.g = c.g * shade / 100;
1522 high.b = c.b * shade / 100; 1538 c.b = c.b * shade / 100;
1523 1539
1524 low.r = low.g = low.b = 0; 1540 low = 0;
1525 } 1541 }
1526 1542
1527 /* fill our lookup tables */ 1543 /* fill our lookup tables */
1528 for (i = 0; i <= mask_r>>sh_r; i++) 1544 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1529 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1530 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1531 tmp = i * high.r;
1532 tmp += (mask_r>>sh_r) * low.r;
1533 lookup_r[i] = (tmp/65535)<<sh_r;
1534 }
1535 for (i = 0; i <= mask_g>>sh_g; i++)
1536 {
1537 uint32_t tmp;
1538 tmp = i * high.g;
1539 tmp += (mask_g>>sh_g) * low.g;
1540 lookup_g[i] = (tmp/65535)<<sh_g;
1541 }
1542 for (i = 0; i <= mask_b>>sh_b; i++)
1543 {
1544 uint32_t tmp;
1545 tmp = i * high.b;
1546 tmp += (mask_b>>sh_b) * low.b;
1547 lookup_b[i] = (tmp/65535)<<sh_b;
1548 }
1549 1547
1550 /* apply table to input image (replacing colors by newly calculated ones) */ 1548 /* apply table to input image (replacing colors by newly calculated ones) */
1551 if (ximage->bits_per_pixel == 32 1549 if (ximage->bits_per_pixel == 32
1552 && (ximage->depth == 24 || ximage->depth == 32) 1550 && (ximage->depth == 24 || ximage->depth == 32)
1553 && ximage->byte_order == host_byte_order) 1551 && ximage->byte_order == host_byte_order)

Diff Legend

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