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