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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines