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.183 by sf-exg, Sun Dec 25 17:05:53 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 = bg_flags & ~BG_GEOMETRY_FLAGS;
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;
… …
322 int target_height = szHint.height; 324 int target_height = szHint.height;
323 325
324 w = h_scale * target_width / 100; 326 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100; 327 h = v_scale * target_height / 100;
326 328
327 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
328 { 330 {
329 float scale = (float)w / image_width; 331 float scale = (float)w / image_width;
330 min_it (scale, (float)h / image_height); 332 min_it (scale, (float)h / image_height);
331 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
332 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
… …
383 } 385 }
384 386
385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
386 { 388 {
387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
389 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
390 if (tmp) 392 if (tmp)
391 { 393 {
392 destroy_asimage (&background); 394 destroy_asimage (&background);
393 background = tmp; 395 background = tmp;
… …
412 414
413 if (!original_asim 415 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 417 && (x >= target_width
416 || y >= target_height 418 || y >= target_height
417 || (x + w <= 0) 419 || x + w <= 0
418 || (y + h <= 0)))) 420 || y + h <= 0)))
419 { 421 {
420 if (background) 422 if (background)
421 { 423 {
422 new_pmap_width = background->width; 424 new_pmap_width = background->width;
423 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
437 } 439 }
438 else 440 else
439 { 441 {
440 result = original_asim; 442 result = original_asim;
441 443
442 if ((w != original_asim->width) 444 if (w != original_asim->width
443 || (h != original_asim->height)) 445 || h != original_asim->height)
444 { 446 {
445 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
446 w, h, 448 w, h,
447 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
449 } 451 }
450 452
451 if (background == NULL) 453 if (background == NULL)
452 { 454 {
… …
702 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
703 705
704 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 707 && (x >= target_width
706 || y >= target_height 708 || y >= target_height
707 || (x + w <= 0) 709 || x + w <= 0
708 || (y + h <= 0))) 710 || y + h <= 0))
709 return false; 711 return false;
710 712
711 result = pixbuf; 713 result = pixbuf;
712 714
713 if ((w != image_width) 715 if (w != image_width
714 || (h != image_height)) 716 || h != image_height)
715 { 717 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 719 w, h,
718 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
719 } 721 }
… …
848rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
849{ 851{
850 if (!file || !*file) 852 if (!file || !*file)
851 return false; 853 return false;
852 854
855 bool ret = false;
853 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
854 { 859 {
855 size_t len = p - file; 860 size_t len = p - file;
856 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
857 memcpy (f, file, len); 862 memcpy (f, file, len);
858 f[len] = '\0'; 863 f[len] = '\0';
… …
867 { 872 {
868 if (original_asim) 873 if (original_asim)
869 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
870 original_asim = image; 875 original_asim = image;
871 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
872 return true; 877 ret = true;
873 } 878 }
874# endif 879# endif
875 880
876# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
877 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
879 { 884 {
880 if (pixbuf) 885 if (pixbuf)
881 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
882 pixbuf = image; 887 pixbuf = image;
883 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
884 return true; 889 ret = true;
885 } 890 }
886# endif 891# endif
887 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
888 return false; 901 return ret;
889} 902}
890 903
891# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
892 905
893# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
940} 953}
941 954
942void 955void
943rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
944{ 957{
945 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
946 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
947 960
948 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
949 962
950 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1020bool 1033bool
1021rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1022{ 1035{
1023 bool ret = false; 1036 bool ret = false;
1024#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1025 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1026 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1027 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1028 1044
1029 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
… …
1102 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1103 ret = true; 1119 ret = true;
1104 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1105 } 1121 }
1106 } 1122 }
1107 else
1108 {
1109# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1110 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1111 1127
1112 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1113 tint.get (c); 1129 tint.get (c);
1114 1130
… …
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
… …
1421} 1425}
1422 1426
1423#endif /* HAVE_BG_PIXMAP */ 1427#endif /* HAVE_BG_PIXMAP */
1424 1428
1425#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1429#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1426/* taken from aterm-0.4.2 */ 1430/* based on code from aterm-0.4.2 */
1427 1431
1428static void 1432static inline void
1429shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1433fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1434{
1435 for (int i = 0; i <= mask >> sh; i++)
1436 {
1437 uint32_t tmp;
1438 tmp = i * high;
1439 tmp += (mask >> sh) * low;
1440 lookup[i] = (tmp / 0xffff) << sh;
1441 }
1442}
1443
1444void
1445rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1430{ 1446{
1431 int sh_r, sh_g, sh_b; 1447 int sh_r, sh_g, sh_b;
1432 uint32_t mask_r, mask_g, mask_b; 1448 uint32_t mask_r, mask_g, mask_b;
1433 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1434 rgba low; 1450 unsigned short low;
1435 rgba high; 1451 rgba high;
1436 int i;
1437 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1452 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1438 1453
1439 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1454 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1440 1455
1441 /* for convenience */ 1456 /* for convenience */
… …
1500 break; 1515 break;
1501 default: 1516 default:
1502 return; /* we do not support this color depth */ 1517 return; /* we do not support this color depth */
1503 } 1518 }
1504 1519
1520 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1521
1522 if (bg_flags & BG_TINT_SET)
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; 1528 high.r = c.r * (200 - shade) / 100;
1529 high.g = c.g * (200 - shade) / 100;
1530 high.b = c.b * (200 - shade) / 100;
1509 1531
1532 low = 0xffff * (shade - 100) / 100;
1533 }
1534 else
1535 {
1510 high.r = c.r * shade / 100; 1536 high.r = c.r * shade / 100;
1511 high.g = c.g * shade / 100; 1537 high.g = c.g * shade / 100;
1512 high.b = c.b * shade / 100; 1538 high.b = c.b * shade / 100;
1513 1539
1514 low.r = 65535 * (100 - shade) / 100; 1540 low = 0;
1515 low.g = 65535 * (100 - shade) / 100;
1516 low.b = 65535 * (100 - shade) / 100;
1517 }
1518 else
1519 {
1520 high.r = c.r * shade / 100;
1521 high.g = c.g * shade / 100;
1522 high.b = c.b * shade / 100;
1523
1524 low.r = low.g = low.b = 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, high.r);
1529 { 1545 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1530 uint32_t tmp; 1546 fill_lut (lookup_b, mask_b, sh_b, low, high.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