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.109 by sf-exg, Tue Nov 2 22:01:47 2010 UTC vs.
Revision 1.131 by sf-exg, Mon Jan 10 19:58:24 2011 UTC

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

Diff Legend

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