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.64 by sf-exg, Mon Oct 4 14:31:00 2010 UTC vs.
Revision 1.124 by sf-exg, Tue Nov 23 16:37:36 2010 UTC

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

Diff Legend

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