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.11 by sasha, Wed Nov 14 22:25:41 2007 UTC vs.
Revision 1.118 by sf-exg, Tue Nov 16 15:49:56 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines