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