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.116 by sf-exg, Thu Nov 11 11:58:10 2010 UTC vs.
Revision 1.140 by sf-exg, Sun Jan 23 12:28:47 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#define DO_TIMING_TEST 0 33#ifndef FilterConvolution
34 34#define FilterConvolution "convolution"
35#if DO_TIMING_TEST
36# include <sys/time.h>
37#define TIMING_TEST_START(id) \
38 struct timeval timing_test_##id##_stv; \
39 gettimeofday (&timing_test_##id##_stv, NULL);
40
41#define TIMING_TEST_PRINT_RESULT(id) \
42 do { \
43 struct timeval tv; \
44 gettimeofday (&tv, NULL); \
45 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
46 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
47 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
48 } while (0)
49
50#else
51#define TIMING_TEST_START(id) do {} while (0)
52#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
53#endif 35#endif
54 36
55/* 37/*
56 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
57 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
… …
62 * 44 *
63 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 45 * 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. 46 * W and H are percentages of the terminal window size.
65 * X and Y are also percentages; e.g., +50+50 centers 47 * X and Y are also percentages; e.g., +50+50 centers
66 * the image in the window. 48 * 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 * 49 *
86 * Pixmap Operations : (should be prepended by a colon) 50 * Pixmap Operations : (should be prepended by a colon)
87 * tile Tile image. Scaling/position modifiers above will affect 51 * tile Tile image. Scaling/position modifiers above will affect
88 * the tile size and origin. 52 * the tile size and origin.
89 * propscale When scaling, scale proportionally. That is, maintain the 53 * propscale When scaling, scale proportionally. That is, maintain the
… …
115#ifdef ENABLE_TRANSPARENCY 79#ifdef ENABLE_TRANSPARENCY
116 shade = 100; 80 shade = 100;
117#endif 81#endif
118 flags = 0; 82 flags = 0;
119 pixmap = None; 83 pixmap = None;
120 valid_since = invalid_since = 0; 84 valid_since = 0;
121 target = 0; 85 target = 0;
86 target_x = target_y = 0;
122} 87}
123 88
124void 89void
125bgPixmap_t::destroy () 90bgPixmap_t::destroy ()
126{ 91{
… …
137 if (pixmap && target) 102 if (pixmap && target)
138 XFreePixmap (target->dpy, pixmap); 103 XFreePixmap (target->dpy, pixmap);
139} 104}
140 105
141bool 106bool
107bgPixmap_t::set_position (int x, int y)
108{
109
110 if (target_x != x
111 || target_y != y)
112 {
113 target_x = x;
114 target_y = y;
115 return true;
116 }
117 return false;
118}
119
120bool
142bgPixmap_t::window_size_sensitive () 121bgPixmap_t::window_size_sensitive ()
143{ 122{
144# ifdef ENABLE_TRANSPARENCY 123# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 124 if (flags & isTransparent)
146 return true; 125 return true;
… …
171 if (flags & rootAlign) 150 if (flags & rootAlign)
172 return true; 151 return true;
173 } 152 }
174# endif 153# endif
175 154
176 return false;
177};
178
179bool bgPixmap_t::need_client_side_rendering ()
180{
181# ifdef HAVE_AFTERIMAGE
182 if (original_asim)
183 return true;
184# endif
185 return false; 155 return false;
186} 156}
187 157
188# ifdef BG_IMAGE_FROM_FILE 158# ifdef BG_IMAGE_FROM_FILE
189static inline bool 159static inline bool
… …
252 dst_size = target_size - dst_pos; 222 dst_size = target_size - dst_pos;
253 return src_pos; 223 return src_pos;
254} 224}
255 225
256bool 226bool
257bgPixmap_t::set_geometry (const char *geom) 227bgPixmap_t::set_geometry (const char *geom, bool update)
258{ 228{
259 bool changed = false; 229 bool changed = false;
260 int geom_flags = 0; 230 int geom_flags = 0;
261 int x = 0, y = 0; 231 int x = 0, y = 0;
262 unsigned int w = 0, h = 0; 232 unsigned int w = 0, h = 0;
263 unsigned int n; 233 unsigned int n;
264 unsigned long new_flags = (flags & (~geometryFlags)); 234 unsigned long new_flags = (flags & (~geometryFlags));
265 const char *p; 235 const char *ops;
266# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
267 236
268 if (geom == NULL) 237 if (geom == NULL)
269 return false; 238 return false;
270 239
271 char str[MAXLEN_GEOM]; 240 char str[256];
272 241
273 while (isspace(*geom)) ++geom;
274 if ((p = strchr (geom, ';')) == NULL)
275 p = strchr (geom, '\0'); 242 ops = strchr (geom, ':');
276 243 if (ops == NULL)
244 n = strlen (geom);
245 else
277 n = (p - geom); 246 n = ops - geom;
278 if (n < MAXLEN_GEOM)
279 {
280 char *ops;
281 new_flags |= geometrySet;
282 247
248 if (n >= sizeof (str))
249 return false;
250
283 memcpy (str, geom, n); 251 memcpy (str, geom, n);
284 str[n] = '\0'; 252 str[n] = '\0';
285 if (str[0] == ':') 253 rxvt_strtrim (str);
286 ops = &str[0];
287 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
288 ops = &str[0];
289 else
290 {
291 char *tmp;
292 ops = strchr (str, ':');
293 if (ops != NULL)
294 {
295 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
296 *(++tmp) = '\0';
297 if (ops == tmp) ++ops;
298 }
299 }
300 254
301 if (ops > str || ops == NULL) 255 if (str[0])
302 { 256 {
303 /* we have geometry string - let's handle it prior to applying ops */ 257 /* we have geometry string - let's handle it prior to applying ops */
304 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 258 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
305
306 if ((geom_flags & XValue) && !(geom_flags & YValue))
307 {
308 y = x;
309 geom_flags |= YValue;
310 }
311
312 if (flags & geometrySet)
313 {
314 /* new geometry is an adjustment to the old one ! */
315 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
316 {
317 if (w == 0 && h != 0)
318 {
319 w = h_scale;
320 h = (v_scale * h) / 100;
321 }
322 else if (h == 0 && w != 0)
323 {
324 w = (h_scale * w) / 100;
325 h = v_scale;
326 }
327 }
328 if (geom_flags & XValue)
329 {
330 if (str[0] != '=')
331 {
332 y += v_align;
333 x += h_align;
334 }
335 }
336 }
337 else /* setting up geometry from scratch */
338 {
339 if (!(geom_flags & XValue))
340 {
341 /* use default geometry - centered */
342 x = y = defaultAlign;
343 }
344 else if (!(geom_flags & YValue))
345 y = x;
346
347 if ((geom_flags & (WidthValue|HeightValue)) == 0)
348 {
349 /* use default geometry - scaled */
350 w = h = defaultScale;
351 }
352 else if (geom_flags & WidthValue)
353 {
354 if (!(geom_flags & HeightValue))
355 h = w;
356 }
357 else
358 w = h;
359 }
360 } /* done parsing geometry string */ 259 } /* done parsing geometry string */
361 else if (!(flags & geometrySet)) 260
362 { 261 if (!update)
363 /* default geometry - scaled and centered */ 262 {
263 if (!(geom_flags & XValue))
364 x = y = defaultAlign; 264 x = y = defaultAlign;
265 else if (!(geom_flags & YValue))
266 y = x;
267
268 if (!(geom_flags & (WidthValue|HeightValue)))
365 w = h = defaultScale; 269 w = h = defaultScale;
366 } 270 else if (!(geom_flags & HeightValue))
271 h = w;
272 else if (!(geom_flags & WidthValue))
273 w = h;
367 274
368 if (!(flags & geometrySet))
369 geom_flags |= WidthValue|HeightValue|XValue|YValue; 275 geom_flags |= WidthValue|HeightValue|XValue|YValue;
276 }
370 277
371 if (ops) 278 if (ops)
372 { 279 {
373 while (*ops) 280 char **arr = rxvt_strsplit (':', ops + 1);
281
282 for (int i = 0; arr[i]; i++)
374 { 283 {
375 while (*ops == ':' || isspace(*ops)) ++ops; 284 if (!strcasecmp (arr[i], "tile"))
376
377# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
378 if (CHECK_GEOM_OPS ("tile"))
379 { 285 {
380 w = h = noScale; 286 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 287 geom_flags |= WidthValue|HeightValue;
382 } 288 }
383 else if (CHECK_GEOM_OPS ("propscale")) 289 else if (!strcasecmp (arr[i], "propscale"))
384 { 290 {
385 new_flags |= propScale; 291 new_flags |= propScale;
386 } 292 }
387 else if (CHECK_GEOM_OPS ("hscale")) 293 else if (!strcasecmp (arr[i], "hscale"))
388 { 294 {
389 if (w == 0) w = windowScale; 295 if (w == 0) w = windowScale;
390 296
391 h = noScale; 297 h = noScale;
392 geom_flags |= WidthValue|HeightValue; 298 geom_flags |= WidthValue|HeightValue;
393 } 299 }
394 else if (CHECK_GEOM_OPS ("vscale")) 300 else if (!strcasecmp (arr[i], "vscale"))
395 { 301 {
396 if (h == 0) h = windowScale; 302 if (h == 0) h = windowScale;
397 303
398 w = noScale; 304 w = noScale;
399 geom_flags |= WidthValue|HeightValue; 305 geom_flags |= WidthValue|HeightValue;
400 } 306 }
401 else if (CHECK_GEOM_OPS ("scale")) 307 else if (!strcasecmp (arr[i], "scale"))
402 { 308 {
403 if (h == 0) h = windowScale; 309 if (h == 0) h = windowScale;
404 if (w == 0) w = windowScale; 310 if (w == 0) w = windowScale;
405 311
406 geom_flags |= WidthValue|HeightValue; 312 geom_flags |= WidthValue|HeightValue;
407 } 313 }
408 else if (CHECK_GEOM_OPS ("auto")) 314 else if (!strcasecmp (arr[i], "auto"))
409 { 315 {
410 w = h = windowScale; 316 w = h = windowScale;
411 x = y = centerAlign; 317 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 318 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 319 }
414 else if (CHECK_GEOM_OPS ("root")) 320 else if (!strcasecmp (arr[i], "root"))
415 { 321 {
416 new_flags |= rootAlign; 322 new_flags |= rootAlign;
417 w = h = noScale; 323 w = h = noScale;
418 geom_flags |= WidthValue|HeightValue; 324 geom_flags |= WidthValue|HeightValue;
419 } 325 }
420# undef CHECK_GEOM_OPS
421
422 while (*ops != ':' && *ops != '\0') ++ops;
423 } /* done parsing ops */ 326 } /* done parsing ops */
424 }
425 327
328 rxvt_free_strsplit (arr);
329 }
330
426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 331 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 332 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
428 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 333 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 334 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
430 }
431 335
432 if (new_flags != flags) 336 if (new_flags != flags)
433 { 337 {
434 flags = new_flags; 338 flags = new_flags;
435 changed = true; 339 changed = true;
… …
460 if (!w) w = image_width; 364 if (!w) w = image_width;
461 if (!h) h = image_height; 365 if (!h) h = image_height;
462 366
463 if (flags & rootAlign) 367 if (flags & rootAlign)
464 { 368 {
465 target->get_window_origin (x, y);
466 x = -x; 369 x = -target_x;
467 y = -y; 370 y = -target_y;
468 } 371 }
469 else 372 else
470 { 373 {
471 x = make_align_position (h_align, target_width, w); 374 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h); 375 y = make_align_position (v_align, target_height, h);
… …
669 GC gc; 572 GC gc;
670 573
671 /* create Pixmap */ 574 /* create Pixmap */
672 if (pixmap == None 575 if (pixmap == None
673 || pmap_width != new_pmap_width 576 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height 577 || pmap_height != new_pmap_height)
675 || pmap_depth != target->depth)
676 { 578 {
677 if (pixmap) 579 if (pixmap)
678 XFreePixmap (target->dpy, pixmap); 580 XFreePixmap (target->dpy, pixmap);
679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 581 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
680 pmap_width = new_pmap_width; 582 pmap_width = new_pmap_width;
681 pmap_height = new_pmap_height; 583 pmap_height = new_pmap_height;
682 pmap_depth = target->depth;
683 } 584 }
684 /* fill with background color (if result's not completely overlapping it) */ 585 /* fill with background color (if result's not completely overlapping it) */
685 gcv.foreground = target->pix_colors[Color_bg]; 586 gcv.foreground = target->pix_colors[Color_bg];
686 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 587 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
687 588
… …
719 return ret; 620 return ret;
720} 621}
721# endif /* HAVE_AFTERIMAGE */ 622# endif /* HAVE_AFTERIMAGE */
722 623
723# ifdef HAVE_PIXBUF 624# ifdef HAVE_PIXBUF
625bool
626bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
627 int src_x, int src_y, int dst_x, int dst_y,
628 unsigned int width, unsigned int height)
629{
630 XImage *ximage;
631 char *data, *line;
632 int bytes_per_pixel;
633 int width_r, width_g, width_b;
634 int sh_r, sh_g, sh_b;
635 int rowstride;
636 int channels;
637 unsigned char *row;
638 Visual *visual = target->visual;
639 int depth = target->depth;
640
641 if (visual->c_class != TrueColor)
642 return false;
643
644 if (depth == 24 || depth == 32)
645 bytes_per_pixel = 4;
646 else if (depth == 15 || depth == 16)
647 bytes_per_pixel = 2;
648 else
649 return false;
650
651 width_r = rxvt_popcount (visual->red_mask);
652 width_g = rxvt_popcount (visual->green_mask);
653 width_b = rxvt_popcount (visual->blue_mask);
654
655 if (width_r > 8 || width_g > 8 || width_b > 8)
656 return false;
657
658 sh_r = rxvt_ctz (visual->red_mask);
659 sh_g = rxvt_ctz (visual->green_mask);
660 sh_b = rxvt_ctz (visual->blue_mask);
661
662 if (width > INT_MAX / height / bytes_per_pixel)
663 return false;
664
665 data = (char *)malloc (width * height * bytes_per_pixel);
666 if (!data)
667 return false;
668
669 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
670 width, height, bytes_per_pixel * 8, 0);
671 if (!ximage)
672 {
673 free (data);
674 return false;
675 }
676
677 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
678
679 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
680 channels = gdk_pixbuf_get_n_channels (pixbuf);
681 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
682 line = data;
683
684 for (int y = 0; y < height; y++)
685 {
686 for (int x = 0; x < width; x++)
687 {
688 unsigned char *pixel = row + x * channels;
689 uint32_t value;
690
691 value = ((pixel[0] >> (8 - width_r)) << sh_r)
692 | ((pixel[1] >> (8 - width_g)) << sh_g)
693 | ((pixel[2] >> (8 - width_b)) << sh_b);
694
695 if (bytes_per_pixel == 4)
696 ((uint32_t *)line)[x] = value;
697 else
698 ((uint16_t *)line)[x] = value;
699 }
700
701 row += rowstride;
702 line += ximage->bytes_per_line;
703 }
704
705 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
706 XDestroyImage (ximage);
707 return true;
708}
709
724bool 710bool
725bgPixmap_t::render_image (unsigned long background_flags) 711bgPixmap_t::render_image (unsigned long background_flags)
726{ 712{
727 if (target == NULL) 713 if (target == NULL)
728 return false; 714 return false;
… …
793 } 779 }
794 } 780 }
795 781
796 if (pixmap == None 782 if (pixmap == None
797 || pmap_width != new_pmap_width 783 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height 784 || pmap_height != new_pmap_height)
799 || pmap_depth != target->depth)
800 { 785 {
801 if (pixmap) 786 if (pixmap)
802 XFreePixmap (target->dpy, pixmap); 787 XFreePixmap (target->dpy, pixmap);
803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 788 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
804 pmap_width = new_pmap_width; 789 pmap_width = new_pmap_width;
805 pmap_height = new_pmap_height; 790 pmap_height = new_pmap_height;
806 pmap_depth = target->depth;
807 } 791 }
808 792
809 gcv.foreground = target->pix_colors[Color_bg]; 793 gcv.foreground = target->pix_colors[Color_bg];
810 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 794 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
811 795
812 if (h_scale == 0 || v_scale == 0) 796 if (h_scale == 0 || v_scale == 0)
813 { 797 {
814 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 798 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
815 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 799 pixbuf_to_pixmap (result, tile, gc,
816 0, 0, 800 0, 0,
817 0, 0, 801 0, 0,
818 image_width, image_height, 802 image_width, image_height);
819 XLIB_RGB_DITHER_NONE,
820 0, 0);
821 803
822 gcv.tile = tile; 804 gcv.tile = tile;
823 gcv.fill_style = FillTiled; 805 gcv.fill_style = FillTiled;
824 gcv.ts_x_origin = x; 806 gcv.ts_x_origin = x;
825 gcv.ts_y_origin = y; 807 gcv.ts_y_origin = y;
… …
840 || dst_x + dst_width < new_pmap_width 822 || dst_x + dst_width < new_pmap_width
841 || dst_y + dst_height < new_pmap_height) 823 || dst_y + dst_height < new_pmap_height)
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 824 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 825
844 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 826 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
845 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 827 pixbuf_to_pixmap (result, pixmap, gc,
846 src_x, src_y, 828 src_x, src_y,
847 dst_x, dst_y, 829 dst_x, dst_y,
848 dst_width, dst_height, 830 dst_width, dst_height);
849 XLIB_RGB_DITHER_NONE,
850 0, 0);
851 } 831 }
852 832
853#if XRENDER 833#if XRENDER
854 if (background_flags) 834 if (background_flags)
855 { 835 {
… …
922 if (image) 902 if (image)
923 { 903 {
924 if (original_asim) 904 if (original_asim)
925 safe_asimage_destroy (original_asim); 905 safe_asimage_destroy (original_asim);
926 original_asim = image; 906 original_asim = image;
907 flags |= CLIENT_RENDER;
927 have_image = true; 908 have_image = true;
928 return true; 909 return true;
929 } 910 }
930# endif 911# endif
931 912
… …
1003 bool has_shade = shade != 100; 984 bool has_shade = shade != 100;
1004 985
1005 if (tint) 986 if (tint)
1006 { 987 {
1007 tint->get (c); 988 tint->get (c);
1008# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 989 if (!has_shade
1009 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 990 && (c.r <= 0x00ff || c.r >= 0xff00)
1010 && IS_COMPONENT_WHOLESOME (c.g) 991 && (c.g <= 0x00ff || c.g >= 0xff00)
1011 && IS_COMPONENT_WHOLESOME (c.b)) 992 && (c.b <= 0x00ff || c.b >= 0xff00))
1012 flags |= bgPixmap_t::tintWholesome; 993 flags |= bgPixmap_t::tintWholesome;
1013# undef IS_COMPONENT_WHOLESOME
1014 } 994 }
1015 995
1016 if (has_shade) 996 if (has_shade || tint)
1017 flags |= bgPixmap_t::tintNeeded; 997 flags |= bgPixmap_t::tintNeeded;
1018 else if (tint)
1019 {
1020 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1021 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1022 {
1023 flags |= bgPixmap_t::tintNeeded;
1024 }
1025 }
1026 998
1027 return flags; 999 return flags;
1028} 1000}
1029 1001
1030bool 1002bool
… …
1040 1012
1041 return false; 1013 return false;
1042} 1014}
1043 1015
1044bool 1016bool
1045bgPixmap_t::unset_tint ()
1046{
1047 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1048
1049 if (new_flags != (flags & tintFlags))
1050 {
1051 flags = (flags & ~tintFlags) | new_flags;
1052 return true;
1053 }
1054
1055 return false;
1056}
1057
1058bool
1059bgPixmap_t::set_shade (const char *shade_str) 1017bgPixmap_t::set_shade (const char *shade_str)
1060{ 1018{
1061 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1019 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1062 1020
1063 clamp_it (new_shade, -100, 200); 1021 clamp_it (new_shade, -100, 200);
… …
1066 1024
1067 if (new_shade != shade) 1025 if (new_shade != shade)
1068 { 1026 {
1069 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1027 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1070 shade = new_shade; 1028 shade = new_shade;
1071 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1029 flags = (flags & ~tintFlags) | new_flags;
1072 return true; 1030 return true;
1073 } 1031 }
1074 1032
1075 return false; 1033 return false;
1076} 1034}
… …
1201 c.g = (c.g * shade) / 100; 1159 c.g = (c.g * shade) / 100;
1202 c.b = (c.b * shade) / 100; 1160 c.b = (c.b * shade) / 100;
1203 } 1161 }
1204 else 1162 else
1205 { 1163 {
1206 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1164 c.r = (c.r * (200 - shade)) / 100;
1207 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1165 c.g = (c.g * (200 - shade)) / 100;
1208 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1166 c.b = (c.b * (200 - shade)) / 100;
1209 } 1167 }
1210 1168
1211 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1169 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1212 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1170 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1213 XRenderPictureAttributes pa; 1171 XRenderPictureAttributes pa;
… …
1227 1185
1228 if (mask_pic && overlay_pic && back_pic) 1186 if (mask_pic && overlay_pic && back_pic)
1229 { 1187 {
1230 XRenderColor mask_c; 1188 XRenderColor mask_c;
1231 1189
1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1190 mask_c.red = mask_c.green = mask_c.blue = 0;
1233 mask_c.alpha = 0xffff; 1191 mask_c.alpha = 0xffff;
1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1192 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1235 1193
1236 mask_c.alpha = 0; 1194 mask_c.alpha = 0;
1237 mask_c.red = 0xffff - c.r; 1195 mask_c.red = 0xffff - c.r;
1238 mask_c.green = 0xffff - c.g; 1196 mask_c.green = 0xffff - c.g;
1239 mask_c.blue = 0xffff - c.b; 1197 mask_c.blue = 0xffff - c.b;
1240 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1198 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1241 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1199 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1200
1201 if (shade > 100)
1202 {
1203 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1204 mask_c.alpha = 0;
1205 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1206
1207 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1208 }
1209
1242 ret = true; 1210 ret = true;
1243 } 1211 }
1244 1212
1245 XRenderFreePicture (dpy, mask_pic); 1213 XRenderFreePicture (dpy, mask_pic);
1246 XRenderFreePicture (dpy, overlay_pic); 1214 XRenderFreePicture (dpy, overlay_pic);
… …
1277 int window_height = target->szHint.height; 1245 int window_height = target->szHint.height;
1278 int sx, sy; 1246 int sx, sy;
1279 XGCValues gcv; 1247 XGCValues gcv;
1280 GC gc; 1248 GC gc;
1281 1249
1282 target->get_window_origin (sx, sy); 1250 sx = target_x;
1251 sy = target_y;
1283 1252
1284 /* check if we are outside of the visible part of the virtual screen : */ 1253 /* check if we are outside of the visible part of the virtual screen : */
1285 if (sx + window_width <= 0 || sy + window_height <= 0 1254 if (sx + window_width <= 0 || sy + window_height <= 0
1286 || sx >= root_width || sy >= root_height) 1255 || sx >= root_width || sy >= root_height)
1287 return 0; 1256 return 0;
… …
1334 } 1303 }
1335 1304
1336 if (root_pixmap == None) 1305 if (root_pixmap == None)
1337 return 0; 1306 return 0;
1338 1307
1308 if (pixmap == None
1309 || pmap_width != window_width
1310 || pmap_height != window_height)
1311 {
1312 if (pixmap)
1313 XFreePixmap (target->dpy, pixmap);
1339 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1314 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1315 pmap_width = window_width;
1316 pmap_height = window_height;
1317 }
1340 1318
1341 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1319 if (pixmap == None)
1342 return 0; 1320 return 0;
1343 1321
1344 /* straightforward pixmap copy */ 1322 /* straightforward pixmap copy */
1323 while (sx < 0) sx += (int)root_width;
1324 while (sy < 0) sy += (int)root_height;
1325
1345 gcv.tile = recoded_root_pmap; 1326 gcv.tile = recoded_root_pmap;
1346 gcv.fill_style = FillTiled; 1327 gcv.fill_style = FillTiled;
1347
1348 while (sx < 0) sx += (int)root_width;
1349 while (sy < 0) sy += (int)root_height;
1350
1351 gcv.ts_x_origin = -sx; 1328 gcv.ts_x_origin = -sx;
1352 gcv.ts_y_origin = -sy; 1329 gcv.ts_y_origin = -sy;
1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1330 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1354 1331
1355 if (gc) 1332 if (gc)
1356 { 1333 {
1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1334 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1358 result |= transpPmapTiled; 1335 result |= transpPmapTiled;
1359 XFreeGC (dpy, gc); 1336 XFreeGC (dpy, gc);
1360 1337
1361 if (!need_client_side_rendering ()) 1338 if (!(flags & CLIENT_RENDER))
1362 { 1339 {
1363 if ((flags & blurNeeded) 1340 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV)) 1341 && (flags & HAS_RENDER_CONV))
1365 { 1342 {
1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1343 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1367 result |= transpPmapBlurred; 1344 result |= transpPmapBlurred;
1368 } 1345 }
1369 if ((flags & tintNeeded) 1346 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER))) 1347 && (flags & (tintWholesome | HAS_RENDER)))
1371 { 1348 {
1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1349 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1373 result |= transpPmapTinted; 1350 result |= transpPmapTinted;
1374 } 1351 }
1375 } /* server side rendering completed */ 1352 } /* server side rendering completed */
1376
1377 if (pixmap)
1378 XFreePixmap (dpy, pixmap);
1379
1380 pixmap = tiled_root_pmap;
1381 pmap_width = window_width;
1382 pmap_height = window_height;
1383 pmap_depth = target->depth;
1384 } 1353 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1387 1354
1388 if (recoded_root_pmap != root_pixmap) 1355 if (recoded_root_pmap != root_pixmap)
1389 XFreePixmap (dpy, recoded_root_pmap); 1356 XFreePixmap (dpy, recoded_root_pmap);
1390 1357
1391 return result; 1358 return result;
1392} 1359}
1393 1360
1394void 1361void
1395bgPixmap_t::set_root_pixmap () 1362bgPixmap_t::set_root_pixmap ()
1396{ 1363{
1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1364 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1398 if (new_root_pixmap == None) 1365 if (new_root_pixmap == None)
1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1366 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1400 1367
1401 root_pixmap = new_root_pixmap; 1368 root_pixmap = new_root_pixmap;
1402} 1369}
1403# endif /* ENABLE_TRANSPARENCY */ 1370# endif /* ENABLE_TRANSPARENCY */
1404 1371
1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1372#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1373static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1407# endif 1374# endif
1408 1375
1409bool 1376bool
1410bgPixmap_t::render () 1377bgPixmap_t::render ()
1411{ 1378{
… …
1421 /* we need to re-generate transparency pixmap in that case ! */ 1388 /* we need to re-generate transparency pixmap in that case ! */
1422 background_flags = make_transparency_pixmap (); 1389 background_flags = make_transparency_pixmap ();
1423 if (background_flags == 0) 1390 if (background_flags == 0)
1424 return false; 1391 return false;
1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1392 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1426 flags = flags & ~isInvalid; 1393 flags |= isValid;
1427 } 1394 }
1428# endif 1395# endif
1429 1396
1430# ifdef BG_IMAGE_FROM_FILE 1397# ifdef BG_IMAGE_FROM_FILE
1431 if (have_image 1398 if (have_image
1432 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1399 || (background_flags & transpTransformations) != (flags & transpTransformations))
1433 { 1400 {
1434 if (render_image (background_flags)) 1401 if (render_image (background_flags))
1435 flags = flags & ~isInvalid; 1402 flags |= isValid;
1436 } 1403 }
1437# endif 1404# endif
1438 1405
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1406# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1440 XImage *result = NULL; 1407 XImage *result = NULL;
1441 1408
1442 if (background_flags && (flags & isInvalid)) 1409 if (background_flags && !(flags & isValid))
1443 { 1410 {
1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1411 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1445 } 1412 }
1446 1413
1447 if (result) 1414 if (result)
… …
1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1417 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1451 { 1418 {
1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1419 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1453 if (flags & tintSet) 1420 if (flags & tintSet)
1454 tint.get (c); 1421 tint.get (c);
1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1422 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1456 } 1423 }
1457 1424
1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1425 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459 1426
1460 if (gc) 1427 if (gc)
1461 { 1428 {
1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1429 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1463 1430
1464 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1465 flags = flags & ~isInvalid; 1432 flags |= isValid;
1466 } 1433 }
1467 1434
1468 XDestroyImage (result); 1435 XDestroyImage (result);
1469 } 1436 }
1470# endif 1437# endif
1471 1438
1472 if (flags & isInvalid) 1439 if (!(flags & isValid))
1473 { 1440 {
1474 if (pixmap != None) 1441 if (pixmap != None)
1475 { 1442 {
1476 XFreePixmap (target->dpy, pixmap); 1443 XFreePixmap (target->dpy, pixmap);
1477 pixmap = None; 1444 pixmap = None;
1478 } 1445 }
1479 } 1446 }
1480 1447
1481 apply (); 1448 target->scr_recolour (false);
1449 flags |= hasChanged;
1482 1450
1483 valid_since = ev::now (); 1451 valid_since = ev::now ();
1484 1452
1485 return true; 1453 return true;
1486} 1454}
… …
1505 XFree (filters); 1473 XFree (filters);
1506 } 1474 }
1507#endif 1475#endif
1508} 1476}
1509 1477
1510void
1511bgPixmap_t::apply ()
1512{
1513 if (target == NULL)
1514 return;
1515
1516 if (pixmap != None)
1517 {
1518 /* set target's background to pixmap */
1519# ifdef ENABLE_TRANSPARENCY
1520 if (flags & isTransparent)
1521 {
1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1524
1525 if (target->scrollBar.win)
1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1527 }
1528 else
1529# endif
1530 {
1531 /* force old pixmap dereference in case it was transparent before :*/
1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1534 /* do we also need to set scrollbar's background here ? */
1535
1536 if (target->scrollBar.win)
1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1549
1550 /* don't want Expose on the parent or vt. It is better to use
1551 scr_touch or we get a great deal of flicker otherwise: */
1552 XClearWindow (target->dpy, target->parent[0]);
1553
1554 if (target->scrollBar.state && target->scrollBar.win)
1555 {
1556 target->scrollBar.state = STATE_IDLE;
1557 target->scrollBar.show (0);
1558 }
1559
1560 target->want_refresh = 1;
1561 flags |= hasChanged;
1562}
1563
1564#endif /* HAVE_BG_PIXMAP */ 1478#endif /* HAVE_BG_PIXMAP */
1565 1479
1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1480#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1567/* taken from aterm-0.4.2 */ 1481/* taken from aterm-0.4.2 */
1568 1482
1569static void 1483static void
1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1484shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1571{ 1485{
1572 int sh_r, sh_g, sh_b; 1486 int sh_r, sh_g, sh_b;
1573 uint32_t mask_r, mask_g, mask_b; 1487 uint32_t mask_r, mask_g, mask_b;
1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1488 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1575 rgba low; 1489 rgba low;
1576 rgba high; 1490 rgba high;
1577 int i; 1491 int i;
1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1492 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1579 1493
1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1494 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1581 1495
1582 /* for convenience */ 1496 /* for convenience */
1583 mask_r = visual->red_mask; 1497 mask_r = visual->red_mask;
1584 mask_g = visual->green_mask; 1498 mask_g = visual->green_mask;
1585 mask_b = visual->blue_mask; 1499 mask_b = visual->blue_mask;
1586 1500
1587 /* boring lookup table pre-initialization */ 1501 /* boring lookup table pre-initialization */
1588 switch (srcImage->depth) 1502 switch (ximage->depth)
1589 { 1503 {
1590 case 15: 1504 case 15:
1591 if ((mask_r != 0x7c00) || 1505 if ((mask_r != 0x7c00) ||
1592 (mask_g != 0x03e0) || 1506 (mask_g != 0x03e0) ||
1593 (mask_b != 0x001f)) 1507 (mask_b != 0x001f))
… …
1646 /* prepare limits for color transformation (each channel is handled separately) */ 1560 /* prepare limits for color transformation (each channel is handled separately) */
1647 if (shade > 100) 1561 if (shade > 100)
1648 { 1562 {
1649 shade = 200 - shade; 1563 shade = 200 - shade;
1650 1564
1651 high.r = (65535 - c.r) * shade / 100; 1565 high.r = c.r * shade / 100;
1652 high.g = (65535 - c.g) * shade / 100; 1566 high.g = c.g * shade / 100;
1653 high.b = (65535 - c.b) * shade / 100; 1567 high.b = c.b * shade / 100;
1654 1568
1655 low.r = 65535 - high.r; 1569 low.r = 65535 * (100 - shade) / 100;
1656 low.g = 65535 - high.g; 1570 low.g = 65535 * (100 - shade) / 100;
1657 low.b = 65535 - high.b; 1571 low.b = 65535 * (100 - shade) / 100;
1658 } 1572 }
1659 else 1573 else
1660 { 1574 {
1661 high.r = c.r * shade / 100; 1575 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100; 1576 high.g = c.g * shade / 100;
… …
1687 tmp += (mask_b>>sh_b) * low.b; 1601 tmp += (mask_b>>sh_b) * low.b;
1688 lookup_b[i] = (tmp/65535)<<sh_b; 1602 lookup_b[i] = (tmp/65535)<<sh_b;
1689 } 1603 }
1690 1604
1691 /* apply table to input image (replacing colors by newly calculated ones) */ 1605 /* apply table to input image (replacing colors by newly calculated ones) */
1692 if (srcImage->bits_per_pixel == 32 1606 if (ximage->bits_per_pixel == 32
1693 && (srcImage->depth == 24 || srcImage->depth == 32) 1607 && (ximage->depth == 24 || ximage->depth == 32)
1694 && srcImage->byte_order == host_byte_order) 1608 && ximage->byte_order == host_byte_order)
1695 { 1609 {
1696 uint32_t *p1, *pf, *p, *pl; 1610 uint32_t *p1, *pf, *p, *pl;
1697 p1 = (uint32_t *) srcImage->data; 1611 p1 = (uint32_t *) ximage->data;
1698 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1612 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1699 1613
1700 while (p1 < pf) 1614 while (p1 < pf)
1701 { 1615 {
1702 p = p1; 1616 p = p1;
1703 pl = p1 + srcImage->width; 1617 pl = p1 + ximage->width;
1704 for (; p < pl; p++) 1618 for (; p < pl; p++)
1705 { 1619 {
1706 *p = lookup_r[(*p & 0xff0000) >> 16] | 1620 *p = lookup_r[(*p & 0xff0000) >> 16] |
1707 lookup_g[(*p & 0x00ff00) >> 8] | 1621 lookup_g[(*p & 0x00ff00) >> 8] |
1708 lookup_b[(*p & 0x0000ff)] | 1622 lookup_b[(*p & 0x0000ff)] |
1709 (*p & 0xff000000); 1623 (*p & 0xff000000);
1710 } 1624 }
1711 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1625 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1712 } 1626 }
1713 } 1627 }
1714 else 1628 else
1715 { 1629 {
1716 for (int y = 0; y < srcImage->height; y++) 1630 for (int y = 0; y < ximage->height; y++)
1717 for (int x = 0; x < srcImage->width; x++) 1631 for (int x = 0; x < ximage->width; x++)
1718 { 1632 {
1719 unsigned long pixel = XGetPixel (srcImage, x, y); 1633 unsigned long pixel = XGetPixel (ximage, x, y);
1720 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1634 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1721 lookup_g[(pixel & mask_g) >> sh_g] | 1635 lookup_g[(pixel & mask_g) >> sh_g] |
1722 lookup_b[(pixel & mask_b) >> sh_b]; 1636 lookup_b[(pixel & mask_b) >> sh_b];
1723 XPutPixel (srcImage, x, y, pixel); 1637 XPutPixel (ximage, x, y, pixel);
1724 } 1638 }
1725 } 1639 }
1726 1640
1727 free (lookup); 1641 free (lookup);
1728} 1642}

Diff Legend

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