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.131 by sf-exg, Mon Jan 10 19:58:24 2011 UTC

… …
275 if (ops == NULL) 275 if (ops == NULL)
276 n = strlen (geom); 276 n = strlen (geom);
277 else 277 else
278 n = ops - geom; 278 n = ops - geom;
279 279
280 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
281 { 281 return false;
282
282 memcpy (str, geom, n); 283 memcpy (str, geom, n);
283 str[n] = '\0'; 284 str[n] = '\0';
284 rxvt_strtrim (str); 285 rxvt_strtrim (str);
285 286
286 if (str[0]) 287 if (str[0])
287 { 288 {
288 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
289 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
290 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
291 292
292 if (!update) 293 if (!update)
293 { 294 {
294 if (!(geom_flags & XValue)) 295 if (!(geom_flags & XValue))
295 x = y = defaultAlign; 296 x = y = defaultAlign;
296 else if (!(geom_flags & YValue)) 297 else if (!(geom_flags & YValue))
297 y = x; 298 y = x;
298 299
299 if (!(geom_flags & (WidthValue|HeightValue))) 300 if (!(geom_flags & (WidthValue|HeightValue)))
300 w = h = defaultScale; 301 w = h = defaultScale;
301 else if (!(geom_flags & HeightValue)) 302 else if (!(geom_flags & HeightValue))
302 h = w; 303 h = w;
303 else if (!(geom_flags & WidthValue)) 304 else if (!(geom_flags & WidthValue))
304 w = h; 305 w = h;
305 306
306 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
309
310 if (ops)
311 {
312 char **arr = rxvt_strsplit (':', ops + 1);
313
314 for (int i = 0; arr[i]; i++)
307 } 315 {
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) 316# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0)
316 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
317 { 318 {
318 w = h = noScale; 319 w = h = noScale;
319 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
320 } 321 }
321 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
322 { 323 {
323 new_flags |= propScale; 324 new_flags |= propScale;
324 } 325 }
325 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
326 { 327 {
327 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
328 329
329 h = noScale; 330 h = noScale;
330 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
331 } 332 }
332 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
333 { 334 {
334 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
335 336
336 w = noScale; 337 w = noScale;
337 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
338 } 339 }
339 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
340 { 341 {
341 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
342 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
343 344
344 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
345 } 346 }
346 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
347 { 348 {
348 w = h = windowScale; 349 w = h = windowScale;
349 x = y = centerAlign; 350 x = y = centerAlign;
350 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
351 } 352 }
352 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
353 { 354 {
354 new_flags |= rootAlign; 355 new_flags |= rootAlign;
355 w = h = noScale; 356 w = h = noScale;
356 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
357 } 358 }
358# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
359
360 while (*ops != ':' && *ops != '\0') ++ops;
361 } /* done parsing ops */ 360 } /* done parsing ops */
362 }
363 361
362 rxvt_free_strsplit (arr);
363 }
364
364 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 365 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; 366 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; 367 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; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
368 }
369 369
370 if (new_flags != flags) 370 if (new_flags != flags)
371 { 371 {
372 flags = new_flags; 372 flags = new_flags;
373 changed = true; 373 changed = true;
… …
657} 657}
658# endif /* HAVE_AFTERIMAGE */ 658# endif /* HAVE_AFTERIMAGE */
659 659
660# ifdef HAVE_PIXBUF 660# ifdef HAVE_PIXBUF
661bool 661bool
662bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
663 int src_x, int src_y, int dst_x, int dst_y,
664 unsigned int width, unsigned int height)
665{
666 XImage *ximage;
667 char *data, *line;
668 int bytes_per_pixel;
669 int width_r, width_g, width_b;
670 int sh_r, sh_g, sh_b;
671 int rowstride;
672 int channels;
673 unsigned char *row;
674 Visual *visual = target->visual;
675 int depth = target->depth;
676
677 if (visual->c_class != TrueColor)
678 return false;
679
680 if (depth == 24 || depth == 32)
681 bytes_per_pixel = 4;
682 else if (depth == 15 || depth == 16)
683 bytes_per_pixel = 2;
684 else
685 return false;
686
687 width_r = rxvt_popcount (visual->red_mask);
688 width_g = rxvt_popcount (visual->green_mask);
689 width_b = rxvt_popcount (visual->blue_mask);
690
691 if (width_r > 8 || width_g > 8 || width_b > 8)
692 return false;
693
694 sh_r = rxvt_ctz (visual->red_mask);
695 sh_g = rxvt_ctz (visual->green_mask);
696 sh_b = rxvt_ctz (visual->blue_mask);
697
698 if (width > INT_MAX / height / bytes_per_pixel)
699 return false;
700
701 data = (char *)malloc (width * height * bytes_per_pixel);
702 if (!data)
703 return false;
704
705 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
706 width, height, bytes_per_pixel * 8, 0);
707 if (!ximage)
708 {
709 free (data);
710 return false;
711 }
712
713 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
714
715 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
716 channels = gdk_pixbuf_get_n_channels (pixbuf);
717 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
718 line = data;
719
720 for (int y = 0; y < height; y++)
721 {
722 for (int x = 0; x < width; x++)
723 {
724 unsigned char *pixel = row + x * channels;
725 uint32_t value;
726
727 value = ((pixel[0] >> (8 - width_r)) << sh_r)
728 | ((pixel[1] >> (8 - width_g)) << sh_g)
729 | ((pixel[2] >> (8 - width_b)) << sh_b);
730
731 if (bytes_per_pixel == 4)
732 ((uint32_t *)line)[x] = value;
733 else
734 ((uint16_t *)line)[x] = value;
735 }
736
737 row += rowstride;
738 line += ximage->bytes_per_line;
739 }
740
741 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
742 XDestroyImage (ximage);
743 return true;
744}
745
746bool
662bgPixmap_t::render_image (unsigned long background_flags) 747bgPixmap_t::render_image (unsigned long background_flags)
663{ 748{
664 if (target == NULL) 749 if (target == NULL)
665 return false; 750 return false;
666 751
… …
747 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
748 833
749 if (h_scale == 0 || v_scale == 0) 834 if (h_scale == 0 || v_scale == 0)
750 { 835 {
751 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 836 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
752 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 837 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 838 0, 0,
754 0, 0, 839 0, 0,
755 image_width, image_height, 840 image_width, image_height);
756 XLIB_RGB_DITHER_NONE,
757 0, 0);
758 841
759 gcv.tile = tile; 842 gcv.tile = tile;
760 gcv.fill_style = FillTiled; 843 gcv.fill_style = FillTiled;
761 gcv.ts_x_origin = x; 844 gcv.ts_x_origin = x;
762 gcv.ts_y_origin = y; 845 gcv.ts_y_origin = y;
… …
777 || dst_x + dst_width < new_pmap_width 860 || dst_x + dst_width < new_pmap_width
778 || dst_y + dst_height < new_pmap_height) 861 || dst_y + dst_height < new_pmap_height)
779 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 862 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
780 863
781 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 864 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
782 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 865 pixbuf_to_pixmap (result, pixmap, gc,
783 src_x, src_y, 866 src_x, src_y,
784 dst_x, dst_y, 867 dst_x, dst_y,
785 dst_width, dst_height, 868 dst_width, dst_height);
786 XLIB_RGB_DITHER_NONE,
787 0, 0);
788 } 869 }
789 870
790#if XRENDER 871#if XRENDER
791 if (background_flags) 872 if (background_flags)
792 { 873 {
… …
940 bool has_shade = shade != 100; 1021 bool has_shade = shade != 100;
941 1022
942 if (tint) 1023 if (tint)
943 { 1024 {
944 tint->get (c); 1025 tint->get (c);
945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1027 if (!has_shade
946 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1028 && IS_COMPONENT_WHOLESOME (c.r)
947 && IS_COMPONENT_WHOLESOME (c.g) 1029 && IS_COMPONENT_WHOLESOME (c.g)
948 && IS_COMPONENT_WHOLESOME (c.b)) 1030 && IS_COMPONENT_WHOLESOME (c.b))
949 flags |= bgPixmap_t::tintWholesome; 1031 flags |= bgPixmap_t::tintWholesome;
950# undef IS_COMPONENT_WHOLESOME 1032# undef IS_COMPONENT_WHOLESOME
951 } 1033 }
952 1034
953 if (has_shade) 1035 if (has_shade || tint)
954 flags |= bgPixmap_t::tintNeeded; 1036 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 1037
964 return flags; 1038 return flags;
965} 1039}
966 1040
967bool 1041bool
… …
970 if (!(flags & tintSet) || tint != new_tint) 1044 if (!(flags & tintSet) || tint != new_tint)
971 { 1045 {
972 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1046 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
973 tint = new_tint; 1047 tint = new_tint;
974 flags = (flags & ~tintFlags) | new_flags | tintSet; 1048 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; 1049 return true;
990 } 1050 }
991 1051
992 return false; 1052 return false;
993} 1053}
… …
1138 c.g = (c.g * shade) / 100; 1198 c.g = (c.g * shade) / 100;
1139 c.b = (c.b * shade) / 100; 1199 c.b = (c.b * shade) / 100;
1140 } 1200 }
1141 else 1201 else
1142 { 1202 {
1143 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1203 c.r = (c.r * (200 - shade)) / 100;
1144 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1204 c.g = (c.g * (200 - shade)) / 100;
1145 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1205 c.b = (c.b * (200 - shade)) / 100;
1146 } 1206 }
1147 1207
1148 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1208 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1149 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1209 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1150 XRenderPictureAttributes pa; 1210 XRenderPictureAttributes pa;
… …
1164 1224
1165 if (mask_pic && overlay_pic && back_pic) 1225 if (mask_pic && overlay_pic && back_pic)
1166 { 1226 {
1167 XRenderColor mask_c; 1227 XRenderColor mask_c;
1168 1228
1169 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1229 mask_c.red = mask_c.green = mask_c.blue = 0;
1170 mask_c.alpha = 0xffff; 1230 mask_c.alpha = 0xffff;
1171 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1231 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1172 1232
1173 mask_c.alpha = 0; 1233 mask_c.alpha = 0;
1174 mask_c.red = 0xffff - c.r; 1234 mask_c.red = 0xffff - c.r;
1175 mask_c.green = 0xffff - c.g; 1235 mask_c.green = 0xffff - c.g;
1176 mask_c.blue = 0xffff - c.b; 1236 mask_c.blue = 0xffff - c.b;
1177 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1237 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); 1238 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239
1240 if (shade > 100)
1241 {
1242 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1243 mask_c.alpha = 0;
1244 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1245
1246 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1247 }
1248
1179 ret = true; 1249 ret = true;
1180 } 1250 }
1181 1251
1182 XRenderFreePicture (dpy, mask_pic); 1252 XRenderFreePicture (dpy, mask_pic);
1183 XRenderFreePicture (dpy, overlay_pic); 1253 XRenderFreePicture (dpy, overlay_pic);
… …
1278 1348
1279 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1349 if (tiled_root_pmap == None) /* something really bad happened - abort */
1280 return 0; 1350 return 0;
1281 1351
1282 /* straightforward pixmap copy */ 1352 /* straightforward pixmap copy */
1353 while (sx < 0) sx += (int)root_width;
1354 while (sy < 0) sy += (int)root_height;
1355
1283 gcv.tile = recoded_root_pmap; 1356 gcv.tile = recoded_root_pmap;
1284 gcv.fill_style = FillTiled; 1357 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; 1358 gcv.ts_x_origin = -sx;
1290 gcv.ts_y_origin = -sy; 1359 gcv.ts_y_origin = -sy;
1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1360 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1292 1361
1293 if (gc) 1362 if (gc)
… …
1330} 1399}
1331 1400
1332void 1401void
1333bgPixmap_t::set_root_pixmap () 1402bgPixmap_t::set_root_pixmap ()
1334{ 1403{
1335 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1404 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1336 if (new_root_pixmap == None) 1405 if (new_root_pixmap == None)
1337 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1406 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1338 1407
1339 root_pixmap = new_root_pixmap; 1408 root_pixmap = new_root_pixmap;
1340} 1409}
1341# endif /* ENABLE_TRANSPARENCY */ 1410# endif /* ENABLE_TRANSPARENCY */
1342 1411
1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1412#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1413static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1345# endif 1414# endif
1346 1415
1347bool 1416bool
1348bgPixmap_t::render () 1417bgPixmap_t::render ()
1349{ 1418{
… …
1359 /* we need to re-generate transparency pixmap in that case ! */ 1428 /* we need to re-generate transparency pixmap in that case ! */
1360 background_flags = make_transparency_pixmap (); 1429 background_flags = make_transparency_pixmap ();
1361 if (background_flags == 0) 1430 if (background_flags == 0)
1362 return false; 1431 return false;
1363 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1432 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1364 flags = flags & ~isInvalid; 1433 flags &= ~isInvalid;
1365 } 1434 }
1366# endif 1435# endif
1367 1436
1368# ifdef BG_IMAGE_FROM_FILE 1437# ifdef BG_IMAGE_FROM_FILE
1369 if (have_image 1438 if (have_image
1370 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1439 || (background_flags & transpTransformations) != (flags & transpTransformations))
1371 { 1440 {
1372 if (render_image (background_flags)) 1441 if (render_image (background_flags))
1373 flags = flags & ~isInvalid; 1442 flags &= ~isInvalid;
1374 } 1443 }
1375# endif 1444# endif
1376 1445
1377# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1446# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1378 XImage *result = NULL; 1447 XImage *result = NULL;
… …
1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1457 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1389 { 1458 {
1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1459 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1391 if (flags & tintSet) 1460 if (flags & tintSet)
1392 tint.get (c); 1461 tint.get (c);
1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1462 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1394 } 1463 }
1395 1464
1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1397 1466
1398 if (gc) 1467 if (gc)
1399 { 1468 {
1400 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1469 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1401 1470
1402 XFreeGC (target->dpy, gc); 1471 XFreeGC (target->dpy, gc);
1403 flags = flags & ~isInvalid; 1472 flags &= ~isInvalid;
1404 } 1473 }
1405 1474
1406 XDestroyImage (result); 1475 XDestroyImage (result);
1407 } 1476 }
1408# endif 1477# endif
… …
1503 1572
1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1573#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1505/* taken from aterm-0.4.2 */ 1574/* taken from aterm-0.4.2 */
1506 1575
1507static void 1576static void
1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1577shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1509{ 1578{
1510 int sh_r, sh_g, sh_b; 1579 int sh_r, sh_g, sh_b;
1511 uint32_t mask_r, mask_g, mask_b; 1580 uint32_t mask_r, mask_g, mask_b;
1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1581 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1513 rgba low; 1582 rgba low;
1514 rgba high; 1583 rgba high;
1515 int i; 1584 int i;
1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1585 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1517 1586
1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1587 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1519 1588
1520 /* for convenience */ 1589 /* for convenience */
1521 mask_r = visual->red_mask; 1590 mask_r = visual->red_mask;
1522 mask_g = visual->green_mask; 1591 mask_g = visual->green_mask;
1523 mask_b = visual->blue_mask; 1592 mask_b = visual->blue_mask;
1524 1593
1525 /* boring lookup table pre-initialization */ 1594 /* boring lookup table pre-initialization */
1526 switch (srcImage->depth) 1595 switch (ximage->depth)
1527 { 1596 {
1528 case 15: 1597 case 15:
1529 if ((mask_r != 0x7c00) || 1598 if ((mask_r != 0x7c00) ||
1530 (mask_g != 0x03e0) || 1599 (mask_g != 0x03e0) ||
1531 (mask_b != 0x001f)) 1600 (mask_b != 0x001f))
… …
1584 /* prepare limits for color transformation (each channel is handled separately) */ 1653 /* prepare limits for color transformation (each channel is handled separately) */
1585 if (shade > 100) 1654 if (shade > 100)
1586 { 1655 {
1587 shade = 200 - shade; 1656 shade = 200 - shade;
1588 1657
1589 high.r = (65535 - c.r) * shade / 100; 1658 high.r = c.r * shade / 100;
1590 high.g = (65535 - c.g) * shade / 100; 1659 high.g = c.g * shade / 100;
1591 high.b = (65535 - c.b) * shade / 100; 1660 high.b = c.b * shade / 100;
1592 1661
1593 low.r = 65535 - high.r; 1662 low.r = 65535 * (100 - shade) / 100;
1594 low.g = 65535 - high.g; 1663 low.g = 65535 * (100 - shade) / 100;
1595 low.b = 65535 - high.b; 1664 low.b = 65535 * (100 - shade) / 100;
1596 } 1665 }
1597 else 1666 else
1598 { 1667 {
1599 high.r = c.r * shade / 100; 1668 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100; 1669 high.g = c.g * shade / 100;
… …
1625 tmp += (mask_b>>sh_b) * low.b; 1694 tmp += (mask_b>>sh_b) * low.b;
1626 lookup_b[i] = (tmp/65535)<<sh_b; 1695 lookup_b[i] = (tmp/65535)<<sh_b;
1627 } 1696 }
1628 1697
1629 /* apply table to input image (replacing colors by newly calculated ones) */ 1698 /* apply table to input image (replacing colors by newly calculated ones) */
1630 if (srcImage->bits_per_pixel == 32 1699 if (ximage->bits_per_pixel == 32
1631 && (srcImage->depth == 24 || srcImage->depth == 32) 1700 && (ximage->depth == 24 || ximage->depth == 32)
1632 && srcImage->byte_order == host_byte_order) 1701 && ximage->byte_order == host_byte_order)
1633 { 1702 {
1634 uint32_t *p1, *pf, *p, *pl; 1703 uint32_t *p1, *pf, *p, *pl;
1635 p1 = (uint32_t *) srcImage->data; 1704 p1 = (uint32_t *) ximage->data;
1636 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1705 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1637 1706
1638 while (p1 < pf) 1707 while (p1 < pf)
1639 { 1708 {
1640 p = p1; 1709 p = p1;
1641 pl = p1 + srcImage->width; 1710 pl = p1 + ximage->width;
1642 for (; p < pl; p++) 1711 for (; p < pl; p++)
1643 { 1712 {
1644 *p = lookup_r[(*p & 0xff0000) >> 16] | 1713 *p = lookup_r[(*p & 0xff0000) >> 16] |
1645 lookup_g[(*p & 0x00ff00) >> 8] | 1714 lookup_g[(*p & 0x00ff00) >> 8] |
1646 lookup_b[(*p & 0x0000ff)] | 1715 lookup_b[(*p & 0x0000ff)] |
1647 (*p & 0xff000000); 1716 (*p & 0xff000000);
1648 } 1717 }
1649 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1718 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1650 } 1719 }
1651 } 1720 }
1652 else 1721 else
1653 { 1722 {
1654 for (int y = 0; y < srcImage->height; y++) 1723 for (int y = 0; y < ximage->height; y++)
1655 for (int x = 0; x < srcImage->width; x++) 1724 for (int x = 0; x < ximage->width; x++)
1656 { 1725 {
1657 unsigned long pixel = XGetPixel (srcImage, x, y); 1726 unsigned long pixel = XGetPixel (ximage, x, y);
1658 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1727 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1659 lookup_g[(pixel & mask_g) >> sh_g] | 1728 lookup_g[(pixel & mask_g) >> sh_g] |
1660 lookup_b[(pixel & mask_b) >> sh_b]; 1729 lookup_b[(pixel & mask_b) >> sh_b];
1661 XPutPixel (srcImage, x, y, pixel); 1730 XPutPixel (ximage, x, y, pixel);
1662 } 1731 }
1663 } 1732 }
1664 1733
1665 free (lookup); 1734 free (lookup);
1666} 1735}

Diff Legend

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