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.54 by sf-exg, Wed Sep 1 22:49:35 2010 UTC vs.
Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
26 36
27#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
28 38
29#if DO_TIMING_TEST 39#if DO_TIMING_TEST
30# include <sys/time.h> 40# include <sys/time.h>
… …
56 * 66 *
57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
58 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 70 * the image in the window.
61 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50
66 *
67 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X%
73 * from current position.
74 *
75 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size).
79 * 71 *
80 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 74 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
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)
667 { 600 {
601 if (pixmap)
602 XFreePixmap (target->dpy, pixmap);
668 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 603 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
669 pmap_width = new_pmap_width; 604 pmap_width = new_pmap_width;
670 pmap_height = new_pmap_height; 605 pmap_height = new_pmap_height;
671 pmap_depth = target->depth;
672 } 606 }
673 /* fill with background color (if result's not completely overlapping it) */ 607 /* fill with background color (if result's not completely overlapping it) */
674 gcv.foreground = target->pix_colors[Color_bg]; 608 gcv.foreground = target->pix_colors[Color_bg];
675 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 609 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
676 610
677 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 611 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
678 int dst_width = result->width, dst_height = result->height; 612 int dst_width = result->width, dst_height = result->height;
679 if (background == NULL) 613 if (background == NULL)
680 { 614 {
615 if (!(h_scale == 0 || v_scale == 0))
616 {
681 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 617 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); 618 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
619 }
683 620
684 if (dst_x > 0 || dst_y > 0 621 if (dst_x > 0 || dst_y > 0
685 || dst_x + dst_width < new_pmap_width 622 || dst_x + dst_width < new_pmap_width
686 || dst_y + dst_height < new_pmap_height) 623 || dst_y + dst_height < new_pmap_height)
687 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 624 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
693 630
694 if (result != background && result != original_asim) 631 if (result != background && result != original_asim)
695 destroy_asimage (&result); 632 destroy_asimage (&result);
696 633
697 XFreeGC (target->dpy, gc); 634 XFreeGC (target->dpy, gc);
698 TIMING_TEST_PRINT_RESULT (asim);
699 635
700 ret = true; 636 ret = true;
701 } 637 }
702 638
703 if (background) 639 if (background)
… …
705 641
706 return ret; 642 return ret;
707} 643}
708# endif /* HAVE_AFTERIMAGE */ 644# endif /* HAVE_AFTERIMAGE */
709 645
646# ifdef HAVE_PIXBUF
647bool
648bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
649 int src_x, int src_y, int dst_x, int dst_y,
650 unsigned int width, unsigned int height)
651{
652 XImage *ximage;
653 char *data, *line;
654 int bytes_per_pixel;
655 int width_r, width_g, width_b;
656 int sh_r, sh_g, sh_b;
657 int rowstride;
658 int channels;
659 unsigned char *row;
660 Visual *visual = target->visual;
661 int depth = target->depth;
662
663 if (visual->c_class != TrueColor)
664 return false;
665
666 if (depth == 24 || depth == 32)
667 bytes_per_pixel = 4;
668 else if (depth == 15 || depth == 16)
669 bytes_per_pixel = 2;
670 else
671 return false;
672
673 width_r = rxvt_popcount (visual->red_mask);
674 width_g = rxvt_popcount (visual->green_mask);
675 width_b = rxvt_popcount (visual->blue_mask);
676
677 if (width_r > 8 || width_g > 8 || width_b > 8)
678 return false;
679
680 sh_r = rxvt_ctz (visual->red_mask);
681 sh_g = rxvt_ctz (visual->green_mask);
682 sh_b = rxvt_ctz (visual->blue_mask);
683
684 if (width > INT_MAX / height / bytes_per_pixel)
685 return false;
686
687 data = (char *)malloc (width * height * bytes_per_pixel);
688 if (!data)
689 return false;
690
691 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
692 width, height, bytes_per_pixel * 8, 0);
693 if (!ximage)
694 {
695 free (data);
696 return false;
697 }
698
699 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
700
701 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
702 channels = gdk_pixbuf_get_n_channels (pixbuf);
703 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
704 line = data;
705
706 for (int y = 0; y < height; y++)
707 {
708 for (int x = 0; x < width; x++)
709 {
710 unsigned char *pixel = row + x * channels;
711 uint32_t value;
712
713 value = ((pixel[0] >> (8 - width_r)) << sh_r)
714 | ((pixel[1] >> (8 - width_g)) << sh_g)
715 | ((pixel[2] >> (8 - width_b)) << sh_b);
716
717 if (bytes_per_pixel == 4)
718 ((uint32_t *)line)[x] = value;
719 else
720 ((uint16_t *)line)[x] = value;
721 }
722
723 row += rowstride;
724 line += ximage->bytes_per_line;
725 }
726
727 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
728 XDestroyImage (ximage);
729 return true;
730}
731
732bool
733bgPixmap_t::render_image (unsigned long background_flags)
734{
735 if (target == NULL)
736 return false;
737
738 if (!pixbuf)
739 return false;
740
741 if (background_flags
742 && !(flags & HAS_RENDER))
743 return false;
744
745 GdkPixbuf *result;
746
747 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf);
749
750 int target_width = target->szHint.width;
751 int target_height = target->szHint.height;
752 int new_pmap_width = target_width;
753 int new_pmap_height = target_height;
754
755 int x = 0;
756 int y = 0;
757 int w = 0;
758 int h = 0;
759
760 get_image_geometry (image_width, image_height, w, h, x, y);
761
762 if (!(flags & rootAlign)
763 && (x >= target_width
764 || y >= target_height
765 || (x + w <= 0)
766 || (y + h <= 0)))
767 return false;
768
769 result = pixbuf;
770
771 if ((w != image_width)
772 || (h != image_height))
773 {
774 result = gdk_pixbuf_scale_simple (pixbuf,
775 w, h,
776 GDK_INTERP_BILINEAR);
777 }
778
779 bool ret = false;
780
781 if (result)
782 {
783 XGCValues gcv;
784 GC gc;
785 Pixmap root_pmap;
786
787 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result);
789
790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height);
801 }
802 }
803
804 if (pixmap == None
805 || pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height)
807 {
808 if (pixmap)
809 XFreePixmap (target->dpy, pixmap);
810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
811 pmap_width = new_pmap_width;
812 pmap_height = new_pmap_height;
813 }
814
815 gcv.foreground = target->pix_colors[Color_bg];
816 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
817
818 if (h_scale == 0 || v_scale == 0)
819 {
820 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
821 pixbuf_to_pixmap (result, tile, gc,
822 0, 0,
823 0, 0,
824 image_width, image_height);
825
826 gcv.tile = tile;
827 gcv.fill_style = FillTiled;
828 gcv.ts_x_origin = x;
829 gcv.ts_y_origin = y;
830 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
831
832 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
833 XFreePixmap (target->dpy, tile);
834 }
835 else
836 {
837 int src_x, src_y, dst_x, dst_y;
838 int dst_width, dst_height;
839
840 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
841 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
842
843 if (dst_x > 0 || dst_y > 0
844 || dst_x + dst_width < new_pmap_width
845 || dst_y + dst_height < new_pmap_height)
846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
847
848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
849 pixbuf_to_pixmap (result, pixmap, gc,
850 src_x, src_y,
851 dst_x, dst_y,
852 dst_width, dst_height);
853 }
854
855#if XRENDER
856 if (background_flags)
857 {
858 Display *dpy = target->dpy;
859 XRenderPictureAttributes pa;
860
861 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
862 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
863
864 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
865 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
866
867 pa.repeat = True;
868 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
869 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
870 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
871 XFreePixmap (dpy, mask_pmap);
872
873 if (src && dst && mask)
874 {
875 XRenderColor mask_c;
876
877 mask_c.alpha = 0x8000;
878 mask_c.red = 0;
879 mask_c.green = 0;
880 mask_c.blue = 0;
881 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
882 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
883 }
884
885 XRenderFreePicture (dpy, src);
886 XRenderFreePicture (dpy, dst);
887 XRenderFreePicture (dpy, mask);
888
889 XFreePixmap (dpy, root_pmap);
890 }
891#endif
892
893 if (result != pixbuf)
894 g_object_unref (result);
895
896 XFreeGC (target->dpy, gc);
897
898 ret = true;
899 }
900
901 return ret;
902}
903# endif /* HAVE_PIXBUF */
904
710bool 905bool
711bgPixmap_t::set_file (const char *file) 906bgPixmap_t::set_file (const char *file)
712{ 907{
713 assert (file); 908 if (!file || !*file)
909 return false;
714 910
715 if (*file)
716 {
717 if (const char *p = strchr (file, ';')) 911 if (const char *p = strchr (file, ';'))
718 { 912 {
719 size_t len = p - file; 913 size_t len = p - file;
720 char *f = rxvt_temp_buf<char> (len + 1); 914 char *f = rxvt_temp_buf<char> (len + 1);
721 memcpy (f, file, len); 915 memcpy (f, file, len);
722 f[len] = '\0'; 916 f[len] = '\0';
723 file = f; 917 file = f;
724 } 918 }
725 919
726# ifdef HAVE_AFTERIMAGE 920# ifdef HAVE_AFTERIMAGE
727 if (!target->asimman) 921 if (!target->asimman)
728 target->asimman = create_generic_imageman (target->rs[Rs_path]); 922 target->asimman = create_generic_imageman (target->rs[Rs_path]);
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 923 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
924 if (image)
925 {
730 if (original_asim) 926 if (original_asim)
927 safe_asimage_destroy (original_asim);
928 original_asim = image;
929 flags |= CLIENT_RENDER;
731 have_image = true; 930 have_image = true;
732 return have_image; 931 return true;
932 }
733# endif 933# endif
934
935# ifdef HAVE_PIXBUF
936 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
937 if (image)
734 } 938 {
939 if (pixbuf)
940 g_object_unref (pixbuf);
941 pixbuf = image;
942 have_image = true;
943 return true;
944 }
945# endif
735 946
736 return false; 947 return false;
737} 948}
738 949
739# endif /* BG_IMAGE_FROM_FILE */ 950# endif /* BG_IMAGE_FROM_FILE */
… …
752} 963}
753 964
754bool 965bool
755bgPixmap_t::set_blur_radius (const char *geom) 966bgPixmap_t::set_blur_radius (const char *geom)
756{ 967{
757 int changed = 0; 968 bool changed = false;
758 unsigned int hr, vr; 969 unsigned int hr, vr;
759 int junk; 970 int junk;
760 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 971 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
761 972
762 if (!(geom_flags & WidthValue)) 973 if (!(geom_flags & WidthValue))
763 hr = 1; 974 hr = 1;
764 if (!(geom_flags & HeightValue)) 975 if (!(geom_flags & HeightValue))
765 vr = hr; 976 vr = hr;
766 977
978 min_it (hr, 128);
979 min_it (vr, 128);
980
767 if (h_blurRadius != hr) 981 if (h_blurRadius != hr)
768 { 982 {
769 ++changed; 983 changed = true;
770 h_blurRadius = hr; 984 h_blurRadius = hr;
771 } 985 }
772 986
773 if (v_blurRadius != vr) 987 if (v_blurRadius != vr)
774 { 988 {
775 ++changed; 989 changed = true;
776 v_blurRadius = vr; 990 v_blurRadius = vr;
777 } 991 }
778 992
779 if (v_blurRadius == 0 && h_blurRadius == 0) 993 if (v_blurRadius == 0 && h_blurRadius == 0)
780 flags &= ~blurNeeded; 994 flags &= ~blurNeeded;
781 else 995 else
782 flags |= blurNeeded; 996 flags |= blurNeeded;
783 997
784 return (changed > 0); 998 return changed;
785} 999}
786 1000
787static inline unsigned long 1001static inline unsigned long
788compute_tint_shade_flags (rxvt_color *tint, int shade) 1002compute_tint_shade_flags (rxvt_color *tint, int shade)
789{ 1003{
790 unsigned long flags = 0; 1004 unsigned long flags = 0;
791 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1005 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
792 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1006 bool has_shade = shade != 100;
793 1007
794 if (tint) 1008 if (tint)
795 { 1009 {
796 tint->get (c); 1010 tint->get (c);
797# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1011 if (!has_shade
798 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1012 && (c.r <= 0x00ff || c.r >= 0xff00)
799 && IS_COMPONENT_WHOLESOME (c.g) 1013 && (c.g <= 0x00ff || c.g >= 0xff00)
800 && IS_COMPONENT_WHOLESOME (c.b)) 1014 && (c.b <= 0x00ff || c.b >= 0xff00))
801 flags |= bgPixmap_t::tintWholesome; 1015 flags |= bgPixmap_t::tintWholesome;
802# undef IS_COMPONENT_WHOLESOME
803 } 1016 }
804 1017
805 if (has_shade) 1018 if (has_shade || tint)
806 flags |= bgPixmap_t::tintNeeded; 1019 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 1020
828 return flags; 1021 return flags;
829} 1022}
830 1023
831bool 1024bool
832bgPixmap_t::set_tint (rxvt_color &new_tint) 1025bgPixmap_t::set_tint (rxvt_color &new_tint)
833{ 1026{
834 if (tint != new_tint) 1027 if (!(flags & tintSet) || tint != new_tint)
835 { 1028 {
836 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1029 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
837 tint = new_tint; 1030 tint = new_tint;
838 flags = (flags & ~tintFlags) | new_flags | tintSet; 1031 flags = (flags & ~tintFlags) | new_flags | tintSet;
839 return true; 1032 return true;
… …
841 1034
842 return false; 1035 return false;
843} 1036}
844 1037
845bool 1038bool
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) 1039bgPixmap_t::set_shade (const char *shade_str)
861{ 1040{
862 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1041 int new_shade = (shade_str) ? atoi (shade_str) : 100;
863 1042
864 if (new_shade < 0 && new_shade > -100) 1043 clamp_it (new_shade, -100, 200);
1044 if (new_shade < 0)
865 new_shade = 200 - (100 + new_shade); 1045 new_shade = 200 - (100 + new_shade);
866 else if (new_shade == 100)
867 new_shade = 0;
868 1046
869 if (new_shade != shade) 1047 if (new_shade != shade)
870 { 1048 {
871 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1049 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
872 shade = new_shade; 1050 shade = new_shade;
… …
875 } 1053 }
876 1054
877 return false; 1055 return false;
878} 1056}
879 1057
1058#if XRENDER
1059static void
1060get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1061{
1062 double sigma = radius / 2.0;
1063 double scale = sqrt (2.0 * M_PI) * sigma;
1064 double sum = 0.0;
1065
1066 for (int i = 0; i < width; i++)
1067 {
1068 double x = i - width / 2;
1069 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1070 sum += kernel[i];
1071 }
1072
1073 params[0] = XDoubleToFixed (width);
1074 params[1] = XDoubleToFixed (1);
1075
1076 for (int i = 0; i < width; i++)
1077 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1078}
1079#endif
1080
1081bool
1082bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1083{
1084 bool ret = false;
1085#if XRENDER
1086 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1087 double *kernel = (double *)malloc (size * sizeof (double));
1088 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1089
1090 Display *dpy = target->dpy;
1091 XRenderPictureAttributes pa;
1092 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1093
1094 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1095 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1096
1097 if (kernel && params && src && dst)
1098 {
1099 if (h_blurRadius)
1100 {
1101 size = h_blurRadius * 2 + 1;
1102 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1103
1104 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1105 XRenderComposite (dpy,
1106 PictOpSrc,
1107 src,
1108 None,
1109 dst,
1110 0, 0,
1111 0, 0,
1112 0, 0,
1113 width, height);
1114 }
1115
1116 if (v_blurRadius)
1117 {
1118 size = v_blurRadius * 2 + 1;
1119 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1120 swap (params[0], params[1]);
1121
1122 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1123 XRenderComposite (dpy,
1124 PictOpSrc,
1125 src,
1126 None,
1127 dst,
1128 0, 0,
1129 0, 0,
1130 0, 0,
1131 width, height);
1132 }
1133
1134 ret = true;
1135 }
1136
1137 free (kernel);
1138 free (params);
1139 XRenderFreePicture (dpy, src);
1140 XRenderFreePicture (dpy, dst);
1141#endif
1142 return ret;
1143}
1144
1145bool
1146bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1147{
1148 Display *dpy = target->dpy;
1149 bool ret = false;
1150
1151 if (flags & tintWholesome)
1152 {
1153 XGCValues gcv;
1154 GC gc;
1155
1156 /* In this case we can tint image server-side getting significant
1157 * performance improvements, as we eliminate XImage transfer
1158 */
1159 gcv.foreground = Pixel (tint);
1160 gcv.function = GXand;
1161 gcv.fill_style = FillSolid;
1162 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1163 if (gc)
1164 {
1165 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1166 ret = true;
1167 XFreeGC (dpy, gc);
1168 }
1169 }
1170 else
1171 {
1172# if XRENDER
1173 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1174
1175 if (flags & tintSet)
1176 tint.get (c);
1177
1178 if (shade <= 100)
1179 {
1180 c.r = (c.r * shade) / 100;
1181 c.g = (c.g * shade) / 100;
1182 c.b = (c.b * shade) / 100;
1183 }
1184 else
1185 {
1186 c.r = (c.r * (200 - shade)) / 100;
1187 c.g = (c.g * (200 - shade)) / 100;
1188 c.b = (c.b * (200 - shade)) / 100;
1189 }
1190
1191 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1192 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1193 XRenderPictureAttributes pa;
1194
1195 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1196
1197 pa.repeat = True;
1198
1199 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1200 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1201 XFreePixmap (dpy, overlay_pmap);
1202
1203 pa.component_alpha = True;
1204 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1205 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1206 XFreePixmap (dpy, mask_pmap);
1207
1208 if (mask_pic && overlay_pic && back_pic)
1209 {
1210 XRenderColor mask_c;
1211
1212 mask_c.red = mask_c.green = mask_c.blue = 0;
1213 mask_c.alpha = 0xffff;
1214 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1215
1216 mask_c.alpha = 0;
1217 mask_c.red = 0xffff - c.r;
1218 mask_c.green = 0xffff - c.g;
1219 mask_c.blue = 0xffff - c.b;
1220 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1221 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1222
1223 if (shade > 100)
1224 {
1225 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1226 mask_c.alpha = 0;
1227 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1228
1229 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1230 }
1231
1232 ret = true;
1233 }
1234
1235 XRenderFreePicture (dpy, mask_pic);
1236 XRenderFreePicture (dpy, overlay_pic);
1237 XRenderFreePicture (dpy, back_pic);
1238# endif
1239 }
1240
1241 return ret;
1242}
1243
880/* make_transparency_pixmap() 1244/* make_transparency_pixmap()
881 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1245 * 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 1246 * the tiled portion of the root pixmap that is supposed to be covered by
883 * our window. 1247 * our window.
884 */ 1248 */
885unsigned long 1249unsigned long
886bgPixmap_t::make_transparency_pixmap () 1250bgPixmap_t::make_transparency_pixmap ()
887{ 1251{
… …
891 return 0; 1255 return 0;
892 1256
893 /* root dimensions may change from call to call - but Display structure should 1257 /* root dimensions may change from call to call - but Display structure should
894 * be always up-to-date, so let's use it : 1258 * be always up-to-date, so let's use it :
895 */ 1259 */
896 Window root = target->display->root;
897 int screen = target->display->screen; 1260 int screen = target->display->screen;
898 Display *dpy = target->dpy; 1261 Display *dpy = target->dpy;
1262 int root_depth = DefaultDepth (dpy, screen);
899 int root_width = DisplayWidth (dpy, screen); 1263 int root_width = DisplayWidth (dpy, screen);
900 int root_height = DisplayHeight (dpy, screen); 1264 int root_height = DisplayHeight (dpy, screen);
901 unsigned int root_pmap_width, root_pmap_height; 1265 unsigned int root_pmap_width, root_pmap_height;
902 int window_width = target->szHint.width; 1266 int window_width = target->szHint.width;
903 int window_height = target->szHint.height; 1267 int window_height = target->szHint.height;
904 int sx, sy; 1268 int sx, sy;
905 XGCValues gcv; 1269 XGCValues gcv;
1270 GC gc;
906 1271
907 TIMING_TEST_START (tp); 1272 sx = target_x;
908 target->get_window_origin (sx, sy); 1273 sy = target_y;
909 1274
910 /* check if we are outside of the visible part of the virtual screen : */ 1275 /* check if we are outside of the visible part of the virtual screen : */
911 if (sx + window_width <= 0 || sy + window_height <= 0 1276 if (sx + window_width <= 0 || sy + window_height <= 0
912 || sx >= root_width || sy >= root_height) 1277 || sx >= root_width || sy >= root_height)
913 return 0; 1278 return 0;
914 1279
1280 // validate root pixmap and get its size
915 if (root_pixmap != None) 1281 if (root_pixmap != None)
916 { 1282 {
917 /* we want to validate the pixmap and get it's size at the same time : */ 1283 Window wdummy;
918 int junk; 1284 int idummy;
919 unsigned int ujunk; 1285 unsigned int udummy;
920 /* root pixmap may be bad - allow a error */ 1286
921 target->allowedxerror = -1; 1287 target->allowedxerror = -1;
922 1288
923 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1289 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
924 root_pixmap = None; 1290 root_pixmap = None;
925 1291
926 target->allowedxerror = 0; 1292 target->allowedxerror = 0;
927 } 1293 }
928 1294
929 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1295 Pixmap recoded_root_pmap = root_pixmap;
930 GC gc = NULL;
931 1296
932 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1297 if (root_pixmap != None && root_depth != target->depth)
1298 {
1299#if XRENDER
1300 if (flags & HAS_RENDER)
1301 {
1302 XRenderPictureAttributes pa;
1303
1304 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1305 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1306
1307 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1308 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1309 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1310
1311 if (src && dst)
1312 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1313 else
1314 {
1315 XFreePixmap (dpy, recoded_root_pmap);
1316 root_pixmap = None;
1317 }
1318
1319 XRenderFreePicture (dpy, src);
1320 XRenderFreePicture (dpy, dst);
1321 }
1322 else
1323#endif
1324 root_pixmap = None;
1325 }
1326
1327 if (root_pixmap == None)
933 return 0; 1328 return 0;
934 1329
935 if (root_pixmap == None) 1330 if (pixmap == None
936 { 1331 || pmap_width != window_width
937 /* use tricks to obtain the root background image :*/ 1332 || pmap_height != window_height)
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 } 1333 {
990 else
991 {
992 /* straightforward pixmap copy */
993 gcv.tile = root_pixmap;
994 gcv.fill_style = FillTiled;
995
996 while (sx < 0) sx += (int)root_width;
997 while (sy < 0) sy += (int)root_height;
998
999 gcv.ts_x_origin = -sx;
1000 gcv.ts_y_origin = -sy;
1001 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1002
1003 if (gc)
1004 {
1005 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1006 result |= transpPmapTiled;
1007 }
1008 }
1009 TIMING_TEST_PRINT_RESULT (tp);
1010
1011 if (tiled_root_pmap != None)
1012 {
1013 if (!need_client_side_rendering ())
1014 {
1015 if ((flags & tintNeeded))
1016 {
1017 if (flags & tintWholesome)
1018 {
1019 /* In this case we can tint image server-side getting significant
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;
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 }
1116 } /* server side rendering completed */
1117
1118 if (pixmap) 1334 if (pixmap)
1119 XFreePixmap (dpy, pixmap); 1335 XFreePixmap (target->dpy, pixmap);
1120 1336 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1121 pixmap = tiled_root_pmap;
1122 pmap_width = window_width; 1337 pmap_width = window_width;
1123 pmap_height = window_height; 1338 pmap_height = window_height;
1124 pmap_depth = root_depth;
1125 } 1339 }
1340
1341 if (pixmap == None)
1342 return 0;
1343
1344 /* straightforward pixmap copy */
1345 while (sx < 0) sx += (int)root_width;
1346 while (sy < 0) sy += (int)root_height;
1347
1348 gcv.tile = recoded_root_pmap;
1349 gcv.fill_style = FillTiled;
1350 gcv.ts_x_origin = -sx;
1351 gcv.ts_y_origin = -sy;
1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1126 1353
1127 if (gc) 1354 if (gc)
1355 {
1356 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1357 result |= transpPmapTiled;
1128 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1129 1359
1130 TIMING_TEST_PRINT_RESULT (tp); 1360 if (!(flags & CLIENT_RENDER))
1361 {
1362 if ((flags & blurNeeded)
1363 && (flags & HAS_RENDER_CONV))
1364 {
1365 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1366 result |= transpPmapBlurred;
1367 }
1368 if ((flags & tintNeeded)
1369 && (flags & (tintWholesome | HAS_RENDER)))
1370 {
1371 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1372 result |= transpPmapTinted;
1373 }
1374 } /* server side rendering completed */
1375 }
1376
1377 if (recoded_root_pmap != root_pixmap)
1378 XFreePixmap (dpy, recoded_root_pmap);
1131 1379
1132 return result; 1380 return result;
1133} 1381}
1134 1382
1135bool 1383void
1136bgPixmap_t::set_root_pixmap () 1384bgPixmap_t::set_root_pixmap ()
1137{ 1385{
1138 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1386 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1139 if (new_root_pixmap == None) 1387 if (new_root_pixmap == None)
1140 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1388 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1141 1389
1142 if (new_root_pixmap != root_pixmap)
1143 {
1144 root_pixmap = new_root_pixmap; 1390 root_pixmap = new_root_pixmap;
1145 return true;
1146 }
1147
1148 return false;
1149} 1391}
1150# endif /* ENABLE_TRANSPARENCY */ 1392# endif /* ENABLE_TRANSPARENCY */
1151 1393
1152# ifndef HAVE_AFTERIMAGE 1394#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1153static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1395static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1154# endif 1396# endif
1155 1397
1156bool 1398bool
1157bgPixmap_t::render () 1399bgPixmap_t::render ()
1158{ 1400{
1159 unsigned long background_flags = 0; 1401 unsigned long background_flags = 0;
1160 1402
1161 if (target == NULL) 1403 if (target == NULL)
1162 return false; 1404 return false;
1163
1164 TIMING_TEST_START (tp);
1165 1405
1166 invalidate (); 1406 invalidate ();
1167# ifdef ENABLE_TRANSPARENCY 1407# ifdef ENABLE_TRANSPARENCY
1168 if (flags & isTransparent) 1408 if (flags & isTransparent)
1169 { 1409 {
1170 /* we need to re-generate transparency pixmap in that case ! */ 1410 /* we need to re-generate transparency pixmap in that case ! */
1171 background_flags = make_transparency_pixmap (); 1411 background_flags = make_transparency_pixmap ();
1172 if (background_flags == 0) 1412 if (background_flags == 0)
1173 return false; 1413 return false;
1174 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1414 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1175 && pmap_depth == target->depth)
1176 flags = flags & ~isInvalid; 1415 flags &= ~isInvalid;
1177 } 1416 }
1178# endif 1417# endif
1179 1418
1180# ifdef BG_IMAGE_FROM_FILE 1419# ifdef BG_IMAGE_FROM_FILE
1181 if (have_image 1420 if (have_image
1182 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1421 || (background_flags & transpTransformations) != (flags & transpTransformations))
1183 { 1422 {
1184 if (render_image (background_flags)) 1423 if (render_image (background_flags))
1185 flags = flags & ~isInvalid; 1424 flags &= ~isInvalid;
1186 } 1425 }
1187# endif 1426# endif
1188 1427
1428# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1189 XImage *result = NULL; 1429 XImage *result = NULL;
1190 1430
1191 if (background_flags && (flags & isInvalid)) 1431 if (background_flags && (flags & isInvalid))
1192 { 1432 {
1193 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1433 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1194 } 1434 }
1195 1435
1196 if (result) 1436 if (result)
1197 { 1437 {
1198# if !defined(HAVE_AFTERIMAGE) && !XFT
1199 /* our own client-side tinting */ 1438 /* our own client-side tinting */
1200 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1201 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1202 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1439 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1203 { 1440 {
1204 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1441 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1205 if (flags & tintSet) 1442 if (flags & tintSet)
1206 tint.get (c); 1443 tint.get (c);
1207 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1444 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1208 } 1445 }
1209# endif
1210 1446
1211 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1447 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1212 1448
1213 if (gc) 1449 if (gc)
1214 { 1450 {
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); 1451 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1244 1452
1245 XFreeGC (target->dpy, gc); 1453 XFreeGC (target->dpy, gc);
1246 flags = flags & ~isInvalid; 1454 flags &= ~isInvalid;
1247 } 1455 }
1248 1456
1249 XDestroyImage (result); 1457 XDestroyImage (result);
1250 } 1458 }
1459# endif
1251 1460
1252 if (flags & isInvalid) 1461 if (flags & isInvalid)
1253 { 1462 {
1254 if (pixmap != None) 1463 if (pixmap != None)
1255 { 1464 {
… …
1258 } 1467 }
1259 } 1468 }
1260 1469
1261 apply (); 1470 apply ();
1262 1471
1263 XSync (target->dpy, False);
1264 valid_since = ev::now (); 1472 valid_since = ev::now ();
1265 1473
1266 TIMING_TEST_PRINT_RESULT (tp);
1267
1268 return true; 1474 return true;
1269} 1475}
1270 1476
1271bool 1477void
1272bgPixmap_t::set_target (rxvt_term *new_target) 1478bgPixmap_t::set_target (rxvt_term *new_target)
1273{ 1479{
1274 if (new_target)
1275 if (target != new_target)
1276 {
1277 target = new_target; 1480 target = new_target;
1278# ifdef ENABLE_TRANSPARENCY 1481
1279 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1482 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1483#if XRENDER
1484 int major, minor;
1485 if (XRenderQueryVersion (target->dpy, &major, &minor))
1486 flags |= HAS_RENDER;
1487 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1488 if (filters)
1489 {
1490 for (int i = 0; i < filters->nfilter; i++)
1491 if (!strcmp (filters->filter[i], FilterConvolution))
1492 flags |= HAS_RENDER_CONV;
1493
1494 XFree (filters);
1495 }
1280# endif 1496#endif
1281 return true;
1282 }
1283
1284 return false;
1285} 1497}
1286 1498
1287void 1499void
1288bgPixmap_t::apply () 1500bgPixmap_t::apply ()
1289{ 1501{
1290 if (target) 1502 if (target == NULL)
1291 { 1503 return;
1292 flags &= ~isVtOrigin;
1293 1504
1294 if (pixmap != None) 1505 if (pixmap != None)
1295 { 1506 {
1296 /* set target's background to pixmap */ 1507 /* set target's background to pixmap */
1297# ifdef ENABLE_TRANSPARENCY 1508# ifdef ENABLE_TRANSPARENCY
1298 if (flags & isTransparent) 1509 if (flags & isTransparent)
1299 { 1510 {
1300 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1511 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1301 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1512 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1302 1513
1303 if (target->scrollBar.win) 1514 if (target->scrollBar.win)
1304 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1515 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1305 } 1516 }
1306 else 1517 else
1307# endif 1518# endif
1308 { 1519 {
1309 flags |= isVtOrigin;
1310 /* force old pixmap dereference in case it was transparent before :*/ 1520 /* 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]); 1521 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1323 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1522 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1324 /* do we also need to set scrollbar's background here ? */ 1523 /* do we also need to set scrollbar's background here ? */
1524
1325 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1326 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1526 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1327 } 1527 }
1528 }
1529 else
1530 {
1531 /* set target background to a pixel */
1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1533 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1534 /* do we also need to set scrollbar's background here ? */
1535 if (target->scrollBar.win)
1536 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1537 }
1328 1538
1329 /* don't want Expose on the parent or vt. It is better to use 1539 /* 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: */ 1540 scr_touch or we get a great deal of flicker otherwise: */
1331 XClearWindow (target->dpy, target->parent[0]); 1541 XClearWindow (target->dpy, target->parent[0]);
1332 1542
1333 if (target->scrollBar.state && target->scrollBar.win) 1543 if (target->scrollBar.state && target->scrollBar.win)
1334 { 1544 {
1335 target->scrollBar.state = STATE_IDLE; 1545 target->scrollBar.state = STATE_IDLE;
1336 target->scrollBar.show (0); 1546 target->scrollBar.show (0);
1337 } 1547 }
1338 1548
1339 target->want_refresh = 1; 1549 target->want_refresh = 1;
1340 flags |= hasChanged; 1550 flags |= hasChanged;
1341 }
1342} 1551}
1343 1552
1344#endif /* HAVE_BG_PIXMAP */ 1553#endif /* HAVE_BG_PIXMAP */
1345 1554
1346#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1555#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1347/* taken from aterm-0.4.2 */ 1556/* taken from aterm-0.4.2 */
1348 1557
1349typedef uint32_t RUINT32T;
1350
1351static void 1558static void
1352ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1559shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1353{ 1560{
1354 int sh_r, sh_g, sh_b; 1561 int sh_r, sh_g, sh_b;
1355 RUINT32T mask_r, mask_g, mask_b; 1562 uint32_t mask_r, mask_g, mask_b;
1356 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1563 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1357 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1564 rgba low;
1358 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1565 rgba high;
1359 int i; 1566 int i;
1567 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1360 1568
1361 Visual *visual = term->visual;
1362
1363 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1569 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1364
1365 if (shade == 0)
1366 shade = 100;
1367 1570
1368 /* for convenience */ 1571 /* for convenience */
1369 mask_r = visual->red_mask; 1572 mask_r = visual->red_mask;
1370 mask_g = visual->green_mask; 1573 mask_g = visual->green_mask;
1371 mask_b = visual->blue_mask; 1574 mask_b = visual->blue_mask;
1372 1575
1373 /* boring lookup table pre-initialization */ 1576 /* boring lookup table pre-initialization */
1374 switch (srcImage->bits_per_pixel) { 1577 switch (ximage->depth)
1578 {
1375 case 15: 1579 case 15:
1376 if ((mask_r != 0x7c00) || 1580 if ((mask_r != 0x7c00) ||
1377 (mask_g != 0x03e0) || 1581 (mask_g != 0x03e0) ||
1378 (mask_b != 0x001f)) 1582 (mask_b != 0x001f))
1379 return; 1583 return;
1380 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1584 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1381 lookup_r = lookup; 1585 lookup_r = lookup;
1382 lookup_g = lookup+32; 1586 lookup_g = lookup+32;
1383 lookup_b = lookup+32+32; 1587 lookup_b = lookup+32+32;
1384 sh_r = 10; 1588 sh_r = 10;
1385 sh_g = 5; 1589 sh_g = 5;
1386 sh_b = 0; 1590 sh_b = 0;
1387 break; 1591 break;
1388 case 16: 1592 case 16:
1389 if ((mask_r != 0xf800) || 1593 if ((mask_r != 0xf800) ||
1390 (mask_g != 0x07e0) || 1594 (mask_g != 0x07e0) ||
1391 (mask_b != 0x001f)) 1595 (mask_b != 0x001f))
1392 return; 1596 return;
1393 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1597 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1394 lookup_r = lookup; 1598 lookup_r = lookup;
1395 lookup_g = lookup+32; 1599 lookup_g = lookup+32;
1396 lookup_b = lookup+32+64; 1600 lookup_b = lookup+32+64;
1397 sh_r = 11; 1601 sh_r = 11;
1398 sh_g = 5; 1602 sh_g = 5;
1399 sh_b = 0; 1603 sh_b = 0;
1400 break; 1604 break;
1401 case 24: 1605 case 24:
1402 if ((mask_r != 0xff0000) || 1606 if ((mask_r != 0xff0000) ||
1403 (mask_g != 0x00ff00) || 1607 (mask_g != 0x00ff00) ||
1404 (mask_b != 0x0000ff)) 1608 (mask_b != 0x0000ff))
1405 return; 1609 return;
1406 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1610 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1407 lookup_r = lookup; 1611 lookup_r = lookup;
1408 lookup_g = lookup+256; 1612 lookup_g = lookup+256;
1409 lookup_b = lookup+256+256; 1613 lookup_b = lookup+256+256;
1410 sh_r = 16; 1614 sh_r = 16;
1411 sh_g = 8; 1615 sh_g = 8;
1412 sh_b = 0; 1616 sh_b = 0;
1413 break; 1617 break;
1414 case 32: 1618 case 32:
1415 if ((mask_r != 0xff0000) || 1619 if ((mask_r != 0xff0000) ||
1416 (mask_g != 0x00ff00) || 1620 (mask_g != 0x00ff00) ||
1417 (mask_b != 0x0000ff)) 1621 (mask_b != 0x0000ff))
1418 return; 1622 return;
1419 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1623 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1420 lookup_r = lookup; 1624 lookup_r = lookup;
1421 lookup_g = lookup+256; 1625 lookup_g = lookup+256;
1422 lookup_b = lookup+256+256; 1626 lookup_b = lookup+256+256;
1423 sh_r = 16; 1627 sh_r = 16;
1424 sh_g = 8; 1628 sh_g = 8;
1425 sh_b = 0; 1629 sh_b = 0;
1426 break; 1630 break;
1427 default: 1631 default:
1428 return; /* we do not support this color depth */ 1632 return; /* we do not support this color depth */
1429 } 1633 }
1430 1634
1431 /* prepare limits for color transformation (each channel is handled separately) */ 1635 /* prepare limits for color transformation (each channel is handled separately) */
1432 if (shade < 0) { 1636 if (shade > 100)
1637 {
1433 shade = -shade; 1638 shade = 200 - shade;
1434 if (shade < 0) shade = 0;
1435 if (shade > 100) shade = 100;
1436 1639
1437 lower_lim_r = 65535-rm; 1640 high.r = c.r * shade / 100;
1438 lower_lim_g = 65535-gm; 1641 high.g = c.g * shade / 100;
1439 lower_lim_b = 65535-bm; 1642 high.b = c.b * shade / 100;
1440 1643
1441 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1644 low.r = 65535 * (100 - shade) / 100;
1442 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1645 low.g = 65535 * (100 - shade) / 100;
1443 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1646 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 } 1647 }
1456 1648 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 { 1649 {
1460 unsigned int tmp; 1650 high.r = c.r * shade / 100;
1651 high.g = c.g * shade / 100;
1652 high.b = c.b * shade / 100;
1461 1653
1462 tmp = lower_lim_r; 1654 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 } 1655 }
1470 1656
1471 /* fill our lookup tables */ 1657 /* fill our lookup tables */
1472 for (i = 0; i <= mask_r>>sh_r; i++) 1658 for (i = 0; i <= mask_r>>sh_r; i++)
1473 { 1659 {
1474 RUINT32T tmp; 1660 uint32_t tmp;
1475 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1661 tmp = i * high.r;
1476 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1662 tmp += (mask_r>>sh_r) * low.r;
1477 lookup_r[i] = (tmp/65535)<<sh_r; 1663 lookup_r[i] = (tmp/65535)<<sh_r;
1478 } 1664 }
1479 for (i = 0; i <= mask_g>>sh_g; i++) 1665 for (i = 0; i <= mask_g>>sh_g; i++)
1480 { 1666 {
1481 RUINT32T tmp; 1667 uint32_t tmp;
1482 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1668 tmp = i * high.g;
1483 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1669 tmp += (mask_g>>sh_g) * low.g;
1484 lookup_g[i] = (tmp/65535)<<sh_g; 1670 lookup_g[i] = (tmp/65535)<<sh_g;
1485 } 1671 }
1486 for (i = 0; i <= mask_b>>sh_b; i++) 1672 for (i = 0; i <= mask_b>>sh_b; i++)
1487 { 1673 {
1488 RUINT32T tmp; 1674 uint32_t tmp;
1489 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1675 tmp = i * high.b;
1490 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1676 tmp += (mask_b>>sh_b) * low.b;
1491 lookup_b[i] = (tmp/65535)<<sh_b; 1677 lookup_b[i] = (tmp/65535)<<sh_b;
1492 } 1678 }
1493 1679
1494 /* apply table to input image (replacing colors by newly calculated ones) */ 1680 /* apply table to input image (replacing colors by newly calculated ones) */
1495 switch (srcImage->bits_per_pixel) 1681 if (ximage->bits_per_pixel == 32
1682 && (ximage->depth == 24 || ximage->depth == 32)
1683 && ximage->byte_order == host_byte_order)
1496 { 1684 {
1497 case 15:
1498 {
1499 unsigned short *p1, *pf, *p, *pl; 1685 uint32_t *p1, *pf, *p, *pl;
1500 p1 = (unsigned short *) srcImage->data; 1686 p1 = (uint32_t *) ximage->data;
1501 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1687 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1688
1502 while (p1 < pf) 1689 while (p1 < pf)
1503 { 1690 {
1504 p = p1; 1691 p = p1;
1505 pl = p1 + srcImage->width; 1692 pl = p1 + ximage->width;
1506 for (; p < pl; p++) 1693 for (; p < pl; p++)
1507 { 1694 {
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] | 1695 *p = lookup_r[(*p & 0xff0000) >> 16] |
1567 lookup_g[(*p & 0x00ff00)>> 8] | 1696 lookup_g[(*p & 0x00ff00) >> 8] |
1568 lookup_b[(*p & 0x0000ff)] | 1697 lookup_b[(*p & 0x0000ff)] |
1569 (*p & ~0xffffff); 1698 (*p & 0xff000000);
1699 }
1700 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1701 }
1702 }
1703 else
1704 {
1705 for (int y = 0; y < ximage->height; y++)
1706 for (int x = 0; x < ximage->width; x++)
1707 {
1708 unsigned long pixel = XGetPixel (ximage, x, y);
1709 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1710 lookup_g[(pixel & mask_g) >> sh_g] |
1711 lookup_b[(pixel & mask_b) >> sh_b];
1712 XPutPixel (ximage, x, y, pixel);
1570 } 1713 }
1571 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1572 } 1714 }
1573 break;
1574 }
1575 }
1576 1715
1577 free (lookup); 1716 free (lookup);
1578} 1717}
1579#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1718#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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