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