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.161 by sf-exg, Thu Aug 11 08:39:10 2011 UTC vs.
Revision 1.179 by sf-exg, Sat Dec 24 09:44:10 2011 UTC

… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 */
52
53#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
54void 38void
55rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
56{ 40{
57#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
166 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
167 151
168 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
169 return diff * align / 100; 153 return diff * align / 100;
170 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
174 return 0; 158 return 0;
175} 159}
176 160
177static inline int 161static inline int
178make_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)
… …
197{ 181{
198 bool changed = false; 182 bool changed = false;
199 int geom_flags = 0; 183 int geom_flags = 0;
200 int x = 0, y = 0; 184 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
202 unsigned int n;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
204 const char *ops;
205 187
206 if (geom == NULL) 188 if (geom == NULL)
207 return false; 189 return false;
208 190
209 char str[256]; 191 if (geom[0])
210
211 ops = strchr (geom, ':');
212 if (ops == NULL)
213 n = strlen (geom);
214 else
215 n = ops - geom;
216
217 if (n >= sizeof (str))
218 return false;
219
220 memcpy (str, geom, n);
221 str[n] = '\0';
222 rxvt_strtrim (str);
223
224 if (str[0])
225 { 192 {
226 /* we have geometry string - let's handle it prior to applying ops */ 193 char **arr = rxvt_strsplit (':', geom);
194
195 for (int i = 0; arr[i]; i++)
196 {
197 if (!strcasecmp (arr[i], "style=tiled"))
198 {
199 new_flags = BG_TILE;
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
249 }
250 else if (!strcasecmp (arr[i], "hscale"))
251 {
252 new_flags |= BG_TILE;
253 w = windowScale;
254 h = noScale;
255 geom_flags |= WidthValue|HeightValue;
256 }
257 else if (!strcasecmp (arr[i], "vscale"))
258 {
259 new_flags |= BG_TILE;
260 h = windowScale;
261 w = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "scale"))
265 {
266 w = h = windowScale;
267 geom_flags |= WidthValue|HeightValue;
268 }
269 else if (!strcasecmp (arr[i], "auto"))
270 {
271 w = h = windowScale;
272 x = y = centerAlign;
273 geom_flags |= WidthValue|HeightValue|XValue|YValue;
274 }
275 else if (!strcasecmp (arr[i], "root"))
276 {
277 new_flags |= BG_TILE|BG_ROOT_ALIGN;
278 w = h = noScale;
279 geom_flags |= WidthValue|HeightValue;
280 }
281
282 else
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
229 288
230 if (!update) 289 if (!update)
231 { 290 {
232 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
242 w = h; 301 w = h;
243 302
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 304 }
246 305
247 if (ops)
248 {
249 char **arr = rxvt_strsplit (':', ops + 1);
250
251 for (int i = 0; arr[i]; i++)
252 {
253 if (!strcasecmp (arr[i], "style=tiled"))
254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 else if (!strcasecmp (arr[i], "propscale"))
300 {
301 new_flags |= BG_PROP_SCALE;
302 }
303 else if (!strcasecmp (arr[i], "hscale"))
304 {
305 w = windowScale;
306 h = noScale;
307 geom_flags |= WidthValue|HeightValue;
308 }
309 else if (!strcasecmp (arr[i], "vscale"))
310 {
311 h = windowScale;
312 w = noScale;
313 geom_flags |= WidthValue|HeightValue;
314 }
315 else if (!strcasecmp (arr[i], "scale"))
316 {
317 w = h = windowScale;
318 geom_flags |= WidthValue|HeightValue;
319 }
320 else if (!strcasecmp (arr[i], "auto"))
321 {
322 w = h = windowScale;
323 x = y = centerAlign;
324 geom_flags |= WidthValue|HeightValue|XValue|YValue;
325 }
326 else if (!strcasecmp (arr[i], "root"))
327 {
328 new_flags |= BG_TILE|BG_ROOT_ALIGN;
329 w = h = noScale;
330 geom_flags |= WidthValue|HeightValue;
331 }
332 } /* done parsing ops */
333
334 rxvt_free_strsplit (arr);
335 }
336
337 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
338 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
339 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
340 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
341 310
… …
352rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
353{ 322{
354 int target_width = szHint.width; 323 int target_width = szHint.width;
355 int target_height = szHint.height; 324 int target_height = szHint.height;
356 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
357 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
358 { 330 {
359 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
360 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
361 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
362 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
363 } 335 }
364 else
365 {
366 w = h_scale * target_width / 100;
367 h = v_scale * target_height / 100;
368 }
369 336
370 if (!w) w = image_width; 337 if (!w) w = image_width;
371 if (!h) h = image_height; 338 if (!h) h = image_height;
372 339
373 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
381 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
382 } 349 }
383 350
384 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
385 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
386 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
387 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
388 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
389 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
390} 357}
391 358
… …
418 } 385 }
419 386
420 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
421 { 388 {
422 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,
423 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
424 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
425 if (tmp) 392 if (tmp)
426 { 393 {
427 destroy_asimage (&background); 394 destroy_asimage (&background);
428 background = tmp; 395 background = tmp;
… …
447 414
448 if (!original_asim 415 if (!original_asim
449 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
450 && (x >= target_width 417 && (x >= target_width
451 || y >= target_height 418 || y >= target_height
452 || (x + w <= 0) 419 || x + w <= 0
453 || (y + h <= 0)))) 420 || y + h <= 0)))
454 { 421 {
455 if (background) 422 if (background)
456 { 423 {
457 new_pmap_width = background->width; 424 new_pmap_width = background->width;
458 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
472 } 439 }
473 else 440 else
474 { 441 {
475 result = original_asim; 442 result = original_asim;
476 443
477 if ((w != original_asim->width) 444 if (w != original_asim->width
478 || (h != original_asim->height)) 445 || h != original_asim->height)
479 { 446 {
480 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
481 w, h, 448 w, h,
482 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
484 } 451 }
485 452
486 if (background == NULL) 453 if (background == NULL)
487 { 454 {
… …
737 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
738 705
739 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
740 && (x >= target_width 707 && (x >= target_width
741 || y >= target_height 708 || y >= target_height
742 || (x + w <= 0) 709 || x + w <= 0
743 || (y + h <= 0))) 710 || y + h <= 0))
744 return false; 711 return false;
745 712
746 result = pixbuf; 713 result = pixbuf;
747 714
748 if ((w != image_width) 715 if (w != image_width
749 || (h != image_height)) 716 || h != image_height)
750 { 717 {
751 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
752 w, h, 719 w, h,
753 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
754 } 721 }
… …
883rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
884{ 851{
885 if (!file || !*file) 852 if (!file || !*file)
886 return false; 853 return false;
887 854
855 bool ret = false;
888 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
889 { 859 {
890 size_t len = p - file; 860 size_t len = p - file;
891 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
892 memcpy (f, file, len); 862 memcpy (f, file, len);
893 f[len] = '\0'; 863 f[len] = '\0';
… …
902 { 872 {
903 if (original_asim) 873 if (original_asim)
904 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
905 original_asim = image; 875 original_asim = image;
906 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
907 return true; 877 ret = true;
908 } 878 }
909# endif 879# endif
910 880
911# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
912 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
914 { 884 {
915 if (pixbuf) 885 if (pixbuf)
916 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
917 pixbuf = image; 887 pixbuf = image;
918 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
919 return true; 889 ret = true;
920 } 890 }
921# endif 891# endif
922 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
923 return false; 901 return ret;
924} 902}
925 903
926# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
927 905
928# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
1299 bg_pmap_width = window_width; 1277 bg_pmap_width = window_width;
1300 bg_pmap_height = window_height; 1278 bg_pmap_height = window_height;
1301 } 1279 }
1302 1280
1303 /* straightforward pixmap copy */ 1281 /* straightforward pixmap copy */
1304 while (sx < 0) sx += root_width; 1282 while (sx < 0) sx += root_pmap_width;
1305 while (sy < 0) sy += root_height; 1283 while (sy < 0) sy += root_pmap_height;
1306 1284
1307 gcv.tile = recoded_root_pmap; 1285 gcv.tile = recoded_root_pmap;
1308 gcv.fill_style = FillTiled; 1286 gcv.fill_style = FillTiled;
1309 gcv.ts_x_origin = -sx; 1287 gcv.ts_x_origin = -sx;
1310 gcv.ts_y_origin = -sy; 1288 gcv.ts_y_origin = -sy;
… …
1365 { 1343 {
1366 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1367 tr_flags = make_transparency_pixmap (); 1345 tr_flags = make_transparency_pixmap ();
1368 if (tr_flags == 0) 1346 if (tr_flags == 0)
1369 return false; 1347 return false;
1370 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1371 bg_flags |= BG_IS_VALID; 1348 bg_flags |= BG_IS_VALID;
1372 } 1349 }
1373# endif 1350# endif
1374 1351
1375# ifdef BG_IMAGE_FROM_FILE 1352# ifdef BG_IMAGE_FROM_FILE
1376 if ((bg_flags & BG_IS_FROM_FILE) 1353 if ((bg_flags & BG_IS_FROM_FILE)
… …
1382# endif 1359# endif
1383 1360
1384# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1361# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1385 XImage *result = NULL; 1362 XImage *result = NULL;
1386 1363
1387 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1364 if (tr_flags & BG_NEEDS_TINT)
1388 { 1365 {
1389 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1366 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1390 } 1367 }
1391 1368
1392 if (result) 1369 if (result)
1393 { 1370 {
1394 /* our own client-side tinting */ 1371 /* our own client-side tinting */
1395 if (tr_flags & BG_NEEDS_TINT) 1372 //if (tr_flags & BG_NEEDS_TINT)
1373 if (1)
1396 { 1374 {
1397 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1398 if (bg_flags & BG_TINT_SET) 1376 if (bg_flags & BG_TINT_SET)
1399 tint.get (c); 1377 tint.get (c);
1400 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1405 if (gc) 1383 if (gc)
1406 { 1384 {
1407 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1408 1386
1409 XFreeGC (dpy, gc); 1387 XFreeGC (dpy, gc);
1410 bg_flags |= BG_IS_VALID;
1411 } 1388 }
1412 1389
1413 XDestroyImage (result); 1390 XDestroyImage (result);
1414 } 1391 }
1415# endif 1392# endif
… …
1456} 1433}
1457 1434
1458#endif /* HAVE_BG_PIXMAP */ 1435#endif /* HAVE_BG_PIXMAP */
1459 1436
1460#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1437#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1461/* taken from aterm-0.4.2 */ 1438/* based on code from aterm-0.4.2 */
1439
1440static inline void
1441fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1442{
1443 for (int i = 0; i <= mask >> sh; i++)
1444 {
1445 uint32_t tmp;
1446 tmp = i * high;
1447 tmp += (mask >> sh) * low;
1448 lookup[i] = (tmp / 0xffff) << sh;
1449 }
1450}
1462 1451
1463static void 1452static void
1464shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1453shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1465{ 1454{
1466 int sh_r, sh_g, sh_b; 1455 int sh_r, sh_g, sh_b;
1467 uint32_t mask_r, mask_g, mask_b; 1456 uint32_t mask_r, mask_g, mask_b;
1468 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1457 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1469 rgba low; 1458 rgba low;
1470 rgba high; 1459 rgba high;
1471 int i;
1472 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1460 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1473 1461
1474 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1462 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1475 1463
1476 /* for convenience */ 1464 /* for convenience */
… …
1558 1546
1559 low.r = low.g = low.b = 0; 1547 low.r = low.g = low.b = 0;
1560 } 1548 }
1561 1549
1562 /* fill our lookup tables */ 1550 /* fill our lookup tables */
1563 for (i = 0; i <= mask_r>>sh_r; i++) 1551 fill_lut (lookup_r, mask_r, sh_r, low.r, high.r);
1564 { 1552 fill_lut (lookup_g, mask_g, sh_g, low.g, high.g);
1565 uint32_t tmp; 1553 fill_lut (lookup_b, mask_b, sh_b, low.b, high.b);
1566 tmp = i * high.r;
1567 tmp += (mask_r>>sh_r) * low.r;
1568 lookup_r[i] = (tmp/65535)<<sh_r;
1569 }
1570 for (i = 0; i <= mask_g>>sh_g; i++)
1571 {
1572 uint32_t tmp;
1573 tmp = i * high.g;
1574 tmp += (mask_g>>sh_g) * low.g;
1575 lookup_g[i] = (tmp/65535)<<sh_g;
1576 }
1577 for (i = 0; i <= mask_b>>sh_b; i++)
1578 {
1579 uint32_t tmp;
1580 tmp = i * high.b;
1581 tmp += (mask_b>>sh_b) * low.b;
1582 lookup_b[i] = (tmp/65535)<<sh_b;
1583 }
1584 1554
1585 /* apply table to input image (replacing colors by newly calculated ones) */ 1555 /* apply table to input image (replacing colors by newly calculated ones) */
1586 if (ximage->bits_per_pixel == 32 1556 if (ximage->bits_per_pixel == 32
1587 && (ximage->depth == 24 || ximage->depth == 32) 1557 && (ximage->depth == 24 || ximage->depth == 32)
1588 && ximage->byte_order == host_byte_order) 1558 && ximage->byte_order == host_byte_order)

Diff Legend

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