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.92 by sf-exg, Mon Oct 18 23:28:48 2010 UTC vs.
Revision 1.130 by sf-exg, Sun Jan 9 23:48:37 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;
… …
168 return true; 173 return true;
169 } 174 }
170# endif 175# endif
171 176
172 return false; 177 return false;
173}; 178}
174 179
175bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
176{ 181{
177# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 183 if (original_asim)
… …
248 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
249 return src_pos; 254 return src_pos;
250} 255}
251 256
252bool 257bool
253bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 259{
260 bool changed = false;
255 int geom_flags = 0, changed = 0; 261 int geom_flags = 0;
256 int x = 0, y = 0; 262 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
258 unsigned int n; 264 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 266 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 268
263 if (geom == NULL) 269 if (geom == NULL)
264 return false; 270 return false;
265 271
266 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
267 273
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
271 275 if (ops == NULL)
276 n = strlen (geom);
277 else
272 n = (p - geom); 278 n = ops - geom;
279
273 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
274 { 281 return false;
275 char *ops;
276 new_flags |= geometrySet;
277 282
278 memcpy (str, geom, n); 283 memcpy (str, geom, n);
279 str[n] = '\0'; 284 str[n] = '\0';
280 if (str[0] == ':') 285 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 286
296 if (ops > str || ops == NULL) 287 if (str[0])
297 { 288 {
298 /* 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 */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 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 */ 291 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 292
357 { 293 if (!update)
358 /* default geometry - scaled and centered */ 294 {
295 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 301 w = h = defaultScale;
361 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
362 306
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
365 309
366 if (ops) 310 if (ops)
367 { 311 {
368 while (*ops) 312 while (*ops)
369 { 313 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
371 315
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
374 { 318 {
375 w = h = noScale; 319 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
377 } 321 }
378 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
379 { 323 {
380 new_flags |= propScale; 324 new_flags |= propScale;
381 } 325 }
382 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
383 { 327 {
384 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
385 329
386 h = noScale; 330 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
388 } 332 }
389 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
390 { 334 {
391 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
392 336
393 w = noScale; 337 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
395 } 339 }
396 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
397 { 341 {
398 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
400 344
401 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
402 } 346 }
403 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
404 { 348 {
405 w = h = windowScale; 349 w = h = windowScale;
406 x = y = centerAlign; 350 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 352 }
409 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
410 { 354 {
411 new_flags |= rootAlign; 355 new_flags |= rootAlign;
412 w = h = noScale; 356 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
414 } 358 }
415# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
416 360
417 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 362 } /* done parsing ops */
419 } 363 }
420 364
421 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;
422 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;
423 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;
424 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;
425 }
426 369
427 if (new_flags != flags) 370 if (new_flags != flags)
428 { 371 {
429 flags = new_flags; 372 flags = new_flags;
430 changed++; 373 changed = true;
431 } 374 }
432 375
433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 376 return changed;
436} 377}
437 378
438void 379void
439bgPixmap_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)
440{ 381{
… …
457 if (!w) w = image_width; 398 if (!w) w = image_width;
458 if (!h) h = image_height; 399 if (!h) h = image_height;
459 400
460 if (flags & rootAlign) 401 if (flags & rootAlign)
461 { 402 {
462 target->get_window_origin (x, y);
463 x = -x; 403 x = -target_x;
464 y = -y; 404 y = -target_y;
465 } 405 }
466 else 406 else
467 { 407 {
468 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
529 469
530 int x = 0; 470 int x = 0;
531 int y = 0; 471 int y = 0;
532 int w = 0; 472 int w = 0;
533 int h = 0; 473 int h = 0;
534
535 TIMING_TEST_START (asim);
536 474
537 if (original_asim) 475 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 476 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 477
540 if (!original_asim 478 if (!original_asim
… …
657 } 595 }
658 596
659 free (layers); 597 free (layers);
660 } 598 }
661 } 599 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 600
664 bool ret = false; 601 bool ret = false;
665 602
666 if (result) 603 if (result)
667 { 604 {
668 XGCValues gcv; 605 XGCValues gcv;
669 GC gc; 606 GC gc;
670 607
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 608 /* create Pixmap */
683 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
684 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
685 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);
686 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
688 pmap_depth = target->depth; 619 pmap_depth = target->depth;
689 } 620 }
… …
713 644
714 if (result != background && result != original_asim) 645 if (result != background && result != original_asim)
715 destroy_asimage (&result); 646 destroy_asimage (&result);
716 647
717 XFreeGC (target->dpy, gc); 648 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 649
720 ret = true; 650 ret = true;
721 } 651 }
722 652
723 if (background) 653 if (background)
… …
727} 657}
728# endif /* HAVE_AFTERIMAGE */ 658# endif /* HAVE_AFTERIMAGE */
729 659
730# ifdef HAVE_PIXBUF 660# ifdef HAVE_PIXBUF
731bool 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
746bool
732bgPixmap_t::render_image (unsigned long background_flags) 747bgPixmap_t::render_image (unsigned long background_flags)
733{ 748{
734 if (target == NULL) 749 if (target == NULL)
735 return false; 750 return false;
736 751
737 if (!pixbuf) 752 if (!pixbuf)
738 return false; 753 return false;
739 754
740#if !XFT
741 if (background_flags) 755 if (background_flags
756 && !(flags & HAS_RENDER))
742 return false; 757 return false;
743#endif
744 758
745 GdkPixbuf *result; 759 GdkPixbuf *result;
746 760
747 int image_width = gdk_pixbuf_get_width (pixbuf); 761 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 762 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 813 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 814 new_pmap_height = min (image_height, target_height);
801 } 815 }
802 } 816 }
803 817
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None) 818 if (pixmap == None
819 || pmap_width != new_pmap_width
820 || pmap_height != new_pmap_height
821 || pmap_depth != target->depth)
816 { 822 {
823 if (pixmap)
824 XFreePixmap (target->dpy, pixmap);
817 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);
818 pmap_width = new_pmap_width; 826 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 827 pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 828 pmap_depth = target->depth;
821 } 829 }
… …
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825 833
826 if (h_scale == 0 || v_scale == 0) 834 if (h_scale == 0 || v_scale == 0)
827 { 835 {
828 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);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 837 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 838 0, 0,
831 0, 0, 839 0, 0,
832 image_width, image_height, 840 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 841
836 gcv.tile = tile; 842 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 843 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 844 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 845 gcv.ts_y_origin = y;
… …
854 || dst_x + dst_width < new_pmap_width 860 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 861 || dst_y + dst_height < new_pmap_height)
856 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);
857 863
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 864 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 865 pixbuf_to_pixmap (result, pixmap, gc,
860 src_x, src_y, 866 src_x, src_y,
861 dst_x, dst_y, 867 dst_x, dst_y,
862 dst_width, dst_height, 868 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 } 869 }
866 870
867#if XFT 871#if XRENDER
868 if (background_flags) 872 if (background_flags)
869 { 873 {
870 Display *dpy = target->dpy; 874 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 875 XRenderPictureAttributes pa;
872 876
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 877 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 878 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 879
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 880 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 881 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 882
… …
915# endif /* HAVE_PIXBUF */ 919# endif /* HAVE_PIXBUF */
916 920
917bool 921bool
918bgPixmap_t::set_file (const char *file) 922bgPixmap_t::set_file (const char *file)
919{ 923{
920 assert (file); 924 if (!file || !*file)
925 return false;
921 926
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 927 if (const char *p = strchr (file, ';'))
925 { 928 {
926 size_t len = p - file; 929 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 930 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 931 memcpy (f, file, len);
929 f[len] = '\0'; 932 f[len] = '\0';
930 file = f; 933 file = f;
931 } 934 }
932 935
933# ifdef HAVE_AFTERIMAGE 936# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 937 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 938 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 939 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 940 if (image)
938 { 941 {
939 if (original_asim) 942 if (original_asim)
940 safe_asimage_destroy (original_asim); 943 safe_asimage_destroy (original_asim);
941 original_asim = image; 944 original_asim = image;
942 have_image = true; 945 have_image = true;
943 return true; 946 return true;
944 } 947 }
945# endif 948# endif
946 949
947# ifdef HAVE_PIXBUF 950# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 951 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 952 if (image)
950 { 953 {
951 if (pixbuf) 954 if (pixbuf)
952 g_object_unref (pixbuf); 955 g_object_unref (pixbuf);
953 pixbuf = image; 956 pixbuf = image;
954 have_image = true; 957 have_image = true;
955 return true; 958 return true;
956 } 959 }
957# endif 960# endif
958 }
959 961
960 return false; 962 return false;
961} 963}
962 964
963# endif /* BG_IMAGE_FROM_FILE */ 965# endif /* BG_IMAGE_FROM_FILE */
… …
976} 978}
977 979
978bool 980bool
979bgPixmap_t::set_blur_radius (const char *geom) 981bgPixmap_t::set_blur_radius (const char *geom)
980{ 982{
981 int changed = 0; 983 bool changed = false;
982 unsigned int hr, vr; 984 unsigned int hr, vr;
983 int junk; 985 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 986 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 987
986 if (!(geom_flags & WidthValue)) 988 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 993 min_it (hr, 128);
992 min_it (vr, 128); 994 min_it (vr, 128);
993 995
994 if (h_blurRadius != hr) 996 if (h_blurRadius != hr)
995 { 997 {
996 ++changed; 998 changed = true;
997 h_blurRadius = hr; 999 h_blurRadius = hr;
998 } 1000 }
999 1001
1000 if (v_blurRadius != vr) 1002 if (v_blurRadius != vr)
1001 { 1003 {
1002 ++changed; 1004 changed = true;
1003 v_blurRadius = vr; 1005 v_blurRadius = vr;
1004 } 1006 }
1005 1007
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 1008 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 1009 flags &= ~blurNeeded;
1008 else 1010 else
1009 flags |= blurNeeded; 1011 flags |= blurNeeded;
1010 1012
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 1013 return changed;
1024} 1014}
1025 1015
1026static inline unsigned long 1016static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 1017compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1018{
… …
1031 bool has_shade = shade != 100; 1021 bool has_shade = shade != 100;
1032 1022
1033 if (tint) 1023 if (tint)
1034 { 1024 {
1035 tint->get (c); 1025 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1027 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1028 && IS_COMPONENT_WHOLESOME (c.r)
1038 && IS_COMPONENT_WHOLESOME (c.g) 1029 && IS_COMPONENT_WHOLESOME (c.g)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 1030 && IS_COMPONENT_WHOLESOME (c.b))
1040 flags |= bgPixmap_t::tintWholesome; 1031 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME 1032# undef IS_COMPONENT_WHOLESOME
1042 } 1033 }
1043 1034
1044 if (has_shade) 1035 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 1036 flags |= bgPixmap_t::tintNeeded;
1046 else if (tint)
1047 {
1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1050 {
1051 flags |= bgPixmap_t::tintNeeded;
1052 }
1053 }
1054
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066 1037
1067 return flags; 1038 return flags;
1068} 1039}
1069 1040
1070bool 1041bool
… …
1080 1051
1081 return false; 1052 return false;
1082} 1053}
1083 1054
1084bool 1055bool
1085bgPixmap_t::unset_tint ()
1086{
1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1088
1089 if (new_flags != (flags & tintFlags))
1090 {
1091 flags = (flags & ~tintFlags) | new_flags;
1092 return true;
1093 }
1094
1095 return false;
1096}
1097
1098bool
1099bgPixmap_t::set_shade (const char *shade_str) 1056bgPixmap_t::set_shade (const char *shade_str)
1100{ 1057{
1101 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1058 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1102 1059
1103 clamp_it (new_shade, -100, 200); 1060 clamp_it (new_shade, -100, 200);
… …
1113 } 1070 }
1114 1071
1115 return false; 1072 return false;
1116} 1073}
1117 1074
1118#if XFT 1075#if XRENDER
1119static void 1076static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1077get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1078{
1122 double sigma = radius / 2.0; 1079 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1080 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1097
1141bool 1098bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1099bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1100{
1144 bool ret = false; 1101 bool ret = false;
1145#if XFT 1102#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1103 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1104 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1105 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1106
1150 Display *dpy = target->dpy; 1107 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1184 XFreeGC (dpy, gc);
1228 } 1185 }
1229 } 1186 }
1230 else 1187 else
1231 { 1188 {
1232# if XFT 1189# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1190 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1191
1235 if (flags & tintSet) 1192 if (flags & tintSet)
1236 tint.get (c); 1193 tint.get (c);
1237 1194
… …
1241 c.g = (c.g * shade) / 100; 1198 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100; 1199 c.b = (c.b * shade) / 100;
1243 } 1200 }
1244 else 1201 else
1245 { 1202 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1203 c.r = (c.r * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1204 c.g = (c.g * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1205 c.b = (c.b * (200 - shade)) / 100;
1249 } 1206 }
1250 1207
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1208 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1209 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa; 1210 XRenderPictureAttributes pa;
… …
1267 1224
1268 if (mask_pic && overlay_pic && back_pic) 1225 if (mask_pic && overlay_pic && back_pic)
1269 { 1226 {
1270 XRenderColor mask_c; 1227 XRenderColor mask_c;
1271 1228
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1229 mask_c.red = mask_c.green = mask_c.blue = 0;
1273 mask_c.alpha = 0xffff; 1230 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1231 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1232
1276 mask_c.alpha = 0; 1233 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1234 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g; 1235 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b; 1236 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1237 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 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
1282 ret = true; 1249 ret = true;
1283 } 1250 }
1284 1251
1285 XRenderFreePicture (dpy, mask_pic); 1252 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1253 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1254 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1255# endif
1292 } 1256 }
1293 1257
1294 return ret; 1258 return ret;
1295} 1259}
1296 1260
1297/* make_transparency_pixmap() 1261/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1262 * Builds a pixmap of the same size as the terminal window that contains
1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1263 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1264 * our window.
1301 */ 1265 */
1302unsigned long 1266unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1267bgPixmap_t::make_transparency_pixmap ()
1304{ 1268{
… …
1308 return 0; 1272 return 0;
1309 1273
1310 /* root dimensions may change from call to call - but Display structure should 1274 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1275 * be always up-to-date, so let's use it :
1312 */ 1276 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1277 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1278 Display *dpy = target->dpy;
1279 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1280 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1281 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1282 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1283 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1284 int window_height = target->szHint.height;
1321 int sx, sy; 1285 int sx, sy;
1322 XGCValues gcv; 1286 XGCValues gcv;
1323 GC gc; 1287 GC gc;
1324 1288
1325 TIMING_TEST_START (tp); 1289 sx = target_x;
1326 target->get_window_origin (sx, sy); 1290 sy = target_y;
1327 1291
1328 /* 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 : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1293 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1294 || sx >= root_width || sy >= root_height)
1331 return 0; 1295 return 0;
1332 1296
1297 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1298 if (root_pixmap != None)
1334 { 1299 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1300 Window wdummy;
1336 int junk; 1301 int idummy;
1337 unsigned int ujunk; 1302 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1303
1339 target->allowedxerror = -1; 1304 target->allowedxerror = -1;
1340 1305
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1306 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1307 root_pixmap = None;
1343 1308
1344 target->allowedxerror = 0; 1309 target->allowedxerror = 0;
1310 }
1311
1312 Pixmap recoded_root_pmap = root_pixmap;
1313
1314 if (root_pixmap != None && root_depth != target->depth)
1315 {
1316#if XRENDER
1317 if (flags & HAS_RENDER)
1318 {
1319 XRenderPictureAttributes pa;
1320
1321 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1322 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1323
1324 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1325 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1326 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1327
1328 if (src && dst)
1329 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1330 else
1331 {
1332 XFreePixmap (dpy, recoded_root_pmap);
1333 root_pixmap = None;
1334 }
1335
1336 XRenderFreePicture (dpy, src);
1337 XRenderFreePicture (dpy, dst);
1338 }
1339 else
1340#endif
1341 root_pixmap = None;
1345 } 1342 }
1346 1343
1347 if (root_pixmap == None) 1344 if (root_pixmap == None)
1348 return 0; 1345 return 0;
1349 1346
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1347 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
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 */
1356 gcv.tile = root_pixmap;
1357 gcv.fill_style = FillTiled;
1358
1359 while (sx < 0) sx += (int)root_width; 1353 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1354 while (sy < 0) sy += (int)root_height;
1361 1355
1356 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled;
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, root, 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 TIMING_TEST_PRINT_RESULT (tp);
1373 1367
1374 if (tiled_root_pmap != None)
1375 {
1376 if (!need_client_side_rendering ()) 1368 if (!need_client_side_rendering ())
1377 { 1369 {
1378 if (flags & (blurNeeded | blurServerSide)) 1370 if ((flags & blurNeeded)
1371 && (flags & HAS_RENDER_CONV))
1379 { 1372 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1373 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1374 result |= transpPmapBlurred;
1382 } 1375 }
1383 if (flags & (tintNeeded | tintServerSide)) 1376 if ((flags & tintNeeded)
1377 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1378 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1379 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1380 result |= transpPmapTinted;
1387 } 1381 }
1388 } /* server side rendering completed */ 1382 } /* server side rendering completed */
1389 1383
1390 if (pixmap) 1384 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1385 XFreePixmap (dpy, pixmap);
1392 1386
1393 pixmap = tiled_root_pmap; 1387 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1388 pmap_width = window_width;
1395 pmap_height = window_height; 1389 pmap_height = window_height;
1396 pmap_depth = root_depth; 1390 pmap_depth = target->depth;
1397 } 1391 }
1392 else
1393 XFreePixmap (dpy, tiled_root_pmap);
1398 1394
1399 TIMING_TEST_PRINT_RESULT (tp); 1395 if (recoded_root_pmap != root_pixmap)
1396 XFreePixmap (dpy, recoded_root_pmap);
1400 1397
1401 return result; 1398 return result;
1402} 1399}
1403 1400
1404bool 1401void
1405bgPixmap_t::set_root_pixmap () 1402bgPixmap_t::set_root_pixmap ()
1406{ 1403{
1407 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]);
1408 if (new_root_pixmap == None) 1405 if (new_root_pixmap == None)
1409 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]);
1410 1407
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1408 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1409}
1419# endif /* ENABLE_TRANSPARENCY */ 1410# endif /* ENABLE_TRANSPARENCY */
1420 1411
1421# ifndef HAVE_AFTERIMAGE 1412#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static 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);
1423# endif 1414# endif
1424 1415
1425bool 1416bool
1426bgPixmap_t::render () 1417bgPixmap_t::render ()
1427{ 1418{
1428 unsigned long background_flags = 0; 1419 unsigned long background_flags = 0;
1429 1420
1430 if (target == NULL) 1421 if (target == NULL)
1431 return false; 1422 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1423
1435 invalidate (); 1424 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1425# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1426 if (flags & isTransparent)
1438 { 1427 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1428 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1429 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1430 if (background_flags == 0)
1442 return false; 1431 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1432 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1433 flags &= ~isInvalid;
1446 } 1434 }
1447# endif 1435# endif
1448 1436
1449# ifdef BG_IMAGE_FROM_FILE 1437# ifdef BG_IMAGE_FROM_FILE
1450 if (have_image 1438 if (have_image
1451 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1439 || (background_flags & transpTransformations) != (flags & transpTransformations))
1452 { 1440 {
1453 if (render_image (background_flags)) 1441 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1442 flags &= ~isInvalid;
1455 } 1443 }
1456# endif 1444# endif
1457 1445
1446# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1447 XImage *result = NULL;
1459 1448
1460 if (background_flags && (flags & isInvalid)) 1449 if (background_flags && (flags & isInvalid))
1461 { 1450 {
1462 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);
1463 } 1452 }
1464 1453
1465 if (result) 1454 if (result)
1466 { 1455 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1456 /* our own client-side tinting */
1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1457 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1458 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1459 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1460 if (flags & tintSet)
1475 tint.get (c); 1461 tint.get (c);
1476 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);
1477 } 1463 }
1478# endif
1479 1464
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1466
1482 if (gc) 1467 if (gc)
1483 { 1468 {
1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1485 {
1486 XFreePixmap (target->dpy, pixmap);
1487 pixmap = None;
1488 }
1489
1490 if (pixmap == None)
1491 {
1492 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493 pmap_width = result->width;
1494 pmap_height = result->height;
1495 pmap_depth = target->depth;
1496 }
1497
1498 if (pmap_depth != result->depth)
1499 {
1500 /* Bad Match error will ensue ! stupid X !!!! */
1501 if (result->depth == 24 && pmap_depth == 32)
1502 result->depth = 32;
1503 else if (result->depth == 32 && pmap_depth == 24)
1504 result->depth = 24;
1505 else
1506 {
1507 /* TODO: implement image recoding */
1508 }
1509 }
1510
1511 if (pmap_depth == result->depth)
1512 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);
1513 1470
1514 XFreeGC (target->dpy, gc); 1471 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1472 flags &= ~isInvalid;
1516 } 1473 }
1517 1474
1518 XDestroyImage (result); 1475 XDestroyImage (result);
1519 } 1476 }
1477# endif
1520 1478
1521 if (flags & isInvalid) 1479 if (flags & isInvalid)
1522 { 1480 {
1523 if (pixmap != None) 1481 if (pixmap != None)
1524 { 1482 {
… …
1527 } 1485 }
1528 } 1486 }
1529 1487
1530 apply (); 1488 apply ();
1531 1489
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1490 valid_since = ev::now ();
1534 1491
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1492 return true;
1538} 1493}
1539 1494
1540bool 1495void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1496bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1497{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1498 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1499
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1500 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1501#if XRENDER
1502 int major, minor;
1503 if (XRenderQueryVersion (target->dpy, &major, &minor))
1504 flags |= HAS_RENDER;
1505 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1506 if (filters)
1507 {
1508 for (int i = 0; i < filters->nfilter; i++)
1509 if (!strcmp (filters->filter[i], FilterConvolution))
1510 flags |= HAS_RENDER_CONV;
1511
1512 XFree (filters);
1513 }
1549# endif 1514#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1515}
1555 1516
1556void 1517void
1557bgPixmap_t::apply () 1518bgPixmap_t::apply ()
1558{ 1519{
1559 if (target) 1520 if (target == NULL)
1560 { 1521 return;
1561 flags &= ~isVtOrigin;
1562 1522
1563 if (pixmap != None) 1523 if (pixmap != None)
1564 { 1524 {
1565 /* set target's background to pixmap */ 1525 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1526# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1527 if (flags & isTransparent)
1568 { 1528 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1529 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1530 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1531
1572 if (target->scrollBar.win) 1532 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1533 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1534 }
1575 else 1535 else
1576# endif 1536# endif
1577 { 1537 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1538 /* force old pixmap dereference in case it was transparent before :*/
1580 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582 /* do we also need to set scrollbar's background here ? */
1583
1584 if (target->scrollBar.win)
1585 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1586 }
1587 }
1588 else
1589 {
1590 /* set target background to a pixel */
1591 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1539 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1540 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1541 /* do we also need to set scrollbar's background here ? */
1542
1594 if (target->scrollBar.win) 1543 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1544 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 1545 }
1546 }
1547 else
1548 {
1549 /* set target background to a pixel */
1550 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1551 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1552 /* do we also need to set scrollbar's background here ? */
1553 if (target->scrollBar.win)
1554 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1555 }
1597 1556
1598 /* don't want Expose on the parent or vt. It is better to use 1557 /* don't want Expose on the parent or vt. It is better to use
1599 scr_touch or we get a great deal of flicker otherwise: */ 1558 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1559 XClearWindow (target->dpy, target->parent[0]);
1601 1560
1602 if (target->scrollBar.state && target->scrollBar.win) 1561 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1562 {
1604 target->scrollBar.state = STATE_IDLE; 1563 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1564 target->scrollBar.show (0);
1606 } 1565 }
1607 1566
1608 target->want_refresh = 1; 1567 target->want_refresh = 1;
1609 flags |= hasChanged; 1568 flags |= hasChanged;
1610 }
1611} 1569}
1612 1570
1613#endif /* HAVE_BG_PIXMAP */ 1571#endif /* HAVE_BG_PIXMAP */
1614 1572
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1573#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1574/* taken from aterm-0.4.2 */
1617 1575
1618typedef uint32_t RUINT32T;
1619
1620static void 1576static void
1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1577shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1622{ 1578{
1623 int sh_r, sh_g, sh_b; 1579 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1580 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1581 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1582 rgba low;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1583 rgba high;
1628 int i; 1584 int i;
1585 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1629 1586
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1587 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1631 1588
1632 /* for convenience */ 1589 /* for convenience */
1633 mask_r = visual->red_mask; 1590 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1591 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1592 mask_b = visual->blue_mask;
1636 1593
1637 /* boring lookup table pre-initialization */ 1594 /* boring lookup table pre-initialization */
1638 switch (srcImage->depth) 1595 switch (ximage->depth)
1639 { 1596 {
1640 case 15: 1597 case 15:
1641 if ((mask_r != 0x7c00) || 1598 if ((mask_r != 0x7c00) ||
1642 (mask_g != 0x03e0) || 1599 (mask_g != 0x03e0) ||
1643 (mask_b != 0x001f)) 1600 (mask_b != 0x001f))
1644 return; 1601 return;
1645 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1602 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1646 lookup_r = lookup; 1603 lookup_r = lookup;
1647 lookup_g = lookup+32; 1604 lookup_g = lookup+32;
1648 lookup_b = lookup+32+32; 1605 lookup_b = lookup+32+32;
1649 sh_r = 10; 1606 sh_r = 10;
1650 sh_g = 5; 1607 sh_g = 5;
… …
1653 case 16: 1610 case 16:
1654 if ((mask_r != 0xf800) || 1611 if ((mask_r != 0xf800) ||
1655 (mask_g != 0x07e0) || 1612 (mask_g != 0x07e0) ||
1656 (mask_b != 0x001f)) 1613 (mask_b != 0x001f))
1657 return; 1614 return;
1658 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1615 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1659 lookup_r = lookup; 1616 lookup_r = lookup;
1660 lookup_g = lookup+32; 1617 lookup_g = lookup+32;
1661 lookup_b = lookup+32+64; 1618 lookup_b = lookup+32+64;
1662 sh_r = 11; 1619 sh_r = 11;
1663 sh_g = 5; 1620 sh_g = 5;
… …
1666 case 24: 1623 case 24:
1667 if ((mask_r != 0xff0000) || 1624 if ((mask_r != 0xff0000) ||
1668 (mask_g != 0x00ff00) || 1625 (mask_g != 0x00ff00) ||
1669 (mask_b != 0x0000ff)) 1626 (mask_b != 0x0000ff))
1670 return; 1627 return;
1671 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1628 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1672 lookup_r = lookup; 1629 lookup_r = lookup;
1673 lookup_g = lookup+256; 1630 lookup_g = lookup+256;
1674 lookup_b = lookup+256+256; 1631 lookup_b = lookup+256+256;
1675 sh_r = 16; 1632 sh_r = 16;
1676 sh_g = 8; 1633 sh_g = 8;
… …
1679 case 32: 1636 case 32:
1680 if ((mask_r != 0xff0000) || 1637 if ((mask_r != 0xff0000) ||
1681 (mask_g != 0x00ff00) || 1638 (mask_g != 0x00ff00) ||
1682 (mask_b != 0x0000ff)) 1639 (mask_b != 0x0000ff))
1683 return; 1640 return;
1684 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1641 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1685 lookup_r = lookup; 1642 lookup_r = lookup;
1686 lookup_g = lookup+256; 1643 lookup_g = lookup+256;
1687 lookup_b = lookup+256+256; 1644 lookup_b = lookup+256+256;
1688 sh_r = 16; 1645 sh_r = 16;
1689 sh_g = 8; 1646 sh_g = 8;
… …
1696 /* prepare limits for color transformation (each channel is handled separately) */ 1653 /* prepare limits for color transformation (each channel is handled separately) */
1697 if (shade > 100) 1654 if (shade > 100)
1698 { 1655 {
1699 shade = 200 - shade; 1656 shade = 200 - shade;
1700 1657
1701 lower_lim_r = 65535-rm; 1658 high.r = c.r * shade / 100;
1702 lower_lim_g = 65535-gm; 1659 high.g = c.g * shade / 100;
1703 lower_lim_b = 65535-bm; 1660 high.b = c.b * shade / 100;
1704 1661
1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1662 low.r = 65535 * (100 - shade) / 100;
1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1663 low.g = 65535 * (100 - shade) / 100;
1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1664 low.b = 65535 * (100 - shade) / 100;
1708
1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 } 1665 }
1711 else 1666 else
1712 { 1667 {
1668 high.r = c.r * shade / 100;
1669 high.g = c.g * shade / 100;
1670 high.b = c.b * shade / 100;
1713 1671
1714 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1672 low.r = low.g = low.b = 0;
1715
1716 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1717 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1718 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1719 } 1673 }
1720 1674
1721 /* fill our lookup tables */ 1675 /* fill our lookup tables */
1722 for (i = 0; i <= mask_r>>sh_r; i++) 1676 for (i = 0; i <= mask_r>>sh_r; i++)
1723 { 1677 {
1724 RUINT32T tmp; 1678 uint32_t tmp;
1725 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1679 tmp = i * high.r;
1726 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1680 tmp += (mask_r>>sh_r) * low.r;
1727 lookup_r[i] = (tmp/65535)<<sh_r; 1681 lookup_r[i] = (tmp/65535)<<sh_r;
1728 } 1682 }
1729 for (i = 0; i <= mask_g>>sh_g; i++) 1683 for (i = 0; i <= mask_g>>sh_g; i++)
1730 { 1684 {
1731 RUINT32T tmp; 1685 uint32_t tmp;
1732 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1686 tmp = i * high.g;
1733 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1687 tmp += (mask_g>>sh_g) * low.g;
1734 lookup_g[i] = (tmp/65535)<<sh_g; 1688 lookup_g[i] = (tmp/65535)<<sh_g;
1735 } 1689 }
1736 for (i = 0; i <= mask_b>>sh_b; i++) 1690 for (i = 0; i <= mask_b>>sh_b; i++)
1737 { 1691 {
1738 RUINT32T tmp; 1692 uint32_t tmp;
1739 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1693 tmp = i * high.b;
1740 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1694 tmp += (mask_b>>sh_b) * low.b;
1741 lookup_b[i] = (tmp/65535)<<sh_b; 1695 lookup_b[i] = (tmp/65535)<<sh_b;
1742 } 1696 }
1743 1697
1744 /* apply table to input image (replacing colors by newly calculated ones) */ 1698 /* apply table to input image (replacing colors by newly calculated ones) */
1745 switch (srcImage->bits_per_pixel) 1699 if (ximage->bits_per_pixel == 32
1700 && (ximage->depth == 24 || ximage->depth == 32)
1701 && ximage->byte_order == host_byte_order)
1746 { 1702 {
1747 case 32:
1748 {
1749 RUINT32T *p1, *pf, *p, *pl; 1703 uint32_t *p1, *pf, *p, *pl;
1750 p1 = (RUINT32T *) srcImage->data; 1704 p1 = (uint32_t *) ximage->data;
1751 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1705 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1752 1706
1753 while (p1 < pf) 1707 while (p1 < pf)
1754 { 1708 {
1755 p = p1; 1709 p = p1;
1756 pl = p1 + srcImage->width; 1710 pl = p1 + ximage->width;
1757 for (; p < pl; p++) 1711 for (; p < pl; p++)
1758 { 1712 {
1759 *p = lookup_r[(*p & 0xff0000)>>16] | 1713 *p = lookup_r[(*p & 0xff0000) >> 16] |
1760 lookup_g[(*p & 0x00ff00)>> 8] | 1714 lookup_g[(*p & 0x00ff00) >> 8] |
1761 lookup_b[(*p & 0x0000ff)] | 1715 lookup_b[(*p & 0x0000ff)] |
1762 (*p & ~0xffffff); 1716 (*p & 0xff000000);
1763 }
1764 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1765 }
1766 break;
1767 }
1768 default:
1769 for (int y = 0; y < srcImage->height; y++)
1770 for (int x = 0; x < srcImage->width; x++)
1771 { 1717 }
1718 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1719 }
1720 }
1721 else
1722 {
1723 for (int y = 0; y < ximage->height; y++)
1724 for (int x = 0; x < ximage->width; x++)
1725 {
1772 unsigned long pixel = XGetPixel (srcImage, x, y); 1726 unsigned long pixel = XGetPixel (ximage, x, y);
1773 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1727 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1774 lookup_g[(pixel & mask_g) >> sh_g] | 1728 lookup_g[(pixel & mask_g) >> sh_g] |
1775 lookup_b[(pixel & mask_b) >> sh_b]; 1729 lookup_b[(pixel & mask_b) >> sh_b];
1776 XPutPixel (srcImage, x, y, pixel); 1730 XPutPixel (ximage, x, y, pixel);
1777 } 1731 }
1778 break;
1779 } 1732 }
1780 1733
1781 free (lookup); 1734 free (lookup);
1782} 1735}
1783#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1736#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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