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.79 by sf-exg, Wed Oct 13 23:01:40 2010 UTC vs.
Revision 1.91 by sf-exg, Mon Oct 18 16:10:35 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
… …
174{ 176{
175# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
176 if (original_asim) 178 if (original_asim)
177 return true; 179 return true;
178# endif 180# endif
179# ifdef ENABLE_TRANSPARENCY
180 if (flags & isTransparent)
181 {
182# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
183 if ((flags & blurNeeded) && !(flags & blurServerSide))
184 return true;
185# endif
186 if ((flags & tintNeeded) && !(flags & tintServerSide))
187 return true;
188 }
189# endif
190 return false; 181 return false;
191} 182}
192 183
193# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
194static inline bool 185static inline bool
… …
231 int diff = window_size - image_size; 222 int diff = window_size - image_size;
232 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
233 224
234 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
235 return diff * align / 100; 226 return diff * align / 100;
236 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
237 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
238 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
239 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
240 return 0; 231 return 0;
241} 232}
… …
477 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
478 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
479 } 470 }
480 471
481 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
482 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
483 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
484 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
485 flags |= sizeSensitive; 476 flags |= sizeSensitive;
486} 477}
487 478
488# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
940 } 931 }
941 932
942# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
943 if (!target->asimman) 934 if (!target->asimman)
944 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
945 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image)
938 {
946 if (original_asim) 939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
947 have_image = true; 942 have_image = true;
948 return have_image; 943 return true;
944 }
949# endif 945# endif
950 946
951# ifdef HAVE_PIXBUF 947# ifdef HAVE_PIXBUF
952 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
953 if (pixbuf) 951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
954 have_image = true; 954 have_image = true;
955 return have_image; 955 return true;
956 }
956# endif 957# endif
957 } 958 }
958 959
959 return false; 960 return false;
960} 961}
… …
985 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
986 hr = 1; 987 hr = 1;
987 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
988 vr = hr; 989 vr = hr;
989 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
990 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
991 { 995 {
992 ++changed; 996 ++changed;
993 h_blurRadius = hr; 997 h_blurRadius = hr;
994 } 998 }
… …
1001 1005
1002 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
1003 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
1004 else 1008 else
1005 flags |= blurNeeded; 1009 flags |= blurNeeded;
1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1006 1022
1007 return (changed > 0); 1023 return (changed > 0);
1008} 1024}
1009 1025
1010static inline unsigned long 1026static inline unsigned long
… …
1095 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1096 return true; 1112 return true;
1097 } 1113 }
1098 1114
1099 return false; 1115 return false;
1116}
1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{
1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1100} 1203}
1101 1204
1102bool 1205bool
1103bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1104{ 1207{
… …
1215 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
1216 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
1217 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
1218 int sx, sy; 1321 int sx, sy;
1219 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
1220 1324
1221 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
1222 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
1223 1327
1224 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
… …
1238 root_pixmap = None; 1342 root_pixmap = None;
1239 1343
1240 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
1241 } 1345 }
1242 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
1243 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1244 GC gc = NULL;
1245 1351
1246 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
1247 return 0; 1353 return 0;
1248 1354
1249 if (root_pixmap == None)
1250 {
1251 /* use tricks to obtain the root background image :*/
1252 /* we want to create Overrideredirect window overlapping out window
1253 with background type of Parent Relative and then grab it */
1254 XSetWindowAttributes attr;
1255 Window src;
1256 bool success = false;
1257
1258 attr.background_pixmap = ParentRelative;
1259 attr.backing_store = Always;
1260 attr.event_mask = ExposureMask;
1261 attr.override_redirect = True;
1262 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1263 CopyFromParent, CopyFromParent, CopyFromParent,
1264 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1265 &attr);
1266
1267 if (src != None)
1268 {
1269 XEvent event;
1270 int ev_count = 0;
1271 XGrabServer (dpy);
1272 XMapRaised (dpy, src);
1273 XSync (dpy, False);
1274
1275 /* XSync should get window where it's properly exposed,
1276 * but to be on the safe side - let's check for the actual event to arrive : */
1277 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1278 ++ev_count;
1279
1280 if (ev_count > 0);
1281 {
1282 /* hooray! - we can grab the image! */
1283 gc = XCreateGC (dpy, root, 0, NULL);
1284 if (gc)
1285 {
1286 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1287 success = true;
1288 }
1289 }
1290
1291 XDestroyWindow (dpy, src);
1292 XUngrabServer (dpy);
1293 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1294 }
1295
1296 if (!success)
1297 {
1298 XFreePixmap (dpy, tiled_root_pmap);
1299 tiled_root_pmap = None;
1300 }
1301 else
1302 result |= transpPmapTiled;
1303 }
1304 else
1305 {
1306 /* straightforward pixmap copy */ 1355 /* straightforward pixmap copy */
1307 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
1308 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1309 1358
1310 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
1311 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
1312 1361
1313 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
1314 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
1315 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1316 1365
1317 if (gc) 1366 if (gc)
1318 { 1367 {
1319 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1320 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
1321 } 1370 XFreeGC (dpy, gc);
1322 } 1371 }
1323 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
1324 1373
1325 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1326 { 1375 {
1327 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1328 { 1377 {
1329 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1330 { 1382 }
1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1331 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1332 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1333 } 1387 }
1334 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1335 1389
1336 if (pixmap) 1390 if (pixmap)
… …
1340 pmap_width = window_width; 1394 pmap_width = window_width;
1341 pmap_height = window_height; 1395 pmap_height = window_height;
1342 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1343 } 1397 }
1344 1398
1345 if (gc)
1346 XFreeGC (dpy, gc);
1347
1348 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1349 1400
1350 return result; 1401 return result;
1351} 1402}
1352 1403
… …
1366 return false; 1417 return false;
1367} 1418}
1368# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1369 1420
1370# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1371static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1372# endif 1423# endif
1373 1424
1374bool 1425bool
1375bgPixmap_t::render () 1426bgPixmap_t::render ()
1376{ 1427{
… …
1420 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1421 { 1472 {
1422 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1423 if (flags & tintSet) 1474 if (flags & tintSet)
1424 tint.get (c); 1475 tint.get (c);
1425 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1426 } 1477 }
1427# endif 1478# endif
1428 1479
1429 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1430 1481
… …
1565/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1566 1617
1567typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1568 1619
1569static void 1620static void
1570ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1571{ 1622{
1572 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1573 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1574 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1575 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1576 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1577 int i; 1628 int i;
1578 1629
1579 Visual *visual = term->visual;
1580
1581 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1582 1631
1583 /* for convenience */ 1632 /* for convenience */
1584 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1585 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1586 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
1587 1636
1588 /* boring lookup table pre-initialization */ 1637 /* boring lookup table pre-initialization */
1589 switch (srcImage->bits_per_pixel) { 1638 switch (srcImage->bits_per_pixel)
1639 {
1590 case 15: 1640 case 15:
1591 if ((mask_r != 0x7c00) || 1641 if ((mask_r != 0x7c00) ||
1592 (mask_g != 0x03e0) || 1642 (mask_g != 0x03e0) ||
1593 (mask_b != 0x001f)) 1643 (mask_b != 0x001f))
1594 return; 1644 return;
1595 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1645 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1596 lookup_r = lookup; 1646 lookup_r = lookup;
1597 lookup_g = lookup+32; 1647 lookup_g = lookup+32;
1598 lookup_b = lookup+32+32; 1648 lookup_b = lookup+32+32;
1599 sh_r = 10; 1649 sh_r = 10;
1600 sh_g = 5; 1650 sh_g = 5;
1601 sh_b = 0; 1651 sh_b = 0;
1602 break; 1652 break;
1603 case 16: 1653 case 16:
1604 if ((mask_r != 0xf800) || 1654 if ((mask_r != 0xf800) ||
1605 (mask_g != 0x07e0) || 1655 (mask_g != 0x07e0) ||
1606 (mask_b != 0x001f)) 1656 (mask_b != 0x001f))
1607 return; 1657 return;
1608 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1658 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1609 lookup_r = lookup; 1659 lookup_r = lookup;
1610 lookup_g = lookup+32; 1660 lookup_g = lookup+32;
1611 lookup_b = lookup+32+64; 1661 lookup_b = lookup+32+64;
1612 sh_r = 11; 1662 sh_r = 11;
1613 sh_g = 5; 1663 sh_g = 5;
1614 sh_b = 0; 1664 sh_b = 0;
1615 break; 1665 break;
1616 case 24: 1666 case 24:
1617 if ((mask_r != 0xff0000) || 1667 if ((mask_r != 0xff0000) ||
1618 (mask_g != 0x00ff00) || 1668 (mask_g != 0x00ff00) ||
1619 (mask_b != 0x0000ff)) 1669 (mask_b != 0x0000ff))
1620 return; 1670 return;
1621 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1671 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1622 lookup_r = lookup; 1672 lookup_r = lookup;
1623 lookup_g = lookup+256; 1673 lookup_g = lookup+256;
1624 lookup_b = lookup+256+256; 1674 lookup_b = lookup+256+256;
1625 sh_r = 16; 1675 sh_r = 16;
1626 sh_g = 8; 1676 sh_g = 8;
1627 sh_b = 0; 1677 sh_b = 0;
1628 break; 1678 break;
1629 case 32: 1679 case 32:
1630 if ((mask_r != 0xff0000) || 1680 if ((mask_r != 0xff0000) ||
1631 (mask_g != 0x00ff00) || 1681 (mask_g != 0x00ff00) ||
1632 (mask_b != 0x0000ff)) 1682 (mask_b != 0x0000ff))
1633 return; 1683 return;
1634 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1684 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1635 lookup_r = lookup; 1685 lookup_r = lookup;
1636 lookup_g = lookup+256; 1686 lookup_g = lookup+256;
1637 lookup_b = lookup+256+256; 1687 lookup_b = lookup+256+256;
1638 sh_r = 16; 1688 sh_r = 16;
1639 sh_g = 8; 1689 sh_g = 8;
1640 sh_b = 0; 1690 sh_b = 0;
1641 break; 1691 break;
1642 default: 1692 default:
1643 return; /* we do not support this color depth */ 1693 return; /* we do not support this color depth */
1644 } 1694 }
1645 1695
1646 /* prepare limits for color transformation (each channel is handled separately) */ 1696 /* prepare limits for color transformation (each channel is handled separately) */
1647 if (shade > 100) { 1697 if (shade > 100)
1698 {
1648 shade = 200 - shade; 1699 shade = 200 - shade;
1649 1700
1650 lower_lim_r = 65535-rm; 1701 lower_lim_r = 65535-rm;
1651 lower_lim_g = 65535-gm; 1702 lower_lim_g = 65535-gm;
1652 lower_lim_b = 65535-bm; 1703 lower_lim_b = 65535-bm;
1653 1704
1654 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1655 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1656 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1657 1708
1658 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 }
1659 } else { 1711 else
1712 {
1660 1713
1661 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1714 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1662 1715
1663 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1716 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1664 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1717 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1665 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1718 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1666 } 1719 }
1667 1720
1668 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ 1721 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1669 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) 1722 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1670 { 1723 {
1671 unsigned int tmp; 1724 unsigned int tmp;
1672 1725
1673 tmp = lower_lim_r; 1726 tmp = lower_lim_r;
1674 lower_lim_r = lower_lim_b; 1727 lower_lim_r = lower_lim_b;
1675 lower_lim_b = tmp; 1728 lower_lim_b = tmp;
1676 1729
1677 tmp = upper_lim_r; 1730 tmp = upper_lim_r;
1678 upper_lim_r = upper_lim_b; 1731 upper_lim_r = upper_lim_b;
1679 upper_lim_b = tmp; 1732 upper_lim_b = tmp;
1680 } 1733 }
1681 1734
1682 /* fill our lookup tables */ 1735 /* fill our lookup tables */
1683 for (i = 0; i <= mask_r>>sh_r; i++) 1736 for (i = 0; i <= mask_r>>sh_r; i++)
1684 { 1737 {
1685 RUINT32T tmp; 1738 RUINT32T tmp;
1686 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1739 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1687 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1740 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1688 lookup_r[i] = (tmp/65535)<<sh_r; 1741 lookup_r[i] = (tmp/65535)<<sh_r;
1689 } 1742 }
1690 for (i = 0; i <= mask_g>>sh_g; i++) 1743 for (i = 0; i <= mask_g>>sh_g; i++)
1691 { 1744 {
1692 RUINT32T tmp; 1745 RUINT32T tmp;
1693 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1746 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1694 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1747 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1695 lookup_g[i] = (tmp/65535)<<sh_g; 1748 lookup_g[i] = (tmp/65535)<<sh_g;
1696 } 1749 }
1697 for (i = 0; i <= mask_b>>sh_b; i++) 1750 for (i = 0; i <= mask_b>>sh_b; i++)
1698 { 1751 {
1699 RUINT32T tmp; 1752 RUINT32T tmp;
1700 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1753 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1701 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1754 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1702 lookup_b[i] = (tmp/65535)<<sh_b; 1755 lookup_b[i] = (tmp/65535)<<sh_b;
1703 } 1756 }
1704 1757
1705 /* apply table to input image (replacing colors by newly calculated ones) */ 1758 /* apply table to input image (replacing colors by newly calculated ones) */
1706 switch (srcImage->bits_per_pixel) 1759 switch (srcImage->bits_per_pixel)
1707 { 1760 {
1708 case 15: 1761 case 15:
1709 { 1762 {
1710 unsigned short *p1, *pf, *p, *pl; 1763 unsigned short *p1, *pf, *p, *pl;
1711 p1 = (unsigned short *) srcImage->data; 1764 p1 = (unsigned short *) srcImage->data;
1712 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1765 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1713 while (p1 < pf) 1766 while (p1 < pf)
1714 { 1767 {
1715 p = p1; 1768 p = p1;
1716 pl = p1 + srcImage->width; 1769 pl = p1 + srcImage->width;
1717 for (; p < pl; p++) 1770 for (; p < pl; p++)
1718 { 1771 {
1719 *p = lookup_r[(*p & 0x7c00)>>10] | 1772 *p = lookup_r[(*p & 0x7c00)>>10] |
1720 lookup_g[(*p & 0x03e0)>> 5] | 1773 lookup_g[(*p & 0x03e0)>> 5] |
1721 lookup_b[(*p & 0x001f)]; 1774 lookup_b[(*p & 0x001f)];
1722 } 1775 }
1723 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1776 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1777 }
1778 break;
1724 } 1779 }
1725 break;
1726 }
1727 case 16: 1780 case 16:
1728 { 1781 {
1729 unsigned short *p1, *pf, *p, *pl; 1782 unsigned short *p1, *pf, *p, *pl;
1730 p1 = (unsigned short *) srcImage->data; 1783 p1 = (unsigned short *) srcImage->data;
1731 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1784 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1732 while (p1 < pf) 1785 while (p1 < pf)
1733 { 1786 {
1734 p = p1; 1787 p = p1;
1735 pl = p1 + srcImage->width; 1788 pl = p1 + srcImage->width;
1736 for (; p < pl; p++) 1789 for (; p < pl; p++)
1737 { 1790 {
1738 *p = lookup_r[(*p & 0xf800)>>11] | 1791 *p = lookup_r[(*p & 0xf800)>>11] |
1739 lookup_g[(*p & 0x07e0)>> 5] | 1792 lookup_g[(*p & 0x07e0)>> 5] |
1740 lookup_b[(*p & 0x001f)]; 1793 lookup_b[(*p & 0x001f)];
1741 } 1794 }
1742 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1795 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1796 }
1797 break;
1743 } 1798 }
1744 break;
1745 }
1746 case 24: 1799 case 24:
1747 { 1800 {
1748 unsigned char *p1, *pf, *p, *pl; 1801 unsigned char *p1, *pf, *p, *pl;
1749 p1 = (unsigned char *) srcImage->data; 1802 p1 = (unsigned char *) srcImage->data;
1750 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1803 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 while (p1 < pf) 1804 while (p1 < pf)
1752 { 1805 {
1753 p = p1; 1806 p = p1;
1754 pl = p1 + srcImage->width * 3; 1807 pl = p1 + srcImage->width * 3;
1755 for (; p < pl; p += 3) 1808 for (; p < pl; p += 3)
1756 { 1809 {
1757 p[0] = lookup_r[(p[0] & 0xff0000)>>16]; 1810 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1758 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; 1811 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1759 p[2] = lookup_r[(p[2] & 0x0000ff)]; 1812 p[2] = lookup_r[(p[2] & 0x0000ff)];
1760 } 1813 }
1761 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); 1814 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1815 }
1816 break;
1762 } 1817 }
1763 break;
1764 }
1765 case 32: 1818 case 32:
1766 { 1819 {
1767 RUINT32T *p1, *pf, *p, *pl; 1820 RUINT32T *p1, *pf, *p, *pl;
1768 p1 = (RUINT32T *) srcImage->data; 1821 p1 = (RUINT32T *) srcImage->data;
1769 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1822 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1770 1823
1771 while (p1 < pf) 1824 while (p1 < pf)
1772 { 1825 {
1773 p = p1; 1826 p = p1;
1774 pl = p1 + srcImage->width; 1827 pl = p1 + srcImage->width;
1775 for (; p < pl; p++) 1828 for (; p < pl; p++)
1776 { 1829 {
1777 *p = lookup_r[(*p & 0xff0000)>>16] | 1830 *p = lookup_r[(*p & 0xff0000)>>16] |
1778 lookup_g[(*p & 0x00ff00)>> 8] | 1831 lookup_g[(*p & 0x00ff00)>> 8] |
1779 lookup_b[(*p & 0x0000ff)] | 1832 lookup_b[(*p & 0x0000ff)] |
1780 (*p & ~0xffffff); 1833 (*p & ~0xffffff);
1781 } 1834 }
1782 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1835 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1836 }
1837 break;
1783 } 1838 }
1784 break;
1785 }
1786 } 1839 }
1787 1840
1788 free (lookup); 1841 free (lookup);
1789} 1842}
1790#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1843#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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