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.153 by sf-exg, Sun May 8 21:07:43 2011 UTC vs.
Revision 1.182 by sf-exg, Sun Dec 25 17:01:21 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 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 * auto Same as 100x100+50+50
61 */
62
63#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
64void 38void
65rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
66{ 40{
67#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
176 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
177 151
178 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
179 return diff * align / 100; 153 return diff * align / 100;
180 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
181 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
182 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
183 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
184 return 0; 158 return 0;
185} 159}
186 160
187static inline int 161static inline int
188make_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)
… …
207{ 181{
208 bool changed = false; 182 bool changed = false;
209 int geom_flags = 0; 183 int geom_flags = 0;
210 int x = 0, y = 0; 184 int x = 0, y = 0;
211 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
212 unsigned int n;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
214 const char *ops;
215 187
216 if (geom == NULL) 188 if (geom == NULL)
217 return false; 189 return false;
218 190
219 char str[256]; 191 if (geom[0])
220
221 ops = strchr (geom, ':');
222 if (ops == NULL)
223 n = strlen (geom);
224 else
225 n = ops - geom;
226
227 if (n >= sizeof (str))
228 return false;
229
230 memcpy (str, geom, n);
231 str[n] = '\0';
232 rxvt_strtrim (str);
233
234 if (str[0])
235 { 192 {
236 /* 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
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
239 288
240 if (!update) 289 if (!update)
241 { 290 {
242 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
252 w = h; 301 w = h;
253 302
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 304 }
256 305
257 if (ops)
258 {
259 char **arr = rxvt_strsplit (':', ops + 1);
260
261 for (int i = 0; arr[i]; i++)
262 {
263 if (!strcasecmp (arr[i], "tile"))
264 {
265 w = h = noScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "propscale"))
269 {
270 new_flags |= BG_PROP_SCALE;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 if (w == 0) w = windowScale;
275
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 if (h == 0) h = windowScale;
282
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 if (h == 0) h = windowScale;
289 if (w == 0) w = windowScale;
290
291 geom_flags |= WidthValue|HeightValue;
292 }
293 else if (!strcasecmp (arr[i], "auto"))
294 {
295 w = h = windowScale;
296 x = y = centerAlign;
297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
299 else if (!strcasecmp (arr[i], "root"))
300 {
301 new_flags |= BG_ROOT_ALIGN;
302 w = h = noScale;
303 geom_flags |= WidthValue|HeightValue;
304 }
305 } /* done parsing ops */
306
307 rxvt_free_strsplit (arr);
308 }
309
310 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;
311 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;
312 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;
313 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;
314 310
… …
325rxvt_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)
326{ 322{
327 int target_width = szHint.width; 323 int target_width = szHint.width;
328 int target_height = szHint.height; 324 int target_height = szHint.height;
329 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
330 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
331 { 330 {
332 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
336 } 335 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 336
343 if (!w) w = image_width; 337 if (!w) w = image_width;
344 if (!h) h = image_height; 338 if (!h) h = image_height;
345 339
346 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 347 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
355 } 349 }
356 350
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 352 if (!(bg_flags & BG_TILE)
353 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 357}
363 358
… …
390 } 385 }
391 386
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 388 {
394 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,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 392 if (tmp)
398 { 393 {
399 destroy_asimage (&background); 394 destroy_asimage (&background);
400 background = tmp; 395 background = tmp;
… …
419 414
420 if (!original_asim 415 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 417 && (x >= target_width
423 || y >= target_height 418 || y >= target_height
424 || (x + w <= 0) 419 || x + w <= 0
425 || (y + h <= 0)))) 420 || y + h <= 0)))
426 { 421 {
427 if (background) 422 if (background)
428 { 423 {
429 new_pmap_width = background->width; 424 new_pmap_width = background->width;
430 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
444 } 439 }
445 else 440 else
446 { 441 {
447 result = original_asim; 442 result = original_asim;
448 443
449 if ((w != original_asim->width) 444 if (w != original_asim->width
450 || (h != original_asim->height)) 445 || h != original_asim->height)
451 { 446 {
452 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
453 w, h, 448 w, h,
454 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
456 } 451 }
457 452
458 if (background == NULL) 453 if (background == NULL)
459 { 454 {
460 if (h_scale == 0 || v_scale == 0) 455 if (bg_flags & BG_TILE)
461 { 456 {
462 /* if tiling - pixmap has to be sized exactly as the image, 457 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 458 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 459 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 460 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 485 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 486 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 487 layers[0].tint = background_tint;
493 layers[1].im = result; 488 layers[1].im = result;
494 489
495 if (h_scale == 0 || v_scale == 0) 490 if (bg_flags & BG_TILE)
496 { 491 {
497 /* tile horizontally */ 492 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 493 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 494 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 495 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 499 /* clip horizontally */
505 layers[1].dst_x = x; 500 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 501 layers[1].clip_width = result->width;
507 } 502 }
508 503
509 if (h_scale == 0 || v_scale == 0) 504 if (bg_flags & BG_TILE)
510 { 505 {
511 while (y > 0) y -= (int)result->height; 506 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 507 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 508 layers[1].clip_height = result->height + target_height;
514 } 509 }
… …
564 559
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 560 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 561 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 562 if (background == NULL)
568 { 563 {
569 if (!(h_scale == 0 || v_scale == 0)) 564 if (!(bg_flags & BG_TILE))
570 { 565 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 566 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
572 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 567 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 568 }
574 569
… …
620 else if (depth == 15 || depth == 16) 615 else if (depth == 15 || depth == 16)
621 bytes_per_pixel = 2; 616 bytes_per_pixel = 2;
622 else 617 else
623 return false; 618 return false;
624 619
625 width_r = rxvt_popcount (visual->red_mask); 620 width_r = ecb_popcount32 (visual->red_mask);
626 width_g = rxvt_popcount (visual->green_mask); 621 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = rxvt_popcount (visual->blue_mask); 622 width_b = ecb_popcount32 (visual->blue_mask);
628 623
629 if (width_r > 8 || width_g > 8 || width_b > 8) 624 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false; 625 return false;
631 626
632 sh_r = rxvt_ctz (visual->red_mask); 627 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = rxvt_ctz (visual->green_mask); 628 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = rxvt_ctz (visual->blue_mask); 629 sh_b = ecb_ctz32 (visual->blue_mask);
635 630
636 if (width > INT_MAX / height / bytes_per_pixel) 631 if (width > INT_MAX / height / bytes_per_pixel)
637 return false; 632 return false;
638 633
639 data = (char *)malloc (width * height * bytes_per_pixel); 634 data = (char *)malloc (width * height * bytes_per_pixel);
… …
646 { 641 {
647 free (data); 642 free (data);
648 return false; 643 return false;
649 } 644 }
650 645
651 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 646 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
652 647
653 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 648 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
654 channels = gdk_pixbuf_get_n_channels (pixbuf); 649 channels = gdk_pixbuf_get_n_channels (pixbuf);
655 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 650 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
656 line = data; 651 line = data;
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
710 705
711 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 707 && (x >= target_width
713 || y >= target_height 708 || y >= target_height
714 || (x + w <= 0) 709 || x + w <= 0
715 || (y + h <= 0))) 710 || y + h <= 0))
716 return false; 711 return false;
717 712
718 result = pixbuf; 713 result = pixbuf;
719 714
720 if ((w != image_width) 715 if (w != image_width
721 || (h != image_height)) 716 || h != image_height)
722 { 717 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 719 w, h,
725 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
726 } 721 }
… …
742 root_pmap = bg_pixmap; 737 root_pmap = bg_pixmap;
743 bg_pixmap = None; 738 bg_pixmap = None;
744 } 739 }
745 else 740 else
746 { 741 {
747 if (h_scale == 0 || v_scale == 0) 742 if (bg_flags & BG_TILE)
748 { 743 {
749 new_pmap_width = min (image_width, target_width); 744 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 745 new_pmap_height = min (image_height, target_height);
751 } 746 }
752 } 747 }
… …
760 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
761 bg_pmap_width = new_pmap_width; 756 bg_pmap_width = new_pmap_width;
762 bg_pmap_height = new_pmap_height; 757 bg_pmap_height = new_pmap_height;
763 } 758 }
764 759
765 if (bg_pixmap != None)
766 {
767 gcv.foreground = pix_colors[Color_bg]; 760 gcv.foreground = pix_colors[Color_bg];
768 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 761 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
769 762
770 if (gc) 763 if (gc)
771 { 764 {
772 if (h_scale == 0 || v_scale == 0) 765 if (bg_flags & BG_TILE)
773 { 766 {
774 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 767 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
775
776 if (tile != None)
777 {
778 pixbuf_to_pixmap (result, tile, gc, 768 pixbuf_to_pixmap (result, tile, gc,
779 0, 0, 769 0, 0,
780 0, 0, 770 0, 0,
781 image_width, image_height); 771 image_width, image_height);
782 772
783 gcv.tile = tile; 773 gcv.tile = tile;
784 gcv.fill_style = FillTiled; 774 gcv.fill_style = FillTiled;
785 gcv.ts_x_origin = x; 775 gcv.ts_x_origin = x;
786 gcv.ts_y_origin = y; 776 gcv.ts_y_origin = y;
787 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 777 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
788 778
789 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 779 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
790 XFreePixmap (dpy, tile); 780 XFreePixmap (dpy, tile);
791 }
792 } 781 }
793 else 782 else
794 { 783 {
795 int src_x, src_y, dst_x, dst_y; 784 int src_x, src_y, dst_x, dst_y;
796 int dst_width, dst_height; 785 int dst_width, dst_height;
797 786
798 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width ); 787 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
799 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 788 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
800 789
801 if (dst_x > 0 || dst_y > 0 790 if (dst_x > 0 || dst_y > 0
802 || dst_x + dst_width < new_pmap_width 791 || dst_x + dst_width < new_pmap_width
803 || dst_y + dst_height < new_pmap_height) 792 || dst_y + dst_height < new_pmap_height)
804 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 793 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
805 794
806 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 795 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
807 pixbuf_to_pixmap (result, bg_pixmap, gc, 796 pixbuf_to_pixmap (result, bg_pixmap, gc,
808 src_x, src_y, 797 src_x, src_y,
809 dst_x, dst_y, 798 dst_x, dst_y,
810 dst_width, dst_height); 799 dst_width, dst_height);
811 } 800 }
812 801
813#if XRENDER 802#if XRENDER
814 if (tr_flags) 803 if (tr_flags)
815 { 804 {
816 XRenderPictureAttributes pa; 805 XRenderPictureAttributes pa;
817 806
818 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 807 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
819 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 808 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
820 809
821 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 810 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
822 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 811 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
823 812
824 pa.repeat = True; 813 pa.repeat = True;
825 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); 814 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
826 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 815 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
827 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 816 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
828 XFreePixmap (dpy, mask_pmap); 817 XFreePixmap (dpy, mask_pmap);
829 818
830 if (src && dst && mask)
831 {
832 XRenderColor mask_c; 819 XRenderColor mask_c;
833 820
834 mask_c.alpha = 0x8000; 821 mask_c.alpha = 0x8000;
835 mask_c.red = 0; 822 mask_c.red = 0;
836 mask_c.green = 0; 823 mask_c.green = 0;
837 mask_c.blue = 0; 824 mask_c.blue = 0;
838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 826 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
840 }
841 827
842 XRenderFreePicture (dpy, src); 828 XRenderFreePicture (dpy, src);
843 XRenderFreePicture (dpy, dst); 829 XRenderFreePicture (dpy, dst);
844 XRenderFreePicture (dpy, mask); 830 XRenderFreePicture (dpy, mask);
845 } 831 }
846#endif 832#endif
847 833
848 XFreeGC (dpy, gc); 834 XFreeGC (dpy, gc);
849 835
850 ret = true; 836 ret = true;
851 }
852 } 837 }
853 838
854 if (result != pixbuf) 839 if (result != pixbuf)
855 g_object_unref (result); 840 g_object_unref (result);
856 841
… …
865rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
866{ 851{
867 if (!file || !*file) 852 if (!file || !*file)
868 return false; 853 return false;
869 854
855 bool ret = false;
870 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
871 { 859 {
872 size_t len = p - file; 860 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 862 memcpy (f, file, len);
875 f[len] = '\0'; 863 f[len] = '\0';
… …
884 { 872 {
885 if (original_asim) 873 if (original_asim)
886 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
887 original_asim = image; 875 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 877 ret = true;
890 } 878 }
891# endif 879# endif
892 880
893# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
896 { 884 {
897 if (pixbuf) 885 if (pixbuf)
898 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
899 pixbuf = image; 887 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
901 return true; 889 ret = true;
902 } 890 }
903# endif 891# endif
904 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
905 return false; 901 return ret;
906} 902}
907 903
908# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
909 905
910# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
957} 953}
958 954
959void 955void
960rxvt_term::set_tint_shade_flags () 956rxvt_term::set_tint_shade_flags ()
961{ 957{
962 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 958 rgba c;
963 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
964 960
965 bg_flags &= ~BG_TINT_FLAGS; 961 bg_flags &= ~BG_TINT_FLAGS;
966 962
967 if (bg_flags & BG_TINT_SET) 963 if (bg_flags & BG_TINT_SET)
… …
1037bool 1033bool
1038rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1039{ 1035{
1040 bool ret = false; 1036 bool ret = false;
1041#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1043 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1045 1044
1046 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
1047 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1046 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1048 1047
1049 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1048 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1050 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1049 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1051 1050
1052 if (kernel && params && src && dst) 1051 if (kernel && params)
1053 { 1052 {
1054 if (h_blurRadius) 1053 if (h_blurRadius)
1055 { 1054 {
1056 size = h_blurRadius * 2 + 1; 1055 size = h_blurRadius * 2 + 1;
1057 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1056 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1120 ret = true; 1119 ret = true;
1121 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1122 } 1121 }
1123 } 1122 }
1124 else
1125 {
1126# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1127 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1128 1127
1129 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1130 tint.get (c); 1129 tint.get (c);
1131 1130
… …
1157 pa.component_alpha = True; 1156 pa.component_alpha = True;
1158 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1157 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1159 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa); 1158 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1160 XFreePixmap (dpy, mask_pmap); 1159 XFreePixmap (dpy, mask_pmap);
1161 1160
1162 if (mask_pic && overlay_pic && back_pic)
1163 {
1164 XRenderColor mask_c; 1161 XRenderColor mask_c;
1165 1162
1166 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1167 mask_c.red = 1164 mask_c.red =
1168 mask_c.green = 1165 mask_c.green =
1169 mask_c.blue = 0; 1166 mask_c.blue = 0;
1167 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1168
1169 mask_c.alpha = 0;
1170 mask_c.red = 0xffff - c.r;
1171 mask_c.green = 0xffff - c.g;
1172 mask_c.blue = 0xffff - c.b;
1173 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175
1176 if (shade > 100)
1177 {
1178 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1179 mask_c.alpha = 0;
1170 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1171 1181
1172 mask_c.alpha = 0;
1173 mask_c.red = 0xffff - c.r;
1174 mask_c.green = 0xffff - c.g;
1175 mask_c.blue = 0xffff - c.b;
1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1177 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1178
1179 if (shade > 100)
1180 {
1181 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1182 mask_c.alpha = 0;
1183 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1184
1185 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1186 } 1183 }
1187 1184
1188 ret = true; 1185 ret = true;
1189 }
1190 1186
1191 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1192 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1193 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1194# endif 1191# endif
1195 }
1196 1192
1197 return ret; 1193 return ret;
1198} 1194}
1199 1195
1200/* 1196/*
… …
1251#if XRENDER 1247#if XRENDER
1252 if (bg_flags & BG_HAS_RENDER) 1248 if (bg_flags & BG_HAS_RENDER)
1253 { 1249 {
1254 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1255 1251
1256 if (recoded_root_pmap != None)
1257 {
1258 XRenderPictureAttributes pa; 1252 XRenderPictureAttributes pa;
1259 1253
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1262 1256
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1257 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1258 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1265 1259
1266 if (src && dst)
1267 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1268 else
1269 {
1270 XFreePixmap (dpy, recoded_root_pmap);
1271 recoded_root_pmap = None;
1272 }
1273 1261
1274 XRenderFreePicture (dpy, src); 1262 XRenderFreePicture (dpy, src);
1275 XRenderFreePicture (dpy, dst); 1263 XRenderFreePicture (dpy, dst);
1276 }
1277 } 1264 }
1278 else 1265 else
1279#endif 1266#endif
1280 recoded_root_pmap = None; 1267 recoded_root_pmap = None;
1281 } 1268 }
… …
1292 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1279 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1293 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1294 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1295 } 1282 }
1296 1283
1297 if (bg_pixmap != None)
1298 {
1299 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1300 while (sx < 0) sx += root_width; 1285 while (sx < 0) sx += root_pmap_width;
1301 while (sy < 0) sy += root_height; 1286 while (sy < 0) sy += root_pmap_height;
1302 1287
1303 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1304 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1305 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1292 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1293
1309 if (gc) 1294 if (gc)
1310 { 1295 {
1311 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1296 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1312 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1313 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1314 1299
1315 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1316 { 1301 {
1317 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1318 && (bg_flags & BG_HAS_RENDER_CONV))
1319 { 1303 {
1320 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1321 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1322 } 1306 }
1323 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1324 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1325 { 1308 {
1326 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1327 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1328 } 1311 }
1329 } /* server side rendering completed */ 1312 } /* server side rendering completed */
1330 }
1331 } 1313 }
1332 1314
1333 if (recoded_root_pmap != root_pixmap) 1315 if (recoded_root_pmap != root_pixmap)
1334 XFreePixmap (dpy, recoded_root_pmap); 1316 XFreePixmap (dpy, recoded_root_pmap);
1335 1317
… …
1362 { 1344 {
1363 /* we need to re-generate transparency pixmap in that case ! */ 1345 /* we need to re-generate transparency pixmap in that case ! */
1364 tr_flags = make_transparency_pixmap (); 1346 tr_flags = make_transparency_pixmap ();
1365 if (tr_flags == 0) 1347 if (tr_flags == 0)
1366 return false; 1348 return false;
1367 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1368 bg_flags |= BG_IS_VALID; 1349 bg_flags |= BG_IS_VALID;
1369 } 1350 }
1370# endif 1351# endif
1371 1352
1372# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
1373 if ((bg_flags & BG_IS_FROM_FILE) 1354 if ((bg_flags & BG_IS_FROM_FILE)
… …
1379# endif 1360# endif
1380 1361
1381# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1382 XImage *result = NULL; 1363 XImage *result = NULL;
1383 1364
1384 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1365 if (tr_flags & BG_NEEDS_TINT)
1385 { 1366 {
1386 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1387 } 1368 }
1388 1369
1389 if (result) 1370 if (result)
1390 { 1371 {
1391 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1392 if (tr_flags & BG_NEEDS_TINT) 1373 //if (tr_flags & BG_NEEDS_TINT)
1374 if (1)
1393 { 1375 {
1394 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1395 if (bg_flags & BG_TINT_SET) 1377 if (bg_flags & BG_TINT_SET)
1396 tint.get (c); 1378 tint.get (c);
1397 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1402 if (gc) 1384 if (gc)
1403 { 1385 {
1404 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1405 1387
1406 XFreeGC (dpy, gc); 1388 XFreeGC (dpy, gc);
1407 bg_flags |= BG_IS_VALID;
1408 } 1389 }
1409 1390
1410 XDestroyImage (result); 1391 XDestroyImage (result);
1411 } 1392 }
1412# endif 1393# endif
… …
1453} 1434}
1454 1435
1455#endif /* HAVE_BG_PIXMAP */ 1436#endif /* HAVE_BG_PIXMAP */
1456 1437
1457#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458/* taken from aterm-0.4.2 */ 1439/* based on code from aterm-0.4.2 */
1440
1441static inline void
1442fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1443{
1444 for (int i = 0; i <= mask >> sh; i++)
1445 {
1446 uint32_t tmp;
1447 tmp = i * high;
1448 tmp += (mask >> sh) * low;
1449 lookup[i] = (tmp / 0xffff) << sh;
1450 }
1451}
1459 1452
1460static void 1453static void
1461shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1454shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1462{ 1455{
1463 int sh_r, sh_g, sh_b; 1456 int sh_r, sh_g, sh_b;
1464 uint32_t mask_r, mask_g, mask_b; 1457 uint32_t mask_r, mask_g, mask_b;
1465 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1458 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1466 rgba low; 1459 unsigned short low;
1467 rgba high; 1460 rgba high;
1468 int i;
1469 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1461 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1470 1462
1471 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1463 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1472 1464
1473 /* for convenience */ 1465 /* for convenience */
1474 mask_r = visual->red_mask; 1466 mask_r = visual->red_mask;
… …
1541 1533
1542 high.r = c.r * shade / 100; 1534 high.r = c.r * shade / 100;
1543 high.g = c.g * shade / 100; 1535 high.g = c.g * shade / 100;
1544 high.b = c.b * shade / 100; 1536 high.b = c.b * shade / 100;
1545 1537
1546 low.r = 65535 * (100 - shade) / 100; 1538 low = 0xffff * (100 - shade) / 100;
1547 low.g = 65535 * (100 - shade) / 100;
1548 low.b = 65535 * (100 - shade) / 100;
1549 } 1539 }
1550 else 1540 else
1551 { 1541 {
1552 high.r = c.r * shade / 100; 1542 high.r = c.r * shade / 100;
1553 high.g = c.g * shade / 100; 1543 high.g = c.g * shade / 100;
1554 high.b = c.b * shade / 100; 1544 high.b = c.b * shade / 100;
1555 1545
1556 low.r = low.g = low.b = 0; 1546 low = 0;
1557 } 1547 }
1558 1548
1559 /* fill our lookup tables */ 1549 /* fill our lookup tables */
1560 for (i = 0; i <= mask_r>>sh_r; i++) 1550 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1561 { 1551 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1562 uint32_t tmp; 1552 fill_lut (lookup_b, mask_b, sh_b, low, high.b);
1563 tmp = i * high.r;
1564 tmp += (mask_r>>sh_r) * low.r;
1565 lookup_r[i] = (tmp/65535)<<sh_r;
1566 }
1567 for (i = 0; i <= mask_g>>sh_g; i++)
1568 {
1569 uint32_t tmp;
1570 tmp = i * high.g;
1571 tmp += (mask_g>>sh_g) * low.g;
1572 lookup_g[i] = (tmp/65535)<<sh_g;
1573 }
1574 for (i = 0; i <= mask_b>>sh_b; i++)
1575 {
1576 uint32_t tmp;
1577 tmp = i * high.b;
1578 tmp += (mask_b>>sh_b) * low.b;
1579 lookup_b[i] = (tmp/65535)<<sh_b;
1580 }
1581 1553
1582 /* apply table to input image (replacing colors by newly calculated ones) */ 1554 /* apply table to input image (replacing colors by newly calculated ones) */
1583 if (ximage->bits_per_pixel == 32 1555 if (ximage->bits_per_pixel == 32
1584 && (ximage->depth == 24 || ximage->depth == 32) 1556 && (ximage->depth == 24 || ximage->depth == 32)
1585 && ximage->byte_order == host_byte_order) 1557 && ximage->byte_order == host_byte_order)

Diff Legend

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