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.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC vs.
Revision 1.133 by sf-exg, Tue Jan 11 09:21:14 2011 UTC

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

Diff Legend

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