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.52 by sf-exg, Wed Sep 1 11:59:44 2010 UTC vs.
Revision 1.133 by sf-exg, Tue Jan 11 09:21:14 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines