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.108 by sf-exg, Mon Nov 1 14:58:44 2010 UTC vs.
Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC

… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
29#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
30 38
31#if DO_TIMING_TEST 39#if DO_TIMING_TEST
32# include <sys/time.h> 40# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
58 * 66 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 70 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 71 *
82 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 74 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
113#endif 103#endif
114 flags = 0; 104 flags = 0;
115 pixmap = None; 105 pixmap = None;
116 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
117 target = 0; 107 target = 0;
108 target_x = target_y = 0;
118} 109}
119 110
120void 111void
121bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
122{ 113{
… …
133 if (pixmap && target) 124 if (pixmap && target)
134 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
135} 126}
136 127
137bool 128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
140}
141
142bool
138bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
139{ 144{
140# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 146 if (flags & isTransparent)
142 return true; 147 return true;
… …
167 if (flags & rootAlign) 172 if (flags & rootAlign)
168 return true; 173 return true;
169 } 174 }
170# endif 175# endif
171 176
172 return false;
173};
174
175bool bgPixmap_t::need_client_side_rendering ()
176{
177# ifdef HAVE_AFTERIMAGE
178 if (original_asim)
179 return true;
180# endif
181 return false; 177 return false;
182} 178}
183 179
184# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
185static inline bool 181static inline bool
… …
248 dst_size = target_size - dst_pos; 244 dst_size = target_size - dst_pos;
249 return src_pos; 245 return src_pos;
250} 246}
251 247
252bool 248bool
253bgPixmap_t::set_geometry (const char *geom) 249bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 250{
251 bool changed = false;
255 int geom_flags = 0, changed = 0; 252 int geom_flags = 0;
256 int x = 0, y = 0; 253 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 254 unsigned int w = 0, h = 0;
258 unsigned int n; 255 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 256 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 257 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 258
263 if (geom == NULL) 259 if (geom == NULL)
264 return false; 260 return false;
265 261
266 char str[MAXLEN_GEOM]; 262 char str[256];
267 263
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 264 ops = strchr (geom, ':');
271 265 if (ops == NULL)
266 n = strlen (geom);
267 else
272 n = (p - geom); 268 n = ops - geom;
273 if (n < MAXLEN_GEOM)
274 {
275 char *ops;
276 new_flags |= geometrySet;
277 269
270 if (n >= sizeof (str))
271 return false;
272
278 memcpy (str, geom, n); 273 memcpy (str, geom, n);
279 str[n] = '\0'; 274 str[n] = '\0';
280 if (str[0] == ':') 275 rxvt_strtrim (str);
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295 276
296 if (ops > str || ops == NULL) 277 if (str[0])
297 { 278 {
298 /* we have geometry string - let's handle it prior to applying ops */ 279 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 280 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 281 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 282
357 { 283 if (!update)
358 /* default geometry - scaled and centered */ 284 {
285 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 286 x = y = defaultAlign;
287 else if (!(geom_flags & YValue))
288 y = x;
289
290 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 291 w = h = defaultScale;
361 } 292 else if (!(geom_flags & HeightValue))
293 h = w;
294 else if (!(geom_flags & WidthValue))
295 w = h;
362 296
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
365 299
366 if (ops) 300 if (ops)
367 { 301 {
368 while (*ops) 302 char **arr = rxvt_strsplit (':', ops + 1);
303
304 for (int i = 0; arr[i]; i++)
369 { 305 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 306 if (!strcasecmp (arr[i], "tile"))
371
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile"))
374 { 307 {
375 w = h = noScale; 308 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 309 geom_flags |= WidthValue|HeightValue;
377 } 310 }
378 else if (CHECK_GEOM_OPS ("propscale")) 311 else if (!strcasecmp (arr[i], "propscale"))
379 { 312 {
380 new_flags |= propScale; 313 new_flags |= propScale;
381 } 314 }
382 else if (CHECK_GEOM_OPS ("hscale")) 315 else if (!strcasecmp (arr[i], "hscale"))
383 { 316 {
384 if (w == 0) w = windowScale; 317 if (w == 0) w = windowScale;
385 318
386 h = noScale; 319 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
388 } 321 }
389 else if (CHECK_GEOM_OPS ("vscale")) 322 else if (!strcasecmp (arr[i], "vscale"))
390 { 323 {
391 if (h == 0) h = windowScale; 324 if (h == 0) h = windowScale;
392 325
393 w = noScale; 326 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 327 geom_flags |= WidthValue|HeightValue;
395 } 328 }
396 else if (CHECK_GEOM_OPS ("scale")) 329 else if (!strcasecmp (arr[i], "scale"))
397 { 330 {
398 if (h == 0) h = windowScale; 331 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 332 if (w == 0) w = windowScale;
400 333
401 geom_flags |= WidthValue|HeightValue; 334 geom_flags |= WidthValue|HeightValue;
402 } 335 }
403 else if (CHECK_GEOM_OPS ("auto")) 336 else if (!strcasecmp (arr[i], "auto"))
404 { 337 {
405 w = h = windowScale; 338 w = h = windowScale;
406 x = y = centerAlign; 339 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 340 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 341 }
409 else if (CHECK_GEOM_OPS ("root")) 342 else if (!strcasecmp (arr[i], "root"))
410 { 343 {
411 new_flags |= rootAlign; 344 new_flags |= rootAlign;
412 w = h = noScale; 345 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 346 geom_flags |= WidthValue|HeightValue;
414 } 347 }
415# undef CHECK_GEOM_OPS
416
417 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 348 } /* done parsing ops */
419 }
420 349
350 rxvt_free_strsplit (arr);
351 }
352
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 353 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 354 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 355 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 356 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 357
427 if (new_flags != flags) 358 if (new_flags != flags)
428 { 359 {
429 flags = new_flags; 360 flags = new_flags;
430 changed++; 361 changed = true;
431 } 362 }
432 363
433 return (changed > 0); 364 return changed;
434} 365}
435 366
436void 367void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 368bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 369{
… …
455 if (!w) w = image_width; 386 if (!w) w = image_width;
456 if (!h) h = image_height; 387 if (!h) h = image_height;
457 388
458 if (flags & rootAlign) 389 if (flags & rootAlign)
459 { 390 {
460 target->get_window_origin (x, y);
461 x = -x; 391 x = -target_x;
462 y = -y; 392 y = -target_y;
463 } 393 }
464 else 394 else
465 { 395 {
466 x = make_align_position (h_align, target_width, w); 396 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h); 397 y = make_align_position (v_align, target_height, h);
… …
661 if (result) 591 if (result)
662 { 592 {
663 XGCValues gcv; 593 XGCValues gcv;
664 GC gc; 594 GC gc;
665 595
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 596 /* create Pixmap */
678 if (pixmap == None) 597 if (pixmap == None
598 || pmap_width != new_pmap_width
599 || pmap_height != new_pmap_height)
679 { 600 {
601 if (pixmap)
602 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 603 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 604 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 605 pmap_height = new_pmap_height;
683 pmap_depth = target->depth;
684 } 606 }
685 /* fill with background color (if result's not completely overlapping it) */ 607 /* fill with background color (if result's not completely overlapping it) */
686 gcv.foreground = target->pix_colors[Color_bg]; 608 gcv.foreground = target->pix_colors[Color_bg];
687 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 609 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
688 610
… …
720 return ret; 642 return ret;
721} 643}
722# endif /* HAVE_AFTERIMAGE */ 644# endif /* HAVE_AFTERIMAGE */
723 645
724# ifdef HAVE_PIXBUF 646# ifdef HAVE_PIXBUF
647bool
648bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
649 int src_x, int src_y, int dst_x, int dst_y,
650 unsigned int width, unsigned int height)
651{
652 XImage *ximage;
653 char *data, *line;
654 int bytes_per_pixel;
655 int width_r, width_g, width_b;
656 int sh_r, sh_g, sh_b;
657 int rowstride;
658 int channels;
659 unsigned char *row;
660 Visual *visual = target->visual;
661 int depth = target->depth;
662
663 if (visual->c_class != TrueColor)
664 return false;
665
666 if (depth == 24 || depth == 32)
667 bytes_per_pixel = 4;
668 else if (depth == 15 || depth == 16)
669 bytes_per_pixel = 2;
670 else
671 return false;
672
673 width_r = rxvt_popcount (visual->red_mask);
674 width_g = rxvt_popcount (visual->green_mask);
675 width_b = rxvt_popcount (visual->blue_mask);
676
677 if (width_r > 8 || width_g > 8 || width_b > 8)
678 return false;
679
680 sh_r = rxvt_ctz (visual->red_mask);
681 sh_g = rxvt_ctz (visual->green_mask);
682 sh_b = rxvt_ctz (visual->blue_mask);
683
684 if (width > INT_MAX / height / bytes_per_pixel)
685 return false;
686
687 data = (char *)malloc (width * height * bytes_per_pixel);
688 if (!data)
689 return false;
690
691 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
692 width, height, bytes_per_pixel * 8, 0);
693 if (!ximage)
694 {
695 free (data);
696 return false;
697 }
698
699 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
700
701 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
702 channels = gdk_pixbuf_get_n_channels (pixbuf);
703 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
704 line = data;
705
706 for (int y = 0; y < height; y++)
707 {
708 for (int x = 0; x < width; x++)
709 {
710 unsigned char *pixel = row + x * channels;
711 uint32_t value;
712
713 value = ((pixel[0] >> (8 - width_r)) << sh_r)
714 | ((pixel[1] >> (8 - width_g)) << sh_g)
715 | ((pixel[2] >> (8 - width_b)) << sh_b);
716
717 if (bytes_per_pixel == 4)
718 ((uint32_t *)line)[x] = value;
719 else
720 ((uint16_t *)line)[x] = value;
721 }
722
723 row += rowstride;
724 line += ximage->bytes_per_line;
725 }
726
727 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
728 XDestroyImage (ximage);
729 return true;
730}
731
725bool 732bool
726bgPixmap_t::render_image (unsigned long background_flags) 733bgPixmap_t::render_image (unsigned long background_flags)
727{ 734{
728 if (target == NULL) 735 if (target == NULL)
729 return false; 736 return false;
… …
792 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
793 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
794 } 801 }
795 } 802 }
796 803
797 if (pixmap)
798 {
799 if (pmap_width != new_pmap_width
800 || pmap_height != new_pmap_height
801 || pmap_depth != target->depth)
802 {
803 XFreePixmap (target->dpy, pixmap);
804 pixmap = None;
805 }
806 }
807
808 if (pixmap == None) 804 if (pixmap == None
805 || pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height)
809 { 807 {
808 if (pixmap)
809 XFreePixmap (target->dpy, pixmap);
810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
811 pmap_width = new_pmap_width; 811 pmap_width = new_pmap_width;
812 pmap_height = new_pmap_height; 812 pmap_height = new_pmap_height;
813 pmap_depth = target->depth;
814 } 813 }
815 814
816 gcv.foreground = target->pix_colors[Color_bg]; 815 gcv.foreground = target->pix_colors[Color_bg];
817 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 816 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
818 817
819 if (h_scale == 0 || v_scale == 0) 818 if (h_scale == 0 || v_scale == 0)
820 { 819 {
821 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 820 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
822 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 821 pixbuf_to_pixmap (result, tile, gc,
823 0, 0, 822 0, 0,
824 0, 0, 823 0, 0,
825 image_width, image_height, 824 image_width, image_height);
826 XLIB_RGB_DITHER_NONE,
827 0, 0);
828 825
829 gcv.tile = tile; 826 gcv.tile = tile;
830 gcv.fill_style = FillTiled; 827 gcv.fill_style = FillTiled;
831 gcv.ts_x_origin = x; 828 gcv.ts_x_origin = x;
832 gcv.ts_y_origin = y; 829 gcv.ts_y_origin = y;
… …
847 || dst_x + dst_width < new_pmap_width 844 || dst_x + dst_width < new_pmap_width
848 || dst_y + dst_height < new_pmap_height) 845 || dst_y + dst_height < new_pmap_height)
849 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
850 847
851 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
852 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 849 pixbuf_to_pixmap (result, pixmap, gc,
853 src_x, src_y, 850 src_x, src_y,
854 dst_x, dst_y, 851 dst_x, dst_y,
855 dst_width, dst_height, 852 dst_width, dst_height);
856 XLIB_RGB_DITHER_NONE,
857 0, 0);
858 } 853 }
859 854
860#if XRENDER 855#if XRENDER
861 if (background_flags) 856 if (background_flags)
862 { 857 {
… …
929 if (image) 924 if (image)
930 { 925 {
931 if (original_asim) 926 if (original_asim)
932 safe_asimage_destroy (original_asim); 927 safe_asimage_destroy (original_asim);
933 original_asim = image; 928 original_asim = image;
929 flags |= CLIENT_RENDER;
934 have_image = true; 930 have_image = true;
935 return true; 931 return true;
936 } 932 }
937# endif 933# endif
938 934
… …
967} 963}
968 964
969bool 965bool
970bgPixmap_t::set_blur_radius (const char *geom) 966bgPixmap_t::set_blur_radius (const char *geom)
971{ 967{
972 int changed = 0; 968 bool changed = false;
973 unsigned int hr, vr; 969 unsigned int hr, vr;
974 int junk; 970 int junk;
975 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 971 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
976 972
977 if (!(geom_flags & WidthValue)) 973 if (!(geom_flags & WidthValue))
… …
982 min_it (hr, 128); 978 min_it (hr, 128);
983 min_it (vr, 128); 979 min_it (vr, 128);
984 980
985 if (h_blurRadius != hr) 981 if (h_blurRadius != hr)
986 { 982 {
987 ++changed; 983 changed = true;
988 h_blurRadius = hr; 984 h_blurRadius = hr;
989 } 985 }
990 986
991 if (v_blurRadius != vr) 987 if (v_blurRadius != vr)
992 { 988 {
993 ++changed; 989 changed = true;
994 v_blurRadius = vr; 990 v_blurRadius = vr;
995 } 991 }
996 992
997 if (v_blurRadius == 0 && h_blurRadius == 0) 993 if (v_blurRadius == 0 && h_blurRadius == 0)
998 flags &= ~blurNeeded; 994 flags &= ~blurNeeded;
999 else 995 else
1000 flags |= blurNeeded; 996 flags |= blurNeeded;
1001 997
1002 return (changed > 0); 998 return changed;
1003} 999}
1004 1000
1005static inline unsigned long 1001static inline unsigned long
1006compute_tint_shade_flags (rxvt_color *tint, int shade) 1002compute_tint_shade_flags (rxvt_color *tint, int shade)
1007{ 1003{
… …
1010 bool has_shade = shade != 100; 1006 bool has_shade = shade != 100;
1011 1007
1012 if (tint) 1008 if (tint)
1013 { 1009 {
1014 tint->get (c); 1010 tint->get (c);
1015# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1011 if (!has_shade
1016 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1012 && (c.r <= 0x00ff || c.r >= 0xff00)
1017 && IS_COMPONENT_WHOLESOME (c.g) 1013 && (c.g <= 0x00ff || c.g >= 0xff00)
1018 && IS_COMPONENT_WHOLESOME (c.b)) 1014 && (c.b <= 0x00ff || c.b >= 0xff00))
1019 flags |= bgPixmap_t::tintWholesome; 1015 flags |= bgPixmap_t::tintWholesome;
1020# undef IS_COMPONENT_WHOLESOME
1021 } 1016 }
1022 1017
1023 if (has_shade) 1018 if (has_shade || tint)
1024 flags |= bgPixmap_t::tintNeeded; 1019 flags |= bgPixmap_t::tintNeeded;
1025 else if (tint)
1026 {
1027 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1028 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1029 {
1030 flags |= bgPixmap_t::tintNeeded;
1031 }
1032 }
1033 1020
1034 return flags; 1021 return flags;
1035} 1022}
1036 1023
1037bool 1024bool
… …
1040 if (!(flags & tintSet) || tint != new_tint) 1027 if (!(flags & tintSet) || tint != new_tint)
1041 { 1028 {
1042 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1029 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1043 tint = new_tint; 1030 tint = new_tint;
1044 flags = (flags & ~tintFlags) | new_flags | tintSet; 1031 flags = (flags & ~tintFlags) | new_flags | tintSet;
1045 return true;
1046 }
1047
1048 return false;
1049}
1050
1051bool
1052bgPixmap_t::unset_tint ()
1053{
1054 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1055
1056 if (new_flags != (flags & tintFlags))
1057 {
1058 flags = (flags & ~tintFlags) | new_flags;
1059 return true; 1032 return true;
1060 } 1033 }
1061 1034
1062 return false; 1035 return false;
1063} 1036}
… …
1208 c.g = (c.g * shade) / 100; 1181 c.g = (c.g * shade) / 100;
1209 c.b = (c.b * shade) / 100; 1182 c.b = (c.b * shade) / 100;
1210 } 1183 }
1211 else 1184 else
1212 { 1185 {
1213 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1186 c.r = (c.r * (200 - shade)) / 100;
1214 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1187 c.g = (c.g * (200 - shade)) / 100;
1215 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1188 c.b = (c.b * (200 - shade)) / 100;
1216 } 1189 }
1217 1190
1218 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1191 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1219 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1192 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1220 XRenderPictureAttributes pa; 1193 XRenderPictureAttributes pa;
… …
1234 1207
1235 if (mask_pic && overlay_pic && back_pic) 1208 if (mask_pic && overlay_pic && back_pic)
1236 { 1209 {
1237 XRenderColor mask_c; 1210 XRenderColor mask_c;
1238 1211
1239 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1212 mask_c.red = mask_c.green = mask_c.blue = 0;
1240 mask_c.alpha = 0xffff; 1213 mask_c.alpha = 0xffff;
1241 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1214 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1242 1215
1243 mask_c.alpha = 0; 1216 mask_c.alpha = 0;
1244 mask_c.red = 0xffff - c.r; 1217 mask_c.red = 0xffff - c.r;
1245 mask_c.green = 0xffff - c.g; 1218 mask_c.green = 0xffff - c.g;
1246 mask_c.blue = 0xffff - c.b; 1219 mask_c.blue = 0xffff - c.b;
1247 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1220 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1248 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1221 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1222
1223 if (shade > 100)
1224 {
1225 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1226 mask_c.alpha = 0;
1227 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1228
1229 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1230 }
1231
1249 ret = true; 1232 ret = true;
1250 } 1233 }
1251 1234
1252 XRenderFreePicture (dpy, mask_pic); 1235 XRenderFreePicture (dpy, mask_pic);
1253 XRenderFreePicture (dpy, overlay_pic); 1236 XRenderFreePicture (dpy, overlay_pic);
… …
1284 int window_height = target->szHint.height; 1267 int window_height = target->szHint.height;
1285 int sx, sy; 1268 int sx, sy;
1286 XGCValues gcv; 1269 XGCValues gcv;
1287 GC gc; 1270 GC gc;
1288 1271
1289 target->get_window_origin (sx, sy); 1272 sx = target_x;
1273 sy = target_y;
1290 1274
1291 /* check if we are outside of the visible part of the virtual screen : */ 1275 /* check if we are outside of the visible part of the virtual screen : */
1292 if (sx + window_width <= 0 || sy + window_height <= 0 1276 if (sx + window_width <= 0 || sy + window_height <= 0
1293 || sx >= root_width || sy >= root_height) 1277 || sx >= root_width || sy >= root_height)
1294 return 0; 1278 return 0;
… …
1341 } 1325 }
1342 1326
1343 if (root_pixmap == None) 1327 if (root_pixmap == None)
1344 return 0; 1328 return 0;
1345 1329
1330 if (pixmap == None
1331 || pmap_width != window_width
1332 || pmap_height != window_height)
1333 {
1334 if (pixmap)
1335 XFreePixmap (target->dpy, pixmap);
1346 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1336 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1337 pmap_width = window_width;
1338 pmap_height = window_height;
1339 }
1347 1340
1348 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (pixmap == None)
1349 return 0; 1342 return 0;
1350 1343
1351 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1345 while (sx < 0) sx += (int)root_width;
1346 while (sy < 0) sy += (int)root_height;
1347
1352 gcv.tile = recoded_root_pmap; 1348 gcv.tile = recoded_root_pmap;
1353 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
1354
1355 while (sx < 0) sx += (int)root_width;
1356 while (sy < 0) sy += (int)root_height;
1357
1358 gcv.ts_x_origin = -sx; 1350 gcv.ts_x_origin = -sx;
1359 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1360 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1361 1353
1362 if (gc) 1354 if (gc)
1363 { 1355 {
1364 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1365 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1366 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1367 }
1368 1359
1369 if (tiled_root_pmap != None) 1360 if (!(flags & CLIENT_RENDER))
1370 {
1371 if (!need_client_side_rendering ())
1372 { 1361 {
1373 if ((flags & blurNeeded) 1362 if ((flags & blurNeeded)
1374 && (flags & HAS_RENDER_CONV)) 1363 && (flags & HAS_RENDER_CONV))
1375 { 1364 {
1376 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1377 result |= transpPmapBlurred; 1366 result |= transpPmapBlurred;
1378 } 1367 }
1379 if ((flags & tintNeeded) 1368 if ((flags & tintNeeded)
1380 && (flags & (tintWholesome | HAS_RENDER))) 1369 && (flags & (tintWholesome | HAS_RENDER)))
1381 { 1370 {
1382 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1371 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1383 result |= transpPmapTinted; 1372 result |= transpPmapTinted;
1384 } 1373 }
1385 } /* server side rendering completed */ 1374 } /* server side rendering completed */
1386
1387 if (pixmap)
1388 XFreePixmap (dpy, pixmap);
1389
1390 pixmap = tiled_root_pmap;
1391 pmap_width = window_width;
1392 pmap_height = window_height;
1393 pmap_depth = target->depth;
1394 } 1375 }
1395 1376
1396 if (recoded_root_pmap != root_pixmap) 1377 if (recoded_root_pmap != root_pixmap)
1397 XFreePixmap (dpy, recoded_root_pmap); 1378 XFreePixmap (dpy, recoded_root_pmap);
1398 1379
… …
1400} 1381}
1401 1382
1402void 1383void
1403bgPixmap_t::set_root_pixmap () 1384bgPixmap_t::set_root_pixmap ()
1404{ 1385{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1386 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1406 if (new_root_pixmap == None) 1387 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1388 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1408 1389
1409 root_pixmap = new_root_pixmap; 1390 root_pixmap = new_root_pixmap;
1410} 1391}
1411# endif /* ENABLE_TRANSPARENCY */ 1392# endif /* ENABLE_TRANSPARENCY */
1412 1393
1413# ifndef HAVE_AFTERIMAGE 1394#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1414static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1395static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1415# endif 1396# endif
1416 1397
1417bool 1398bool
1418bgPixmap_t::render () 1399bgPixmap_t::render ()
1419{ 1400{
… …
1429 /* we need to re-generate transparency pixmap in that case ! */ 1410 /* we need to re-generate transparency pixmap in that case ! */
1430 background_flags = make_transparency_pixmap (); 1411 background_flags = make_transparency_pixmap ();
1431 if (background_flags == 0) 1412 if (background_flags == 0)
1432 return false; 1413 return false;
1433 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1414 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1434 flags = flags & ~isInvalid; 1415 flags &= ~isInvalid;
1435 } 1416 }
1436# endif 1417# endif
1437 1418
1438# ifdef BG_IMAGE_FROM_FILE 1419# ifdef BG_IMAGE_FROM_FILE
1439 if (have_image 1420 if (have_image
1440 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1421 || (background_flags & transpTransformations) != (flags & transpTransformations))
1441 { 1422 {
1442 if (render_image (background_flags)) 1423 if (render_image (background_flags))
1443 flags = flags & ~isInvalid; 1424 flags &= ~isInvalid;
1444 } 1425 }
1445# endif 1426# endif
1446 1427
1428# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1447 XImage *result = NULL; 1429 XImage *result = NULL;
1448 1430
1449 if (background_flags && (flags & isInvalid)) 1431 if (background_flags && (flags & isInvalid))
1450 { 1432 {
1451 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1433 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1452 } 1434 }
1453 1435
1454 if (result) 1436 if (result)
1455 { 1437 {
1456# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1457 /* our own client-side tinting */ 1438 /* our own client-side tinting */
1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1439 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1459 { 1440 {
1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1441 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1461 if (flags & tintSet) 1442 if (flags & tintSet)
1462 tint.get (c); 1443 tint.get (c);
1463 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1444 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1464 } 1445 }
1465# endif
1466 1446
1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1447 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1468 1448
1469 if (gc) 1449 if (gc)
1470 { 1450 {
1471 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1451 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1472 1452
1473 XFreeGC (target->dpy, gc); 1453 XFreeGC (target->dpy, gc);
1474 flags = flags & ~isInvalid; 1454 flags &= ~isInvalid;
1475 } 1455 }
1476 1456
1477 XDestroyImage (result); 1457 XDestroyImage (result);
1478 } 1458 }
1459# endif
1479 1460
1480 if (flags & isInvalid) 1461 if (flags & isInvalid)
1481 { 1462 {
1482 if (pixmap != None) 1463 if (pixmap != None)
1483 { 1464 {
… …
1569 flags |= hasChanged; 1550 flags |= hasChanged;
1570} 1551}
1571 1552
1572#endif /* HAVE_BG_PIXMAP */ 1553#endif /* HAVE_BG_PIXMAP */
1573 1554
1574#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1555#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1575/* taken from aterm-0.4.2 */ 1556/* taken from aterm-0.4.2 */
1576 1557
1577static void 1558static void
1578ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1559shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1579{ 1560{
1580 int sh_r, sh_g, sh_b; 1561 int sh_r, sh_g, sh_b;
1581 uint32_t mask_r, mask_g, mask_b; 1562 uint32_t mask_r, mask_g, mask_b;
1582 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1563 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1583 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1564 rgba low;
1584 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1565 rgba high;
1585 int i; 1566 int i;
1586 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1567 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1587 1568
1588 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1569 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1589 1570
1590 /* for convenience */ 1571 /* for convenience */
1591 mask_r = visual->red_mask; 1572 mask_r = visual->red_mask;
1592 mask_g = visual->green_mask; 1573 mask_g = visual->green_mask;
1593 mask_b = visual->blue_mask; 1574 mask_b = visual->blue_mask;
1594 1575
1595 /* boring lookup table pre-initialization */ 1576 /* boring lookup table pre-initialization */
1596 switch (srcImage->depth) 1577 switch (ximage->depth)
1597 { 1578 {
1598 case 15: 1579 case 15:
1599 if ((mask_r != 0x7c00) || 1580 if ((mask_r != 0x7c00) ||
1600 (mask_g != 0x03e0) || 1581 (mask_g != 0x03e0) ||
1601 (mask_b != 0x001f)) 1582 (mask_b != 0x001f))
… …
1654 /* prepare limits for color transformation (each channel is handled separately) */ 1635 /* prepare limits for color transformation (each channel is handled separately) */
1655 if (shade > 100) 1636 if (shade > 100)
1656 { 1637 {
1657 shade = 200 - shade; 1638 shade = 200 - shade;
1658 1639
1659 lower_lim_r = 65535-rm; 1640 high.r = c.r * shade / 100;
1660 lower_lim_g = 65535-gm; 1641 high.g = c.g * shade / 100;
1661 lower_lim_b = 65535-bm; 1642 high.b = c.b * shade / 100;
1662 1643
1663 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1644 low.r = 65535 * (100 - shade) / 100;
1664 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1645 low.g = 65535 * (100 - shade) / 100;
1665 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1646 low.b = 65535 * (100 - shade) / 100;
1666
1667 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1668 } 1647 }
1669 else 1648 else
1670 { 1649 {
1650 high.r = c.r * shade / 100;
1651 high.g = c.g * shade / 100;
1652 high.b = c.b * shade / 100;
1671 1653
1672 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1654 low.r = low.g = low.b = 0;
1673
1674 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1675 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1676 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1677 } 1655 }
1678 1656
1679 /* fill our lookup tables */ 1657 /* fill our lookup tables */
1680 for (i = 0; i <= mask_r>>sh_r; i++) 1658 for (i = 0; i <= mask_r>>sh_r; i++)
1681 { 1659 {
1682 uint32_t tmp; 1660 uint32_t tmp;
1683 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1661 tmp = i * high.r;
1684 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1662 tmp += (mask_r>>sh_r) * low.r;
1685 lookup_r[i] = (tmp/65535)<<sh_r; 1663 lookup_r[i] = (tmp/65535)<<sh_r;
1686 } 1664 }
1687 for (i = 0; i <= mask_g>>sh_g; i++) 1665 for (i = 0; i <= mask_g>>sh_g; i++)
1688 { 1666 {
1689 uint32_t tmp; 1667 uint32_t tmp;
1690 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1668 tmp = i * high.g;
1691 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1669 tmp += (mask_g>>sh_g) * low.g;
1692 lookup_g[i] = (tmp/65535)<<sh_g; 1670 lookup_g[i] = (tmp/65535)<<sh_g;
1693 } 1671 }
1694 for (i = 0; i <= mask_b>>sh_b; i++) 1672 for (i = 0; i <= mask_b>>sh_b; i++)
1695 { 1673 {
1696 uint32_t tmp; 1674 uint32_t tmp;
1697 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1675 tmp = i * high.b;
1698 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1676 tmp += (mask_b>>sh_b) * low.b;
1699 lookup_b[i] = (tmp/65535)<<sh_b; 1677 lookup_b[i] = (tmp/65535)<<sh_b;
1700 } 1678 }
1701 1679
1702 /* apply table to input image (replacing colors by newly calculated ones) */ 1680 /* apply table to input image (replacing colors by newly calculated ones) */
1703 if (srcImage->bits_per_pixel == 32 1681 if (ximage->bits_per_pixel == 32
1704 && (srcImage->depth == 24 || srcImage->depth == 32) 1682 && (ximage->depth == 24 || ximage->depth == 32)
1705 && srcImage->byte_order == host_byte_order) 1683 && ximage->byte_order == host_byte_order)
1706 { 1684 {
1707 uint32_t *p1, *pf, *p, *pl; 1685 uint32_t *p1, *pf, *p, *pl;
1708 p1 = (uint32_t *) srcImage->data; 1686 p1 = (uint32_t *) ximage->data;
1709 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1687 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1710 1688
1711 while (p1 < pf) 1689 while (p1 < pf)
1712 { 1690 {
1713 p = p1; 1691 p = p1;
1714 pl = p1 + srcImage->width; 1692 pl = p1 + ximage->width;
1715 for (; p < pl; p++) 1693 for (; p < pl; p++)
1716 { 1694 {
1717 *p = lookup_r[(*p & 0xff0000) >> 16] | 1695 *p = lookup_r[(*p & 0xff0000) >> 16] |
1718 lookup_g[(*p & 0x00ff00) >> 8] | 1696 lookup_g[(*p & 0x00ff00) >> 8] |
1719 lookup_b[(*p & 0x0000ff)] | 1697 lookup_b[(*p & 0x0000ff)] |
1720 (*p & 0xff000000); 1698 (*p & 0xff000000);
1721 } 1699 }
1722 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1700 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1723 } 1701 }
1724 } 1702 }
1725 else 1703 else
1726 { 1704 {
1727 for (int y = 0; y < srcImage->height; y++) 1705 for (int y = 0; y < ximage->height; y++)
1728 for (int x = 0; x < srcImage->width; x++) 1706 for (int x = 0; x < ximage->width; x++)
1729 { 1707 {
1730 unsigned long pixel = XGetPixel (srcImage, x, y); 1708 unsigned long pixel = XGetPixel (ximage, x, y);
1731 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1709 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1732 lookup_g[(pixel & mask_g) >> sh_g] | 1710 lookup_g[(pixel & mask_g) >> sh_g] |
1733 lookup_b[(pixel & mask_b) >> sh_b]; 1711 lookup_b[(pixel & mask_b) >> sh_b];
1734 XPutPixel (srcImage, x, y, pixel); 1712 XPutPixel (ximage, x, y, pixel);
1735 } 1713 }
1736 } 1714 }
1737 1715
1738 free (lookup); 1716 free (lookup);
1739} 1717}

Diff Legend

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