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.84 by sf-exg, Sat Oct 16 20:25:06 2010 UTC vs.
Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC

… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
29#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
30 38
31#if DO_TIMING_TEST 39#if DO_TIMING_TEST
32# include <sys/time.h> 40# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
58 * 66 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 70 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 71 *
82 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 74 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
113#endif 103#endif
114 flags = 0; 104 flags = 0;
115 pixmap = None; 105 pixmap = None;
116 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
117 target = 0; 107 target = 0;
108 target_x = target_y = 0;
118} 109}
119 110
120void 111void
121bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
122{ 113{
… …
133 if (pixmap && target) 124 if (pixmap && target)
134 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
135} 126}
136 127
137bool 128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
140}
141
142bool
138bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
139{ 144{
140# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 146 if (flags & isTransparent)
142 return true; 147 return true;
… …
167 if (flags & rootAlign) 172 if (flags & rootAlign)
168 return true; 173 return true;
169 } 174 }
170# endif 175# endif
171 176
172 return false;
173};
174
175bool bgPixmap_t::need_client_side_rendering ()
176{
177# ifdef HAVE_AFTERIMAGE
178 if (original_asim)
179 return true;
180# endif
181 return false; 177 return false;
182} 178}
183 179
184# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
185static inline bool 181static inline bool
… …
222 int diff = window_size - image_size; 218 int diff = window_size - image_size;
223 int smaller = min (image_size, window_size); 219 int smaller = min (image_size, window_size);
224 220
225 if (align >= 0 && align <= 100) 221 if (align >= 0 && align <= 100)
226 return diff * align / 100; 222 return diff * align / 100;
227 else if (align > 100 && align <= 200 ) 223 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 224 return ((align - 100) * smaller / 100) + window_size - smaller;
229 else if (align >= -100 && align < 0) 225 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 226 return ((align + 100) * smaller / 100) - image_size;
231 return 0; 227 return 0;
232} 228}
… …
248 dst_size = target_size - dst_pos; 244 dst_size = target_size - dst_pos;
249 return src_pos; 245 return src_pos;
250} 246}
251 247
252bool 248bool
253bgPixmap_t::set_geometry (const char *geom) 249bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 250{
251 bool changed = false;
255 int geom_flags = 0, changed = 0; 252 int geom_flags = 0;
256 int x = 0, y = 0; 253 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 254 unsigned int w = 0, h = 0;
258 unsigned int n; 255 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 256 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 257 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 258
263 if (geom == NULL) 259 if (geom == NULL)
264 return false; 260 return false;
265 261
266 char str[MAXLEN_GEOM]; 262 char str[256];
267 263
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 264 ops = strchr (geom, ':');
271 265 if (ops == NULL)
266 n = strlen (geom);
267 else
272 n = (p - geom); 268 n = ops - geom;
273 if (n < MAXLEN_GEOM)
274 {
275 char *ops;
276 new_flags |= geometrySet;
277 269
270 if (n >= sizeof (str))
271 return false;
272
278 memcpy (str, geom, n); 273 memcpy (str, geom, n);
279 str[n] = '\0'; 274 str[n] = '\0';
280 if (str[0] == ':') 275 rxvt_strtrim (str);
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295 276
296 if (ops > str || ops == NULL) 277 if (str[0])
297 { 278 {
298 /* we have geometry string - let's handle it prior to applying ops */ 279 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 280 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 281 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 282
357 { 283 if (!update)
358 /* default geometry - scaled and centered */ 284 {
285 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 286 x = y = defaultAlign;
287 else if (!(geom_flags & YValue))
288 y = x;
289
290 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 291 w = h = defaultScale;
361 } 292 else if (!(geom_flags & HeightValue))
293 h = w;
294 else if (!(geom_flags & WidthValue))
295 w = h;
362 296
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
365 299
366 if (ops) 300 if (ops)
367 { 301 {
368 while (*ops) 302 char **arr = rxvt_strsplit (':', ops + 1);
303
304 for (int i = 0; arr[i]; i++)
369 { 305 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 306 if (!strcasecmp (arr[i], "tile"))
371
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile"))
374 { 307 {
375 w = h = noScale; 308 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 309 geom_flags |= WidthValue|HeightValue;
377 } 310 }
378 else if (CHECK_GEOM_OPS ("propscale")) 311 else if (!strcasecmp (arr[i], "propscale"))
379 { 312 {
380 new_flags |= propScale; 313 new_flags |= propScale;
381 } 314 }
382 else if (CHECK_GEOM_OPS ("hscale")) 315 else if (!strcasecmp (arr[i], "hscale"))
383 { 316 {
384 if (w == 0) w = windowScale; 317 if (w == 0) w = windowScale;
385 318
386 h = noScale; 319 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
388 } 321 }
389 else if (CHECK_GEOM_OPS ("vscale")) 322 else if (!strcasecmp (arr[i], "vscale"))
390 { 323 {
391 if (h == 0) h = windowScale; 324 if (h == 0) h = windowScale;
392 325
393 w = noScale; 326 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 327 geom_flags |= WidthValue|HeightValue;
395 } 328 }
396 else if (CHECK_GEOM_OPS ("scale")) 329 else if (!strcasecmp (arr[i], "scale"))
397 { 330 {
398 if (h == 0) h = windowScale; 331 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 332 if (w == 0) w = windowScale;
400 333
401 geom_flags |= WidthValue|HeightValue; 334 geom_flags |= WidthValue|HeightValue;
402 } 335 }
403 else if (CHECK_GEOM_OPS ("auto")) 336 else if (!strcasecmp (arr[i], "auto"))
404 { 337 {
405 w = h = windowScale; 338 w = h = windowScale;
406 x = y = centerAlign; 339 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 340 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 341 }
409 else if (CHECK_GEOM_OPS ("root")) 342 else if (!strcasecmp (arr[i], "root"))
410 { 343 {
411 new_flags |= rootAlign; 344 new_flags |= rootAlign;
412 w = h = noScale; 345 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 346 geom_flags |= WidthValue|HeightValue;
414 } 347 }
415# undef CHECK_GEOM_OPS
416
417 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 348 } /* done parsing ops */
419 }
420 349
350 rxvt_free_strsplit (arr);
351 }
352
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 353 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 354 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 355 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 356 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 357
427 if (new_flags != flags) 358 if (new_flags != flags)
428 { 359 {
429 flags = new_flags; 360 flags = new_flags;
430 changed++; 361 changed = true;
431 } 362 }
432 363
433 //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); 364 return changed;
436} 365}
437 366
438void 367void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 368bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{ 369{
… …
457 if (!w) w = image_width; 386 if (!w) w = image_width;
458 if (!h) h = image_height; 387 if (!h) h = image_height;
459 388
460 if (flags & rootAlign) 389 if (flags & rootAlign)
461 { 390 {
462 target->get_window_origin (x, y);
463 x = -x; 391 x = -target_x;
464 y = -y; 392 y = -target_y;
465 } 393 }
466 else 394 else
467 { 395 {
468 x = make_align_position (h_align, target_width, w); 396 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 397 y = make_align_position (v_align, target_height, h);
470 } 398 }
471 399
472 flags &= ~sizeSensitive; 400 flags &= ~sizeSensitive;
473 if (h_scale != 0 || v_scale != 0 401 if ((flags & propScale) || h_scale || v_scale
474 || h_align != 0 || v_align != 0 402 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height) 403 || w > target_width || h > target_height)
476 flags |= sizeSensitive; 404 flags |= sizeSensitive;
477} 405}
478 406
479# ifdef HAVE_AFTERIMAGE 407# ifdef HAVE_AFTERIMAGE
… …
529 457
530 int x = 0; 458 int x = 0;
531 int y = 0; 459 int y = 0;
532 int w = 0; 460 int w = 0;
533 int h = 0; 461 int h = 0;
534
535 TIMING_TEST_START (asim);
536 462
537 if (original_asim) 463 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 464 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 465
540 if (!original_asim 466 if (!original_asim
… …
657 } 583 }
658 584
659 free (layers); 585 free (layers);
660 } 586 }
661 } 587 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 588
664 bool ret = false; 589 bool ret = false;
665 590
666 if (result) 591 if (result)
667 { 592 {
668 XGCValues gcv; 593 XGCValues gcv;
669 GC gc; 594 GC gc;
670 595
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 */ 596 /* create Pixmap */
683 if (pixmap == None) 597 if (pixmap == None
598 || pmap_width != new_pmap_width
599 || pmap_height != new_pmap_height)
684 { 600 {
601 if (pixmap)
602 XFreePixmap (target->dpy, pixmap);
685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 603 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
686 pmap_width = new_pmap_width; 604 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 605 pmap_height = new_pmap_height;
688 pmap_depth = target->depth;
689 } 606 }
690 /* fill with background color (if result's not completely overlapping it) */ 607 /* fill with background color (if result's not completely overlapping it) */
691 gcv.foreground = target->pix_colors[Color_bg]; 608 gcv.foreground = target->pix_colors[Color_bg];
692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 609 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
693 610
… …
713 630
714 if (result != background && result != original_asim) 631 if (result != background && result != original_asim)
715 destroy_asimage (&result); 632 destroy_asimage (&result);
716 633
717 XFreeGC (target->dpy, gc); 634 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 635
720 ret = true; 636 ret = true;
721 } 637 }
722 638
723 if (background) 639 if (background)
… …
727} 643}
728# endif /* HAVE_AFTERIMAGE */ 644# endif /* HAVE_AFTERIMAGE */
729 645
730# ifdef HAVE_PIXBUF 646# ifdef HAVE_PIXBUF
731bool 647bool
648bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
649 int src_x, int src_y, int dst_x, int dst_y,
650 unsigned int width, unsigned int height)
651{
652 XImage *ximage;
653 char *data, *line;
654 int bytes_per_pixel;
655 int width_r, width_g, width_b;
656 int sh_r, sh_g, sh_b;
657 int rowstride;
658 int channels;
659 unsigned char *row;
660 Visual *visual = target->visual;
661 int depth = target->depth;
662
663 if (visual->c_class != TrueColor)
664 return false;
665
666 if (depth == 24 || depth == 32)
667 bytes_per_pixel = 4;
668 else if (depth == 15 || depth == 16)
669 bytes_per_pixel = 2;
670 else
671 return false;
672
673 width_r = rxvt_popcount (visual->red_mask);
674 width_g = rxvt_popcount (visual->green_mask);
675 width_b = rxvt_popcount (visual->blue_mask);
676
677 if (width_r > 8 || width_g > 8 || width_b > 8)
678 return false;
679
680 sh_r = rxvt_ctz (visual->red_mask);
681 sh_g = rxvt_ctz (visual->green_mask);
682 sh_b = rxvt_ctz (visual->blue_mask);
683
684 if (width > INT_MAX / height / bytes_per_pixel)
685 return false;
686
687 data = (char *)malloc (width * height * bytes_per_pixel);
688 if (!data)
689 return false;
690
691 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
692 width, height, bytes_per_pixel * 8, 0);
693 if (!ximage)
694 {
695 free (data);
696 return false;
697 }
698
699 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
700
701 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
702 channels = gdk_pixbuf_get_n_channels (pixbuf);
703 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
704 line = data;
705
706 for (int y = 0; y < height; y++)
707 {
708 for (int x = 0; x < width; x++)
709 {
710 unsigned char *pixel = row + x * channels;
711 uint32_t value;
712
713 value = ((pixel[0] >> (8 - width_r)) << sh_r)
714 | ((pixel[1] >> (8 - width_g)) << sh_g)
715 | ((pixel[2] >> (8 - width_b)) << sh_b);
716
717 if (bytes_per_pixel == 4)
718 ((uint32_t *)line)[x] = value;
719 else
720 ((uint16_t *)line)[x] = value;
721 }
722
723 row += rowstride;
724 line += ximage->bytes_per_line;
725 }
726
727 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
728 XDestroyImage (ximage);
729 return true;
730}
731
732bool
732bgPixmap_t::render_image (unsigned long background_flags) 733bgPixmap_t::render_image (unsigned long background_flags)
733{ 734{
734 if (target == NULL) 735 if (target == NULL)
735 return false; 736 return false;
736 737
737 if (!pixbuf) 738 if (!pixbuf)
738 return false; 739 return false;
739 740
740#if !XFT
741 if (background_flags) 741 if (background_flags
742 && !(flags & HAS_RENDER))
742 return false; 743 return false;
743#endif
744 744
745 GdkPixbuf *result; 745 GdkPixbuf *result;
746 746
747 int image_width = gdk_pixbuf_get_width (pixbuf); 747 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 748 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 } 801 }
802 } 802 }
803 803
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) 804 if (pixmap == None
805 || pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height)
816 { 807 {
808 if (pixmap)
809 XFreePixmap (target->dpy, pixmap);
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width; 811 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 812 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 } 813 }
822 814
823 gcv.foreground = target->pix_colors[Color_bg]; 815 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 816 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825 817
826 if (h_scale == 0 || v_scale == 0) 818 if (h_scale == 0 || v_scale == 0)
827 { 819 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 820 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 821 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 822 0, 0,
831 0, 0, 823 0, 0,
832 image_width, image_height, 824 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 825
836 gcv.tile = tile; 826 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 827 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 828 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 829 gcv.ts_y_origin = y;
… …
854 || dst_x + dst_width < new_pmap_width 844 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 845 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857 847
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 849 pixbuf_to_pixmap (result, pixmap, gc,
860 src_x, src_y, 850 src_x, src_y,
861 dst_x, dst_y, 851 dst_x, dst_y,
862 dst_width, dst_height, 852 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 } 853 }
866 854
867#if XFT 855#if XRENDER
868 if (background_flags) 856 if (background_flags)
869 { 857 {
870 Display *dpy = target->dpy; 858 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 859 XRenderPictureAttributes pa;
872 860
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 861 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 862 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 863
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 864 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 865 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 866
… …
915# endif /* HAVE_PIXBUF */ 903# endif /* HAVE_PIXBUF */
916 904
917bool 905bool
918bgPixmap_t::set_file (const char *file) 906bgPixmap_t::set_file (const char *file)
919{ 907{
920 assert (file); 908 if (!file || !*file)
909 return false;
921 910
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 911 if (const char *p = strchr (file, ';'))
925 { 912 {
926 size_t len = p - file; 913 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 914 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 915 memcpy (f, file, len);
929 f[len] = '\0'; 916 f[len] = '\0';
930 file = f; 917 file = f;
931 } 918 }
932 919
933# ifdef HAVE_AFTERIMAGE 920# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 921 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 922 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 923 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 924 if (image)
938 { 925 {
939 if (original_asim) 926 if (original_asim)
940 safe_asimage_destroy (original_asim); 927 safe_asimage_destroy (original_asim);
941 original_asim = image; 928 original_asim = image;
929 flags |= CLIENT_RENDER;
942 have_image = true; 930 have_image = true;
943 return true; 931 return true;
944 } 932 }
945# endif 933# endif
946 934
947# ifdef HAVE_PIXBUF 935# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 936 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 937 if (image)
950 { 938 {
951 if (pixbuf) 939 if (pixbuf)
952 g_object_unref (pixbuf); 940 g_object_unref (pixbuf);
953 pixbuf = image; 941 pixbuf = image;
954 have_image = true; 942 have_image = true;
955 return true; 943 return true;
956 } 944 }
957# endif 945# endif
958 }
959 946
960 return false; 947 return false;
961} 948}
962 949
963# endif /* BG_IMAGE_FROM_FILE */ 950# endif /* BG_IMAGE_FROM_FILE */
… …
976} 963}
977 964
978bool 965bool
979bgPixmap_t::set_blur_radius (const char *geom) 966bgPixmap_t::set_blur_radius (const char *geom)
980{ 967{
981 int changed = 0; 968 bool changed = false;
982 unsigned int hr, vr; 969 unsigned int hr, vr;
983 int junk; 970 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 971 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 972
986 if (!(geom_flags & WidthValue)) 973 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 978 min_it (hr, 128);
992 min_it (vr, 128); 979 min_it (vr, 128);
993 980
994 if (h_blurRadius != hr) 981 if (h_blurRadius != hr)
995 { 982 {
996 ++changed; 983 changed = true;
997 h_blurRadius = hr; 984 h_blurRadius = hr;
998 } 985 }
999 986
1000 if (v_blurRadius != vr) 987 if (v_blurRadius != vr)
1001 { 988 {
1002 ++changed; 989 changed = true;
1003 v_blurRadius = vr; 990 v_blurRadius = vr;
1004 } 991 }
1005 992
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 993 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 994 flags &= ~blurNeeded;
1008 else 995 else
1009 flags |= blurNeeded; 996 flags |= blurNeeded;
1010 997
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); 998 return changed;
1024} 999}
1025 1000
1026static inline unsigned long 1001static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 1002compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1003{
… …
1031 bool has_shade = shade != 100; 1006 bool has_shade = shade != 100;
1032 1007
1033 if (tint) 1008 if (tint)
1034 { 1009 {
1035 tint->get (c); 1010 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1011 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1012 && (c.r <= 0x00ff || c.r >= 0xff00)
1038 && IS_COMPONENT_WHOLESOME (c.g) 1013 && (c.g <= 0x00ff || c.g >= 0xff00)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 1014 && (c.b <= 0x00ff || c.b >= 0xff00))
1040 flags |= bgPixmap_t::tintWholesome; 1015 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME
1042 } 1016 }
1043 1017
1044 if (has_shade) 1018 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 1019 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 1020
1067 return flags; 1021 return flags;
1068} 1022}
1069 1023
1070bool 1024bool
… …
1080 1034
1081 return false; 1035 return false;
1082} 1036}
1083 1037
1084bool 1038bool
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) 1039bgPixmap_t::set_shade (const char *shade_str)
1100{ 1040{
1101 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1041 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1102 1042
1103 clamp_it (new_shade, -100, 200); 1043 clamp_it (new_shade, -100, 200);
… …
1113 } 1053 }
1114 1054
1115 return false; 1055 return false;
1116} 1056}
1117 1057
1118#if XFT 1058#if XRENDER
1119static void 1059static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1060get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1061{
1122 double sigma = radius / 2.0; 1062 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1063 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0; 1064 double sum = 0.0;
1125 1065
1126 for (int i = 0; i < width; i++) 1066 for (int i = 0; i < width; i++)
1127 { 1067 {
1128 double x = i - width / 2; 1068 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1069 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i]; 1070 sum += kernel[i];
1131 } 1071 }
1132 1072
1133 params[0] = XDoubleToFixed (width); 1073 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1); 1074 params[1] = XDoubleToFixed (1);
1135 1075
1136 for (int i = 0; i < width; i++) 1076 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1077 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138} 1078}
1139#endif 1079#endif
1140 1080
1141bool 1081bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1082bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1083{
1144 bool ret = false; 1084 bool ret = false;
1145#if XFT 1085#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1086 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1087 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1088 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1089
1150 Display *dpy = target->dpy; 1090 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa; 1091 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1092 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153 1093
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1094 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1095 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156 1096
1157 if (kernel && params && src && dst) 1097 if (kernel && params && src && dst)
… …
1227 XFreeGC (dpy, gc); 1167 XFreeGC (dpy, gc);
1228 } 1168 }
1229 } 1169 }
1230 else 1170 else
1231 { 1171 {
1232# if XFT 1172# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1173 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1174
1235 if (flags & tintSet) 1175 if (flags & tintSet)
1236 tint.get (c); 1176 tint.get (c);
1237 1177
… …
1241 c.g = (c.g * shade) / 100; 1181 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100; 1182 c.b = (c.b * shade) / 100;
1243 } 1183 }
1244 else 1184 else
1245 { 1185 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1186 c.r = (c.r * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1187 c.g = (c.g * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1188 c.b = (c.b * (200 - shade)) / 100;
1249 } 1189 }
1250 1190
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1191 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1192 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa; 1193 XRenderPictureAttributes pa;
… …
1267 1207
1268 if (mask_pic && overlay_pic && back_pic) 1208 if (mask_pic && overlay_pic && back_pic)
1269 { 1209 {
1270 XRenderColor mask_c; 1210 XRenderColor mask_c;
1271 1211
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1212 mask_c.red = mask_c.green = mask_c.blue = 0;
1273 mask_c.alpha = 0xffff; 1213 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1214 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1215
1276 mask_c.alpha = 0; 1216 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1217 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g; 1218 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b; 1219 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1220 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); 1221 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1222
1223 if (shade > 100)
1224 {
1225 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1226 mask_c.alpha = 0;
1227 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1228
1229 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1230 }
1231
1282 ret = true; 1232 ret = true;
1283 } 1233 }
1284 1234
1285 XRenderFreePicture (dpy, mask_pic); 1235 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1236 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1237 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1238# endif
1292 } 1239 }
1293 1240
1294 return ret; 1241 return ret;
1295} 1242}
1296 1243
1297/* make_transparency_pixmap() 1244/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1245 * 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 1246 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1247 * our window.
1301 */ 1248 */
1302unsigned long 1249unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1250bgPixmap_t::make_transparency_pixmap ()
1304{ 1251{
… …
1308 return 0; 1255 return 0;
1309 1256
1310 /* root dimensions may change from call to call - but Display structure should 1257 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1258 * be always up-to-date, so let's use it :
1312 */ 1259 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1260 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1261 Display *dpy = target->dpy;
1262 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1263 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1264 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1265 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1266 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1267 int window_height = target->szHint.height;
1321 int sx, sy; 1268 int sx, sy;
1322 XGCValues gcv; 1269 XGCValues gcv;
1323 GC gc; 1270 GC gc;
1324 1271
1325 TIMING_TEST_START (tp); 1272 sx = target_x;
1326 target->get_window_origin (sx, sy); 1273 sy = target_y;
1327 1274
1328 /* check if we are outside of the visible part of the virtual screen : */ 1275 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1276 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1277 || sx >= root_width || sy >= root_height)
1331 return 0; 1278 return 0;
1332 1279
1280 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1281 if (root_pixmap != None)
1334 { 1282 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1283 Window wdummy;
1336 int junk; 1284 int idummy;
1337 unsigned int ujunk; 1285 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1286
1339 target->allowedxerror = -1; 1287 target->allowedxerror = -1;
1340 1288
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1289 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1290 root_pixmap = None;
1343 1291
1344 target->allowedxerror = 0; 1292 target->allowedxerror = 0;
1293 }
1294
1295 Pixmap recoded_root_pmap = root_pixmap;
1296
1297 if (root_pixmap != None && root_depth != target->depth)
1298 {
1299#if XRENDER
1300 if (flags & HAS_RENDER)
1301 {
1302 XRenderPictureAttributes pa;
1303
1304 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1305 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1306
1307 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1308 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1309 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1310
1311 if (src && dst)
1312 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1313 else
1314 {
1315 XFreePixmap (dpy, recoded_root_pmap);
1316 root_pixmap = None;
1317 }
1318
1319 XRenderFreePicture (dpy, src);
1320 XRenderFreePicture (dpy, dst);
1321 }
1322 else
1323#endif
1324 root_pixmap = None;
1345 } 1325 }
1346 1326
1347 if (root_pixmap == None) 1327 if (root_pixmap == None)
1348 return 0; 1328 return 0;
1349 1329
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1330 if (pixmap == None
1331 || pmap_width != window_width
1332 || pmap_height != window_height)
1333 {
1334 if (pixmap)
1335 XFreePixmap (target->dpy, pixmap);
1336 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1337 pmap_width = window_width;
1338 pmap_height = window_height;
1339 }
1351 1340
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (pixmap == None)
1353 return 0; 1342 return 0;
1354 1343
1355 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap;
1357 gcv.fill_style = FillTiled;
1358
1359 while (sx < 0) sx += (int)root_width; 1345 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1346 while (sy < 0) sy += (int)root_height;
1361 1347
1348 gcv.tile = recoded_root_pmap;
1349 gcv.fill_style = FillTiled;
1362 gcv.ts_x_origin = -sx; 1350 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1353
1366 if (gc) 1354 if (gc)
1367 { 1355 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1359
1374 if (tiled_root_pmap != None) 1360 if (!(flags & CLIENT_RENDER))
1375 {
1376 if (!need_client_side_rendering ())
1377 {
1378 if (flags & (blurNeeded | blurServerSide))
1379 { 1361 {
1362 if ((flags & blurNeeded)
1363 && (flags & HAS_RENDER_CONV))
1364 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1365 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1366 result |= transpPmapBlurred;
1382 } 1367 }
1383 if (flags & (tintNeeded | tintServerSide)) 1368 if ((flags & tintNeeded)
1369 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1370 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1371 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1372 result |= transpPmapTinted;
1387 } 1373 }
1388 } /* server side rendering completed */ 1374 } /* server side rendering completed */
1389
1390 if (pixmap)
1391 XFreePixmap (dpy, pixmap);
1392
1393 pixmap = tiled_root_pmap;
1394 pmap_width = window_width;
1395 pmap_height = window_height;
1396 pmap_depth = root_depth;
1397 } 1375 }
1398 1376
1399 TIMING_TEST_PRINT_RESULT (tp); 1377 if (recoded_root_pmap != root_pixmap)
1378 XFreePixmap (dpy, recoded_root_pmap);
1400 1379
1401 return result; 1380 return result;
1402} 1381}
1403 1382
1404bool 1383void
1405bgPixmap_t::set_root_pixmap () 1384bgPixmap_t::set_root_pixmap ()
1406{ 1385{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1386 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1408 if (new_root_pixmap == None) 1387 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1388 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1410 1389
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1390 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1391}
1419# endif /* ENABLE_TRANSPARENCY */ 1392# endif /* ENABLE_TRANSPARENCY */
1420 1393
1421# ifndef HAVE_AFTERIMAGE 1394#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1395static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1423# endif 1396# endif
1424 1397
1425bool 1398bool
1426bgPixmap_t::render () 1399bgPixmap_t::render ()
1427{ 1400{
1428 unsigned long background_flags = 0; 1401 unsigned long background_flags = 0;
1429 1402
1430 if (target == NULL) 1403 if (target == NULL)
1431 return false; 1404 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1405
1435 invalidate (); 1406 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1407# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1408 if (flags & isTransparent)
1438 { 1409 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1410 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1411 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1412 if (background_flags == 0)
1442 return false; 1413 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1414 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1415 flags &= ~isInvalid;
1446 } 1416 }
1447# endif 1417# endif
1448 1418
1449# ifdef BG_IMAGE_FROM_FILE 1419# ifdef BG_IMAGE_FROM_FILE
1450 if (have_image 1420 if (have_image
1451 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1421 || (background_flags & transpTransformations) != (flags & transpTransformations))
1452 { 1422 {
1453 if (render_image (background_flags)) 1423 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1424 flags &= ~isInvalid;
1455 } 1425 }
1456# endif 1426# endif
1457 1427
1428# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1429 XImage *result = NULL;
1459 1430
1460 if (background_flags && (flags & isInvalid)) 1431 if (background_flags && (flags & isInvalid))
1461 { 1432 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1433 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1434 }
1464 1435
1465 if (result) 1436 if (result)
1466 { 1437 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1438 /* 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)) 1439 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1440 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1441 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1442 if (flags & tintSet)
1475 tint.get (c); 1443 tint.get (c);
1476 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1444 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1477 } 1445 }
1478# endif
1479 1446
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1447 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1448
1482 if (gc) 1449 if (gc)
1483 { 1450 {
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); 1451 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1452
1514 XFreeGC (target->dpy, gc); 1453 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1454 flags &= ~isInvalid;
1516 } 1455 }
1517 1456
1518 XDestroyImage (result); 1457 XDestroyImage (result);
1519 } 1458 }
1459# endif
1520 1460
1521 if (flags & isInvalid) 1461 if (flags & isInvalid)
1522 { 1462 {
1523 if (pixmap != None) 1463 if (pixmap != None)
1524 { 1464 {
… …
1527 } 1467 }
1528 } 1468 }
1529 1469
1530 apply (); 1470 apply ();
1531 1471
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1472 valid_since = ev::now ();
1534 1473
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1474 return true;
1538} 1475}
1539 1476
1540bool 1477void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1478bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1479{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1480 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1481
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1482 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1483#if XRENDER
1484 int major, minor;
1485 if (XRenderQueryVersion (target->dpy, &major, &minor))
1486 flags |= HAS_RENDER;
1487 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1488 if (filters)
1489 {
1490 for (int i = 0; i < filters->nfilter; i++)
1491 if (!strcmp (filters->filter[i], FilterConvolution))
1492 flags |= HAS_RENDER_CONV;
1493
1494 XFree (filters);
1495 }
1549# endif 1496#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1497}
1555 1498
1556void 1499void
1557bgPixmap_t::apply () 1500bgPixmap_t::apply ()
1558{ 1501{
1559 if (target) 1502 if (target == NULL)
1560 { 1503 return;
1561 flags &= ~isVtOrigin;
1562 1504
1563 if (pixmap != None) 1505 if (pixmap != None)
1564 { 1506 {
1565 /* set target's background to pixmap */ 1507 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1508# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1509 if (flags & isTransparent)
1568 { 1510 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1511 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1512 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1513
1572 if (target->scrollBar.win) 1514 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1515 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1516 }
1575 else 1517 else
1576# endif 1518# endif
1577 { 1519 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1520 /* 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]); 1521 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1522 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1523 /* do we also need to set scrollbar's background here ? */
1524
1594 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1526 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 1527 }
1528 }
1529 else
1530 {
1531 /* set target background to a pixel */
1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1533 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1534 /* do we also need to set scrollbar's background here ? */
1535 if (target->scrollBar.win)
1536 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1537 }
1597 1538
1598 /* don't want Expose on the parent or vt. It is better to use 1539 /* 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: */ 1540 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1541 XClearWindow (target->dpy, target->parent[0]);
1601 1542
1602 if (target->scrollBar.state && target->scrollBar.win) 1543 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1544 {
1604 target->scrollBar.state = STATE_IDLE; 1545 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1546 target->scrollBar.show (0);
1606 } 1547 }
1607 1548
1608 target->want_refresh = 1; 1549 target->want_refresh = 1;
1609 flags |= hasChanged; 1550 flags |= hasChanged;
1610 }
1611} 1551}
1612 1552
1613#endif /* HAVE_BG_PIXMAP */ 1553#endif /* HAVE_BG_PIXMAP */
1614 1554
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1555#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1556/* taken from aterm-0.4.2 */
1617 1557
1618typedef uint32_t RUINT32T;
1619
1620static void 1558static void
1621ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1559shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1622{ 1560{
1623 int sh_r, sh_g, sh_b; 1561 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1562 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1563 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1564 rgba low;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1565 rgba high;
1628 int i; 1566 int i;
1567 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1629 1568
1630 Visual *visual = term->visual;
1631
1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1569 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1633 1570
1634 /* for convenience */ 1571 /* for convenience */
1635 mask_r = visual->red_mask; 1572 mask_r = visual->red_mask;
1636 mask_g = visual->green_mask; 1573 mask_g = visual->green_mask;
1637 mask_b = visual->blue_mask; 1574 mask_b = visual->blue_mask;
1638 1575
1639 /* boring lookup table pre-initialization */ 1576 /* boring lookup table pre-initialization */
1640 switch (srcImage->bits_per_pixel) { 1577 switch (ximage->depth)
1578 {
1641 case 15: 1579 case 15:
1642 if ((mask_r != 0x7c00) || 1580 if ((mask_r != 0x7c00) ||
1643 (mask_g != 0x03e0) || 1581 (mask_g != 0x03e0) ||
1644 (mask_b != 0x001f)) 1582 (mask_b != 0x001f))
1645 return; 1583 return;
1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1584 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1647 lookup_r = lookup; 1585 lookup_r = lookup;
1648 lookup_g = lookup+32; 1586 lookup_g = lookup+32;
1649 lookup_b = lookup+32+32; 1587 lookup_b = lookup+32+32;
1650 sh_r = 10; 1588 sh_r = 10;
1651 sh_g = 5; 1589 sh_g = 5;
1652 sh_b = 0; 1590 sh_b = 0;
1653 break; 1591 break;
1654 case 16: 1592 case 16:
1655 if ((mask_r != 0xf800) || 1593 if ((mask_r != 0xf800) ||
1656 (mask_g != 0x07e0) || 1594 (mask_g != 0x07e0) ||
1657 (mask_b != 0x001f)) 1595 (mask_b != 0x001f))
1658 return; 1596 return;
1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1597 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1660 lookup_r = lookup; 1598 lookup_r = lookup;
1661 lookup_g = lookup+32; 1599 lookup_g = lookup+32;
1662 lookup_b = lookup+32+64; 1600 lookup_b = lookup+32+64;
1663 sh_r = 11; 1601 sh_r = 11;
1664 sh_g = 5; 1602 sh_g = 5;
1665 sh_b = 0; 1603 sh_b = 0;
1666 break; 1604 break;
1667 case 24: 1605 case 24:
1668 if ((mask_r != 0xff0000) || 1606 if ((mask_r != 0xff0000) ||
1669 (mask_g != 0x00ff00) || 1607 (mask_g != 0x00ff00) ||
1670 (mask_b != 0x0000ff)) 1608 (mask_b != 0x0000ff))
1671 return; 1609 return;
1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1610 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1673 lookup_r = lookup; 1611 lookup_r = lookup;
1674 lookup_g = lookup+256; 1612 lookup_g = lookup+256;
1675 lookup_b = lookup+256+256; 1613 lookup_b = lookup+256+256;
1676 sh_r = 16; 1614 sh_r = 16;
1677 sh_g = 8; 1615 sh_g = 8;
1678 sh_b = 0; 1616 sh_b = 0;
1679 break; 1617 break;
1680 case 32: 1618 case 32:
1681 if ((mask_r != 0xff0000) || 1619 if ((mask_r != 0xff0000) ||
1682 (mask_g != 0x00ff00) || 1620 (mask_g != 0x00ff00) ||
1683 (mask_b != 0x0000ff)) 1621 (mask_b != 0x0000ff))
1684 return; 1622 return;
1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1623 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1686 lookup_r = lookup; 1624 lookup_r = lookup;
1687 lookup_g = lookup+256; 1625 lookup_g = lookup+256;
1688 lookup_b = lookup+256+256; 1626 lookup_b = lookup+256+256;
1689 sh_r = 16; 1627 sh_r = 16;
1690 sh_g = 8; 1628 sh_g = 8;
1691 sh_b = 0; 1629 sh_b = 0;
1692 break; 1630 break;
1693 default: 1631 default:
1694 return; /* we do not support this color depth */ 1632 return; /* we do not support this color depth */
1695 } 1633 }
1696 1634
1697 /* prepare limits for color transformation (each channel is handled separately) */ 1635 /* prepare limits for color transformation (each channel is handled separately) */
1698 if (shade > 100) { 1636 if (shade > 100)
1637 {
1699 shade = 200 - shade; 1638 shade = 200 - shade;
1700 1639
1701 lower_lim_r = 65535-rm; 1640 high.r = c.r * shade / 100;
1702 lower_lim_g = 65535-gm; 1641 high.g = c.g * shade / 100;
1703 lower_lim_b = 65535-bm; 1642 high.b = c.b * shade / 100;
1704 1643
1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1644 low.r = 65535 * (100 - shade) / 100;
1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1645 low.g = 65535 * (100 - shade) / 100;
1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1646 low.b = 65535 * (100 - shade) / 100;
1708
1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 } else {
1711
1712 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1713
1714 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1715 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1716 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1717 } 1647 }
1718 1648 else
1719 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1720 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1721 { 1649 {
1722 unsigned int tmp; 1650 high.r = c.r * shade / 100;
1651 high.g = c.g * shade / 100;
1652 high.b = c.b * shade / 100;
1723 1653
1724 tmp = lower_lim_r; 1654 low.r = low.g = low.b = 0;
1725 lower_lim_r = lower_lim_b;
1726 lower_lim_b = tmp;
1727
1728 tmp = upper_lim_r;
1729 upper_lim_r = upper_lim_b;
1730 upper_lim_b = tmp;
1731 } 1655 }
1732 1656
1733 /* fill our lookup tables */ 1657 /* fill our lookup tables */
1734 for (i = 0; i <= mask_r>>sh_r; i++) 1658 for (i = 0; i <= mask_r>>sh_r; i++)
1735 { 1659 {
1736 RUINT32T tmp; 1660 uint32_t tmp;
1737 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1661 tmp = i * high.r;
1738 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1662 tmp += (mask_r>>sh_r) * low.r;
1739 lookup_r[i] = (tmp/65535)<<sh_r; 1663 lookup_r[i] = (tmp/65535)<<sh_r;
1740 } 1664 }
1741 for (i = 0; i <= mask_g>>sh_g; i++) 1665 for (i = 0; i <= mask_g>>sh_g; i++)
1742 { 1666 {
1743 RUINT32T tmp; 1667 uint32_t tmp;
1744 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1668 tmp = i * high.g;
1745 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1669 tmp += (mask_g>>sh_g) * low.g;
1746 lookup_g[i] = (tmp/65535)<<sh_g; 1670 lookup_g[i] = (tmp/65535)<<sh_g;
1747 } 1671 }
1748 for (i = 0; i <= mask_b>>sh_b; i++) 1672 for (i = 0; i <= mask_b>>sh_b; i++)
1749 { 1673 {
1750 RUINT32T tmp; 1674 uint32_t tmp;
1751 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1675 tmp = i * high.b;
1752 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1676 tmp += (mask_b>>sh_b) * low.b;
1753 lookup_b[i] = (tmp/65535)<<sh_b; 1677 lookup_b[i] = (tmp/65535)<<sh_b;
1754 } 1678 }
1755 1679
1756 /* apply table to input image (replacing colors by newly calculated ones) */ 1680 /* apply table to input image (replacing colors by newly calculated ones) */
1757 switch (srcImage->bits_per_pixel) 1681 if (ximage->bits_per_pixel == 32
1682 && (ximage->depth == 24 || ximage->depth == 32)
1683 && ximage->byte_order == host_byte_order)
1758 { 1684 {
1759 case 15:
1760 {
1761 unsigned short *p1, *pf, *p, *pl; 1685 uint32_t *p1, *pf, *p, *pl;
1762 p1 = (unsigned short *) srcImage->data; 1686 p1 = (uint32_t *) ximage->data;
1763 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1687 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1688
1764 while (p1 < pf) 1689 while (p1 < pf)
1765 { 1690 {
1766 p = p1; 1691 p = p1;
1767 pl = p1 + srcImage->width; 1692 pl = p1 + ximage->width;
1768 for (; p < pl; p++) 1693 for (; p < pl; p++)
1769 { 1694 {
1770 *p = lookup_r[(*p & 0x7c00)>>10] |
1771 lookup_g[(*p & 0x03e0)>> 5] |
1772 lookup_b[(*p & 0x001f)];
1773 }
1774 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1775 }
1776 break;
1777 }
1778 case 16:
1779 {
1780 unsigned short *p1, *pf, *p, *pl;
1781 p1 = (unsigned short *) srcImage->data;
1782 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1783 while (p1 < pf)
1784 {
1785 p = p1;
1786 pl = p1 + srcImage->width;
1787 for (; p < pl; p++)
1788 {
1789 *p = lookup_r[(*p & 0xf800)>>11] |
1790 lookup_g[(*p & 0x07e0)>> 5] |
1791 lookup_b[(*p & 0x001f)];
1792 }
1793 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1794 }
1795 break;
1796 }
1797 case 24:
1798 {
1799 unsigned char *p1, *pf, *p, *pl;
1800 p1 = (unsigned char *) srcImage->data;
1801 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1802 while (p1 < pf)
1803 {
1804 p = p1;
1805 pl = p1 + srcImage->width * 3;
1806 for (; p < pl; p += 3)
1807 {
1808 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1809 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1810 p[2] = lookup_r[(p[2] & 0x0000ff)];
1811 }
1812 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1813 }
1814 break;
1815 }
1816 case 32:
1817 {
1818 RUINT32T *p1, *pf, *p, *pl;
1819 p1 = (RUINT32T *) srcImage->data;
1820 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1821
1822 while (p1 < pf)
1823 {
1824 p = p1;
1825 pl = p1 + srcImage->width;
1826 for (; p < pl; p++)
1827 {
1828 *p = lookup_r[(*p & 0xff0000)>>16] | 1695 *p = lookup_r[(*p & 0xff0000) >> 16] |
1829 lookup_g[(*p & 0x00ff00)>> 8] | 1696 lookup_g[(*p & 0x00ff00) >> 8] |
1830 lookup_b[(*p & 0x0000ff)] | 1697 lookup_b[(*p & 0x0000ff)] |
1831 (*p & ~0xffffff); 1698 (*p & 0xff000000);
1699 }
1700 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1701 }
1702 }
1703 else
1704 {
1705 for (int y = 0; y < ximage->height; y++)
1706 for (int x = 0; x < ximage->width; x++)
1707 {
1708 unsigned long pixel = XGetPixel (ximage, x, y);
1709 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1710 lookup_g[(pixel & mask_g) >> sh_g] |
1711 lookup_b[(pixel & mask_b) >> sh_b];
1712 XPutPixel (ximage, x, y, pixel);
1832 } 1713 }
1833 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1834 } 1714 }
1835 break;
1836 }
1837 }
1838 1715
1839 free (lookup); 1716 free (lookup);
1840} 1717}
1841#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1718#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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