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

Diff Legend

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