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

Diff Legend

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