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

Diff Legend

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