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.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.132 by sf-exg, Mon Jan 10 20:46:20 2011 UTC

… …
175# endif 175# endif
176 176
177 return false; 177 return false;
178} 178}
179 179
180bool bgPixmap_t::need_client_side_rendering ()
181{
182# ifdef HAVE_AFTERIMAGE
183 if (original_asim)
184 return true;
185# endif
186 return false;
187}
188
189# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
190static inline bool 181static inline bool
191check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 182check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
192{ 183{
193 if (geom_flags & flag) 184 if (geom_flags & flag)
… …
275 if (ops == NULL) 266 if (ops == NULL)
276 n = strlen (geom); 267 n = strlen (geom);
277 else 268 else
278 n = ops - geom; 269 n = ops - geom;
279 270
280 if (n < MAXLEN_GEOM) 271 if (n >= MAXLEN_GEOM)
281 { 272 return false;
273
282 memcpy (str, geom, n); 274 memcpy (str, geom, n);
283 str[n] = '\0'; 275 str[n] = '\0';
284 rxvt_strtrim (str); 276 rxvt_strtrim (str);
285 277
286 if (str[0]) 278 if (str[0])
287 { 279 {
288 /* we have geometry string - let's handle it prior to applying ops */ 280 /* we have geometry string - let's handle it prior to applying ops */
289 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
290 } /* done parsing geometry string */ 282 } /* done parsing geometry string */
291 283
292 if (!update) 284 if (!update)
293 { 285 {
294 if (!(geom_flags & XValue)) 286 if (!(geom_flags & XValue))
295 x = y = defaultAlign; 287 x = y = defaultAlign;
296 else if (!(geom_flags & YValue)) 288 else if (!(geom_flags & YValue))
297 y = x; 289 y = x;
298 290
299 if (!(geom_flags & (WidthValue|HeightValue))) 291 if (!(geom_flags & (WidthValue|HeightValue)))
300 w = h = defaultScale; 292 w = h = defaultScale;
301 else if (!(geom_flags & HeightValue)) 293 else if (!(geom_flags & HeightValue))
302 h = w; 294 h = w;
303 else if (!(geom_flags & WidthValue)) 295 else if (!(geom_flags & WidthValue))
304 w = h; 296 w = h;
305 297
306 geom_flags |= WidthValue|HeightValue|XValue|YValue; 298 geom_flags |= WidthValue|HeightValue|XValue|YValue;
299 }
300
301 if (ops)
302 {
303 char **arr = rxvt_strsplit (':', ops + 1);
304
305 for (int i = 0; arr[i]; i++)
307 } 306 {
308
309 if (ops)
310 {
311 while (*ops)
312 {
313 while (*ops == ':' || isspace(*ops)) ++ops;
314
315# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 307# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0)
316 if (CHECK_GEOM_OPS ("tile")) 308 if (CHECK_GEOM_OPS ("tile"))
317 { 309 {
318 w = h = noScale; 310 w = h = noScale;
319 geom_flags |= WidthValue|HeightValue; 311 geom_flags |= WidthValue|HeightValue;
320 } 312 }
321 else if (CHECK_GEOM_OPS ("propscale")) 313 else if (CHECK_GEOM_OPS ("propscale"))
322 { 314 {
323 new_flags |= propScale; 315 new_flags |= propScale;
324 } 316 }
325 else if (CHECK_GEOM_OPS ("hscale")) 317 else if (CHECK_GEOM_OPS ("hscale"))
326 { 318 {
327 if (w == 0) w = windowScale; 319 if (w == 0) w = windowScale;
328 320
329 h = noScale; 321 h = noScale;
330 geom_flags |= WidthValue|HeightValue; 322 geom_flags |= WidthValue|HeightValue;
331 } 323 }
332 else if (CHECK_GEOM_OPS ("vscale")) 324 else if (CHECK_GEOM_OPS ("vscale"))
333 { 325 {
334 if (h == 0) h = windowScale; 326 if (h == 0) h = windowScale;
335 327
336 w = noScale; 328 w = noScale;
337 geom_flags |= WidthValue|HeightValue; 329 geom_flags |= WidthValue|HeightValue;
338 } 330 }
339 else if (CHECK_GEOM_OPS ("scale")) 331 else if (CHECK_GEOM_OPS ("scale"))
340 { 332 {
341 if (h == 0) h = windowScale; 333 if (h == 0) h = windowScale;
342 if (w == 0) w = windowScale; 334 if (w == 0) w = windowScale;
343 335
344 geom_flags |= WidthValue|HeightValue; 336 geom_flags |= WidthValue|HeightValue;
345 } 337 }
346 else if (CHECK_GEOM_OPS ("auto")) 338 else if (CHECK_GEOM_OPS ("auto"))
347 { 339 {
348 w = h = windowScale; 340 w = h = windowScale;
349 x = y = centerAlign; 341 x = y = centerAlign;
350 geom_flags |= WidthValue|HeightValue|XValue|YValue; 342 geom_flags |= WidthValue|HeightValue|XValue|YValue;
351 } 343 }
352 else if (CHECK_GEOM_OPS ("root")) 344 else if (CHECK_GEOM_OPS ("root"))
353 { 345 {
354 new_flags |= rootAlign; 346 new_flags |= rootAlign;
355 w = h = noScale; 347 w = h = noScale;
356 geom_flags |= WidthValue|HeightValue; 348 geom_flags |= WidthValue|HeightValue;
357 } 349 }
358# undef CHECK_GEOM_OPS 350# undef CHECK_GEOM_OPS
359
360 while (*ops != ':' && *ops != '\0') ++ops;
361 } /* done parsing ops */ 351 } /* done parsing ops */
362 }
363 352
353 rxvt_free_strsplit (arr);
354 }
355
364 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 356 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
365 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 357 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
366 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 358 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
367 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 359 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
368 }
369 360
370 if (new_flags != flags) 361 if (new_flags != flags)
371 { 362 {
372 flags = new_flags; 363 flags = new_flags;
373 changed = true; 364 changed = true;
… …
657} 648}
658# endif /* HAVE_AFTERIMAGE */ 649# endif /* HAVE_AFTERIMAGE */
659 650
660# ifdef HAVE_PIXBUF 651# ifdef HAVE_PIXBUF
661bool 652bool
653bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
654 int src_x, int src_y, int dst_x, int dst_y,
655 unsigned int width, unsigned int height)
656{
657 XImage *ximage;
658 char *data, *line;
659 int bytes_per_pixel;
660 int width_r, width_g, width_b;
661 int sh_r, sh_g, sh_b;
662 int rowstride;
663 int channels;
664 unsigned char *row;
665 Visual *visual = target->visual;
666 int depth = target->depth;
667
668 if (visual->c_class != TrueColor)
669 return false;
670
671 if (depth == 24 || depth == 32)
672 bytes_per_pixel = 4;
673 else if (depth == 15 || depth == 16)
674 bytes_per_pixel = 2;
675 else
676 return false;
677
678 width_r = rxvt_popcount (visual->red_mask);
679 width_g = rxvt_popcount (visual->green_mask);
680 width_b = rxvt_popcount (visual->blue_mask);
681
682 if (width_r > 8 || width_g > 8 || width_b > 8)
683 return false;
684
685 sh_r = rxvt_ctz (visual->red_mask);
686 sh_g = rxvt_ctz (visual->green_mask);
687 sh_b = rxvt_ctz (visual->blue_mask);
688
689 if (width > INT_MAX / height / bytes_per_pixel)
690 return false;
691
692 data = (char *)malloc (width * height * bytes_per_pixel);
693 if (!data)
694 return false;
695
696 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
697 width, height, bytes_per_pixel * 8, 0);
698 if (!ximage)
699 {
700 free (data);
701 return false;
702 }
703
704 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
705
706 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
707 channels = gdk_pixbuf_get_n_channels (pixbuf);
708 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
709 line = data;
710
711 for (int y = 0; y < height; y++)
712 {
713 for (int x = 0; x < width; x++)
714 {
715 unsigned char *pixel = row + x * channels;
716 uint32_t value;
717
718 value = ((pixel[0] >> (8 - width_r)) << sh_r)
719 | ((pixel[1] >> (8 - width_g)) << sh_g)
720 | ((pixel[2] >> (8 - width_b)) << sh_b);
721
722 if (bytes_per_pixel == 4)
723 ((uint32_t *)line)[x] = value;
724 else
725 ((uint16_t *)line)[x] = value;
726 }
727
728 row += rowstride;
729 line += ximage->bytes_per_line;
730 }
731
732 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
733 XDestroyImage (ximage);
734 return true;
735}
736
737bool
662bgPixmap_t::render_image (unsigned long background_flags) 738bgPixmap_t::render_image (unsigned long background_flags)
663{ 739{
664 if (target == NULL) 740 if (target == NULL)
665 return false; 741 return false;
666 742
… …
747 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
748 824
749 if (h_scale == 0 || v_scale == 0) 825 if (h_scale == 0 || v_scale == 0)
750 { 826 {
751 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
752 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 828 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 829 0, 0,
754 0, 0, 830 0, 0,
755 image_width, image_height, 831 image_width, image_height);
756 XLIB_RGB_DITHER_NONE,
757 0, 0);
758 832
759 gcv.tile = tile; 833 gcv.tile = tile;
760 gcv.fill_style = FillTiled; 834 gcv.fill_style = FillTiled;
761 gcv.ts_x_origin = x; 835 gcv.ts_x_origin = x;
762 gcv.ts_y_origin = y; 836 gcv.ts_y_origin = y;
… …
777 || dst_x + dst_width < new_pmap_width 851 || dst_x + dst_width < new_pmap_width
778 || dst_y + dst_height < new_pmap_height) 852 || dst_y + dst_height < new_pmap_height)
779 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 853 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
780 854
781 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 855 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
782 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 856 pixbuf_to_pixmap (result, pixmap, gc,
783 src_x, src_y, 857 src_x, src_y,
784 dst_x, dst_y, 858 dst_x, dst_y,
785 dst_width, dst_height, 859 dst_width, dst_height);
786 XLIB_RGB_DITHER_NONE,
787 0, 0);
788 } 860 }
789 861
790#if XRENDER 862#if XRENDER
791 if (background_flags) 863 if (background_flags)
792 { 864 {
… …
859 if (image) 931 if (image)
860 { 932 {
861 if (original_asim) 933 if (original_asim)
862 safe_asimage_destroy (original_asim); 934 safe_asimage_destroy (original_asim);
863 original_asim = image; 935 original_asim = image;
936 flags |= CLIENT_RENDER;
864 have_image = true; 937 have_image = true;
865 return true; 938 return true;
866 } 939 }
867# endif 940# endif
868 941
… …
940 bool has_shade = shade != 100; 1013 bool has_shade = shade != 100;
941 1014
942 if (tint) 1015 if (tint)
943 { 1016 {
944 tint->get (c); 1017 tint->get (c);
945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1018# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1019 if (!has_shade
946 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1020 && IS_COMPONENT_WHOLESOME (c.r)
947 && IS_COMPONENT_WHOLESOME (c.g) 1021 && IS_COMPONENT_WHOLESOME (c.g)
948 && IS_COMPONENT_WHOLESOME (c.b)) 1022 && IS_COMPONENT_WHOLESOME (c.b))
949 flags |= bgPixmap_t::tintWholesome; 1023 flags |= bgPixmap_t::tintWholesome;
950# undef IS_COMPONENT_WHOLESOME 1024# undef IS_COMPONENT_WHOLESOME
951 } 1025 }
952 1026
953 if (has_shade) 1027 if (has_shade || tint)
954 flags |= bgPixmap_t::tintNeeded; 1028 flags |= bgPixmap_t::tintNeeded;
955 else if (tint)
956 {
957 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
958 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
959 {
960 flags |= bgPixmap_t::tintNeeded;
961 }
962 }
963 1029
964 return flags; 1030 return flags;
965} 1031}
966 1032
967bool 1033bool
… …
970 if (!(flags & tintSet) || tint != new_tint) 1036 if (!(flags & tintSet) || tint != new_tint)
971 { 1037 {
972 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1038 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
973 tint = new_tint; 1039 tint = new_tint;
974 flags = (flags & ~tintFlags) | new_flags | tintSet; 1040 flags = (flags & ~tintFlags) | new_flags | tintSet;
975 return true;
976 }
977
978 return false;
979}
980
981bool
982bgPixmap_t::unset_tint ()
983{
984 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
985
986 if (new_flags != (flags & tintFlags))
987 {
988 flags = (flags & ~tintFlags) | new_flags;
989 return true; 1041 return true;
990 } 1042 }
991 1043
992 return false; 1044 return false;
993} 1045}
… …
1138 c.g = (c.g * shade) / 100; 1190 c.g = (c.g * shade) / 100;
1139 c.b = (c.b * shade) / 100; 1191 c.b = (c.b * shade) / 100;
1140 } 1192 }
1141 else 1193 else
1142 { 1194 {
1143 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1195 c.r = (c.r * (200 - shade)) / 100;
1144 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1196 c.g = (c.g * (200 - shade)) / 100;
1145 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1197 c.b = (c.b * (200 - shade)) / 100;
1146 } 1198 }
1147 1199
1148 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1200 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1149 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1201 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1150 XRenderPictureAttributes pa; 1202 XRenderPictureAttributes pa;
… …
1164 1216
1165 if (mask_pic && overlay_pic && back_pic) 1217 if (mask_pic && overlay_pic && back_pic)
1166 { 1218 {
1167 XRenderColor mask_c; 1219 XRenderColor mask_c;
1168 1220
1169 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1221 mask_c.red = mask_c.green = mask_c.blue = 0;
1170 mask_c.alpha = 0xffff; 1222 mask_c.alpha = 0xffff;
1171 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1223 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1172 1224
1173 mask_c.alpha = 0; 1225 mask_c.alpha = 0;
1174 mask_c.red = 0xffff - c.r; 1226 mask_c.red = 0xffff - c.r;
1175 mask_c.green = 0xffff - c.g; 1227 mask_c.green = 0xffff - c.g;
1176 mask_c.blue = 0xffff - c.b; 1228 mask_c.blue = 0xffff - c.b;
1177 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1229 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1178 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1230 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1231
1232 if (shade > 100)
1233 {
1234 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1235 mask_c.alpha = 0;
1236 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1237
1238 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239 }
1240
1179 ret = true; 1241 ret = true;
1180 } 1242 }
1181 1243
1182 XRenderFreePicture (dpy, mask_pic); 1244 XRenderFreePicture (dpy, mask_pic);
1183 XRenderFreePicture (dpy, overlay_pic); 1245 XRenderFreePicture (dpy, overlay_pic);
… …
1278 1340
1279 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1280 return 0; 1342 return 0;
1281 1343
1282 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1345 while (sx < 0) sx += (int)root_width;
1346 while (sy < 0) sy += (int)root_height;
1347
1283 gcv.tile = recoded_root_pmap; 1348 gcv.tile = recoded_root_pmap;
1284 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
1285
1286 while (sx < 0) sx += (int)root_width;
1287 while (sy < 0) sy += (int)root_height;
1288
1289 gcv.ts_x_origin = -sx; 1350 gcv.ts_x_origin = -sx;
1290 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1292 1353
1293 if (gc) 1354 if (gc)
1294 { 1355 {
1295 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1296 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1297 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1298 1359
1299 if (!need_client_side_rendering ()) 1360 if (!(flags & CLIENT_RENDER))
1300 { 1361 {
1301 if ((flags & blurNeeded) 1362 if ((flags & blurNeeded)
1302 && (flags & HAS_RENDER_CONV)) 1363 && (flags & HAS_RENDER_CONV))
1303 { 1364 {
1304 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
… …
1330} 1391}
1331 1392
1332void 1393void
1333bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
1334{ 1395{
1335 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1396 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1336 if (new_root_pixmap == None) 1397 if (new_root_pixmap == None)
1337 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1398 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1338 1399
1339 root_pixmap = new_root_pixmap; 1400 root_pixmap = new_root_pixmap;
1340} 1401}
1341# endif /* ENABLE_TRANSPARENCY */ 1402# endif /* ENABLE_TRANSPARENCY */
1342 1403
1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1404#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1405static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1345# endif 1406# endif
1346 1407
1347bool 1408bool
1348bgPixmap_t::render () 1409bgPixmap_t::render ()
1349{ 1410{
… …
1359 /* we need to re-generate transparency pixmap in that case ! */ 1420 /* we need to re-generate transparency pixmap in that case ! */
1360 background_flags = make_transparency_pixmap (); 1421 background_flags = make_transparency_pixmap ();
1361 if (background_flags == 0) 1422 if (background_flags == 0)
1362 return false; 1423 return false;
1363 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1424 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1364 flags = flags & ~isInvalid; 1425 flags &= ~isInvalid;
1365 } 1426 }
1366# endif 1427# endif
1367 1428
1368# ifdef BG_IMAGE_FROM_FILE 1429# ifdef BG_IMAGE_FROM_FILE
1369 if (have_image 1430 if (have_image
1370 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1431 || (background_flags & transpTransformations) != (flags & transpTransformations))
1371 { 1432 {
1372 if (render_image (background_flags)) 1433 if (render_image (background_flags))
1373 flags = flags & ~isInvalid; 1434 flags &= ~isInvalid;
1374 } 1435 }
1375# endif 1436# endif
1376 1437
1377# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1378 XImage *result = NULL; 1439 XImage *result = NULL;
… …
1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1389 { 1450 {
1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1391 if (flags & tintSet) 1452 if (flags & tintSet)
1392 tint.get (c); 1453 tint.get (c);
1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1454 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1394 } 1455 }
1395 1456
1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1457 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1397 1458
1398 if (gc) 1459 if (gc)
1399 { 1460 {
1400 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1461 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1401 1462
1402 XFreeGC (target->dpy, gc); 1463 XFreeGC (target->dpy, gc);
1403 flags = flags & ~isInvalid; 1464 flags &= ~isInvalid;
1404 } 1465 }
1405 1466
1406 XDestroyImage (result); 1467 XDestroyImage (result);
1407 } 1468 }
1408# endif 1469# endif
… …
1503 1564
1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1565#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1505/* taken from aterm-0.4.2 */ 1566/* taken from aterm-0.4.2 */
1506 1567
1507static void 1568static void
1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1569shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1509{ 1570{
1510 int sh_r, sh_g, sh_b; 1571 int sh_r, sh_g, sh_b;
1511 uint32_t mask_r, mask_g, mask_b; 1572 uint32_t mask_r, mask_g, mask_b;
1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1573 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1513 rgba low; 1574 rgba low;
1514 rgba high; 1575 rgba high;
1515 int i; 1576 int i;
1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1577 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1517 1578
1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1579 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1519 1580
1520 /* for convenience */ 1581 /* for convenience */
1521 mask_r = visual->red_mask; 1582 mask_r = visual->red_mask;
1522 mask_g = visual->green_mask; 1583 mask_g = visual->green_mask;
1523 mask_b = visual->blue_mask; 1584 mask_b = visual->blue_mask;
1524 1585
1525 /* boring lookup table pre-initialization */ 1586 /* boring lookup table pre-initialization */
1526 switch (srcImage->depth) 1587 switch (ximage->depth)
1527 { 1588 {
1528 case 15: 1589 case 15:
1529 if ((mask_r != 0x7c00) || 1590 if ((mask_r != 0x7c00) ||
1530 (mask_g != 0x03e0) || 1591 (mask_g != 0x03e0) ||
1531 (mask_b != 0x001f)) 1592 (mask_b != 0x001f))
… …
1584 /* prepare limits for color transformation (each channel is handled separately) */ 1645 /* prepare limits for color transformation (each channel is handled separately) */
1585 if (shade > 100) 1646 if (shade > 100)
1586 { 1647 {
1587 shade = 200 - shade; 1648 shade = 200 - shade;
1588 1649
1589 high.r = (65535 - c.r) * shade / 100; 1650 high.r = c.r * shade / 100;
1590 high.g = (65535 - c.g) * shade / 100; 1651 high.g = c.g * shade / 100;
1591 high.b = (65535 - c.b) * shade / 100; 1652 high.b = c.b * shade / 100;
1592 1653
1593 low.r = 65535 - high.r; 1654 low.r = 65535 * (100 - shade) / 100;
1594 low.g = 65535 - high.g; 1655 low.g = 65535 * (100 - shade) / 100;
1595 low.b = 65535 - high.b; 1656 low.b = 65535 * (100 - shade) / 100;
1596 } 1657 }
1597 else 1658 else
1598 { 1659 {
1599 high.r = c.r * shade / 100; 1660 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100; 1661 high.g = c.g * shade / 100;
… …
1625 tmp += (mask_b>>sh_b) * low.b; 1686 tmp += (mask_b>>sh_b) * low.b;
1626 lookup_b[i] = (tmp/65535)<<sh_b; 1687 lookup_b[i] = (tmp/65535)<<sh_b;
1627 } 1688 }
1628 1689
1629 /* apply table to input image (replacing colors by newly calculated ones) */ 1690 /* apply table to input image (replacing colors by newly calculated ones) */
1630 if (srcImage->bits_per_pixel == 32 1691 if (ximage->bits_per_pixel == 32
1631 && (srcImage->depth == 24 || srcImage->depth == 32) 1692 && (ximage->depth == 24 || ximage->depth == 32)
1632 && srcImage->byte_order == host_byte_order) 1693 && ximage->byte_order == host_byte_order)
1633 { 1694 {
1634 uint32_t *p1, *pf, *p, *pl; 1695 uint32_t *p1, *pf, *p, *pl;
1635 p1 = (uint32_t *) srcImage->data; 1696 p1 = (uint32_t *) ximage->data;
1636 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1697 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1637 1698
1638 while (p1 < pf) 1699 while (p1 < pf)
1639 { 1700 {
1640 p = p1; 1701 p = p1;
1641 pl = p1 + srcImage->width; 1702 pl = p1 + ximage->width;
1642 for (; p < pl; p++) 1703 for (; p < pl; p++)
1643 { 1704 {
1644 *p = lookup_r[(*p & 0xff0000) >> 16] | 1705 *p = lookup_r[(*p & 0xff0000) >> 16] |
1645 lookup_g[(*p & 0x00ff00) >> 8] | 1706 lookup_g[(*p & 0x00ff00) >> 8] |
1646 lookup_b[(*p & 0x0000ff)] | 1707 lookup_b[(*p & 0x0000ff)] |
1647 (*p & 0xff000000); 1708 (*p & 0xff000000);
1648 } 1709 }
1649 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1710 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1650 } 1711 }
1651 } 1712 }
1652 else 1713 else
1653 { 1714 {
1654 for (int y = 0; y < srcImage->height; y++) 1715 for (int y = 0; y < ximage->height; y++)
1655 for (int x = 0; x < srcImage->width; x++) 1716 for (int x = 0; x < ximage->width; x++)
1656 { 1717 {
1657 unsigned long pixel = XGetPixel (srcImage, x, y); 1718 unsigned long pixel = XGetPixel (ximage, x, y);
1658 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1719 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1659 lookup_g[(pixel & mask_g) >> sh_g] | 1720 lookup_g[(pixel & mask_g) >> sh_g] |
1660 lookup_b[(pixel & mask_b) >> sh_b]; 1721 lookup_b[(pixel & mask_b) >> sh_b];
1661 XPutPixel (srcImage, x, y, pixel); 1722 XPutPixel (ximage, x, y, pixel);
1662 } 1723 }
1663 } 1724 }
1664 1725
1665 free (lookup); 1726 free (lookup);
1666} 1727}

Diff Legend

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