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.108 by sf-exg, Mon Nov 1 14:58:44 2010 UTC vs.
Revision 1.173 by sf-exg, Sun Nov 20 11:09:21 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
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 <schmorp@schmorp.de>
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 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * 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
11 * 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
… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#define DO_TIMING_TEST 0 29#if XRENDER
30 30# include <X11/extensions/Xrender.h>
31#if DO_TIMING_TEST
32# include <sys/time.h>
33#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL);
36
37#define TIMING_TEST_PRINT_RESULT(id) \
38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
42 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
45
46#else
47#define TIMING_TEST_START(id) do {} while (0)
48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
49#endif 31#endif
50 32
51/* 33#ifndef FilterConvolution
52 * Pixmap geometry string interpretation : 34#define FilterConvolution "convolution"
53 * Each geometry string contains zero or one scale/position 35#endif
54 * adjustment and may optionally be followed by a colon and one or more
55 * colon-delimited pixmap operations.
56 * The following table shows the valid geometry strings and their
57 * effects on the background image :
58 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 *
82 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the
86 * proper aspect ratio for the image. Any portion of the
87 * background not covered by the image is filled with the
88 * current background color.
89 * hscale Scale horizontally, tile vertically ?
90 * vscale Tile horizontally, scale vertically ?
91 * scale Scale both up and down
92 * auto Same as 100x100+50+50
93 */
94 36
95#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
96bgPixmap_t::bgPixmap_t ()
97{
98 // this is basically redundant as bgPixmap_t is only used in
99 // zero_initialised-derived structs
100#ifdef HAVE_AFTERIMAGE
101 original_asim = NULL;
102#endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
108 h_scale = v_scale = 0;
109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
114 flags = 0;
115 pixmap = None;
116 valid_since = invalid_since = 0;
117 target = 0;
118}
119
120void 38void
121bgPixmap_t::destroy () 39rxvt_term::bg_destroy ()
122{ 40{
123#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
124 if (original_asim) 42 if (original_asim)
125 safe_asimage_destroy (original_asim); 43 safe_asimage_destroy (original_asim);
44 if (asv)
45 destroy_asvisual (asv, 0);
46 if (asimman)
47 destroy_image_manager (asimman, 0);
126#endif 48#endif
127 49
128#ifdef HAVE_PIXBUF 50#ifdef HAVE_PIXBUF
129 if (pixbuf) 51 if (pixbuf)
130 g_object_unref (pixbuf); 52 g_object_unref (pixbuf);
131#endif 53#endif
132 54
133 if (pixmap && target) 55 if (bg_pixmap)
134 XFreePixmap (target->dpy, pixmap); 56 XFreePixmap (dpy, bg_pixmap);
135} 57}
136 58
137bool 59bool
138bgPixmap_t::window_size_sensitive () 60rxvt_term::bg_set_position (int x, int y)
61{
62
63 if (target_x != x
64 || target_y != y)
65 {
66 target_x = x;
67 target_y = y;
68 return true;
69 }
70 return false;
71}
72
73bool
74rxvt_term::bg_window_size_sensitive ()
139{ 75{
140# ifdef ENABLE_TRANSPARENCY 76# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 77 if (bg_flags & BG_IS_TRANSPARENT)
142 return true; 78 return true;
143# endif 79# endif
144 80
145# ifdef BG_IMAGE_FROM_FILE 81# ifdef BG_IMAGE_FROM_FILE
146 if (have_image) 82 if (bg_flags & BG_IS_FROM_FILE)
147 { 83 {
148 if (flags & sizeSensitive) 84 if (bg_flags & BG_IS_SIZE_SENSITIVE)
149 return true; 85 return true;
150 } 86 }
151# endif 87# endif
152 88
153 return false; 89 return false;
154} 90}
155 91
156bool 92bool
157bgPixmap_t::window_position_sensitive () 93rxvt_term::bg_window_position_sensitive ()
158{ 94{
159# ifdef ENABLE_TRANSPARENCY 95# ifdef ENABLE_TRANSPARENCY
160 if (flags & isTransparent) 96 if (bg_flags & BG_IS_TRANSPARENT)
161 return true; 97 return true;
162# endif 98# endif
163 99
164# ifdef BG_IMAGE_FROM_FILE 100# ifdef BG_IMAGE_FROM_FILE
165 if (have_image) 101 if (bg_flags & BG_IS_FROM_FILE)
166 { 102 {
167 if (flags & rootAlign) 103 if (bg_flags & BG_ROOT_ALIGN)
168 return true; 104 return true;
169 } 105 }
170# endif 106# endif
171 107
172 return false;
173};
174
175bool bgPixmap_t::need_client_side_rendering ()
176{
177# ifdef HAVE_AFTERIMAGE
178 if (original_asim)
179 return true;
180# endif
181 return false; 108 return false;
182} 109}
183 110
184# ifdef BG_IMAGE_FROM_FILE 111# ifdef BG_IMAGE_FROM_FILE
185static inline bool 112static inline bool
… …
223 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
224 151
225 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
226 return diff * align / 100; 153 return diff * align / 100;
227 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
229 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
231 return 0; 158 return 0;
232} 159}
233 160
234static inline int 161static inline int
235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
248 dst_size = target_size - dst_pos; 175 dst_size = target_size - dst_pos;
249 return src_pos; 176 return src_pos;
250} 177}
251 178
252bool 179bool
253bgPixmap_t::set_geometry (const char *geom) 180rxvt_term::bg_set_geometry (const char *geom, bool update)
254{ 181{
182 bool changed = false;
255 int geom_flags = 0, changed = 0; 183 int geom_flags = 0;
256 int x = 0, y = 0; 184 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
258 unsigned int n; 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
259 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 187
263 if (geom == NULL) 188 if (geom == NULL)
264 return false; 189 return false;
265 190
266 char str[MAXLEN_GEOM]; 191 if (geom[0])
267
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0');
271
272 n = (p - geom);
273 if (n < MAXLEN_GEOM)
274 { 192 {
275 char *ops; 193 char **arr = rxvt_strsplit (':', geom);
276 new_flags |= geometrySet;
277 194
278 memcpy (str, geom, n); 195 for (int i = 0; arr[i]; i++)
279 str[n] = '\0';
280 if (str[0] == ':')
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 { 196 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp); 197 if (!strcasecmp (arr[i], "style=tiled"))
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 } 198 {
294 } 199 new_flags = BG_TILE;
295 200 w = h = noScale;
296 if (ops > str || ops == NULL) 201 x = y = 0;
297 { 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
298 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 { 203 }
303 y = x; 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
304 geom_flags |= YValue;
305 } 205 {
306 206 new_flags = BG_PROP_SCALE;
307 if (flags & geometrySet) 207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
308 { 210 }
309 /* new geometry is an adjustment to the old one ! */ 211 else if (!strcasecmp (arr[i], "style=stretched"))
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 } 212 {
332 else /* setting up geometry from scratch */ 213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
333 { 216 }
334 if (!(geom_flags & XValue)) 217 else if (!strcasecmp (arr[i], "style=centered"))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 } 218 {
355 } /* done parsing geometry string */ 219 new_flags = 0;
356 else if (!(flags & geometrySet)) 220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
357 { 225 {
358 /* default geometry - scaled and centered */ 226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
286
287 if (!update)
288 {
289 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 290 x = y = defaultAlign;
291 else if (!(geom_flags & YValue))
292 y = x;
293
294 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 295 w = h = defaultScale;
361 } 296 else if (!(geom_flags & HeightValue))
297 h = w;
298 else if (!(geom_flags & WidthValue))
299 w = h;
362 300
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
302 }
365 303
366 if (ops)
367 {
368 while (*ops)
369 {
370 while (*ops == ':' || isspace(*ops)) ++ops;
371
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile"))
374 {
375 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue;
377 }
378 else if (CHECK_GEOM_OPS ("propscale"))
379 {
380 new_flags |= propScale;
381 }
382 else if (CHECK_GEOM_OPS ("hscale"))
383 {
384 if (w == 0) w = windowScale;
385
386 h = noScale;
387 geom_flags |= WidthValue|HeightValue;
388 }
389 else if (CHECK_GEOM_OPS ("vscale"))
390 {
391 if (h == 0) h = windowScale;
392
393 w = noScale;
394 geom_flags |= WidthValue|HeightValue;
395 }
396 else if (CHECK_GEOM_OPS ("scale"))
397 {
398 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale;
400
401 geom_flags |= WidthValue|HeightValue;
402 }
403 else if (CHECK_GEOM_OPS ("auto"))
404 {
405 w = h = windowScale;
406 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 }
409 else if (CHECK_GEOM_OPS ("root"))
410 {
411 new_flags |= rootAlign;
412 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue;
414 }
415# undef CHECK_GEOM_OPS
416
417 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */
419 }
420
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 305 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 306 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 308
427 if (new_flags != flags) 309 if (new_flags != bg_flags)
428 { 310 {
429 flags = new_flags; 311 bg_flags = new_flags;
430 changed++; 312 changed = true;
431 } 313 }
432 314
433 return (changed > 0); 315 return changed;
434} 316}
435 317
436void 318void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 320{
439 int target_width = target->szHint.width; 321 int target_width = szHint.width;
440 int target_height = target->szHint.height; 322 int target_height = szHint.height;
441 323
442 if (flags & propScale) 324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
327 if (bg_flags & BG_PROP_SCALE)
443 { 328 {
444 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
445 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
446 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
447 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
448 } 333 }
449 else
450 {
451 w = h_scale * target_width / 100;
452 h = v_scale * target_height / 100;
453 }
454 334
455 if (!w) w = image_width; 335 if (!w) w = image_width;
456 if (!h) h = image_height; 336 if (!h) h = image_height;
457 337
458 if (flags & rootAlign) 338 if (bg_flags & BG_ROOT_ALIGN)
459 { 339 {
460 target->get_window_origin (x, y);
461 x = -x; 340 x = -target_x;
462 y = -y; 341 y = -target_y;
463 } 342 }
464 else 343 else
465 { 344 {
466 x = make_align_position (h_align, target_width, w); 345 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
468 } 347 }
469 348
470 flags &= ~sizeSensitive; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
471 if ((flags & propScale) || h_scale || v_scale 350 if (!(bg_flags & BG_TILE)
351 || h_scale || v_scale
472 || (!(flags & rootAlign) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
473 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
474 flags |= sizeSensitive; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
475} 355}
476 356
477# ifdef HAVE_AFTERIMAGE 357# ifdef HAVE_AFTERIMAGE
478bool 358bool
479bgPixmap_t::render_image (unsigned long background_flags) 359rxvt_term::render_image (unsigned long tr_flags)
480{ 360{
481 if (target == NULL)
482 return false;
483
484 target->init_asv (); 361 init_asv ();
485 362
486 ASImage *background = NULL; 363 ASImage *background = NULL;
487 ARGB32 background_tint = TINT_LEAVE_SAME; 364 ARGB32 background_tint = TINT_LEAVE_SAME;
488 365
489# ifdef ENABLE_TRANSPARENCY 366# ifdef ENABLE_TRANSPARENCY
490 if (background_flags) 367 if (tr_flags)
491 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 368 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
492 369
493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 370 if (tr_flags & BG_NEEDS_TINT)
494 { 371 {
495 ShadingInfo as_shade; 372 ShadingInfo as_shade;
496 as_shade.shading = shade; 373 as_shade.shading = shade;
497 374
498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
499 if (flags & tintSet) 376 if (bg_flags & BG_TINT_SET)
500 tint.get (c); 377 tint.get (c);
501 as_shade.tintColor.red = c.r; 378 as_shade.tintColor.red = c.r;
502 as_shade.tintColor.green = c.g; 379 as_shade.tintColor.green = c.g;
503 as_shade.tintColor.blue = c.b; 380 as_shade.tintColor.blue = c.b;
504 381
505 background_tint = shading2tint32 (&as_shade); 382 background_tint = shading2tint32 (&as_shade);
506 } 383 }
507 384
508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
509 { 386 {
510 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 ASA_XImage,
512 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
513 if (tmp) 390 if (tmp)
514 { 391 {
515 destroy_asimage (&background); 392 destroy_asimage (&background);
516 background = tmp; 393 background = tmp;
… …
518 } 395 }
519# endif 396# endif
520 397
521 ASImage *result = 0; 398 ASImage *result = 0;
522 399
523 int target_width = target->szHint.width; 400 int target_width = szHint.width;
524 int target_height = target->szHint.height; 401 int target_height = szHint.height;
525 int new_pmap_width = target_width; 402 int new_pmap_width = target_width;
526 int new_pmap_height = target_height; 403 int new_pmap_height = target_height;
527 404
528 int x = 0; 405 int x = 0;
529 int y = 0; 406 int y = 0;
… …
532 409
533 if (original_asim) 410 if (original_asim)
534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 411 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
535 412
536 if (!original_asim 413 if (!original_asim
537 || (!(flags & rootAlign) 414 || (!(bg_flags & BG_ROOT_ALIGN)
538 && (x >= target_width 415 && (x >= target_width
539 || y >= target_height 416 || y >= target_height
540 || (x + w <= 0) 417 || x + w <= 0
541 || (y + h <= 0)))) 418 || y + h <= 0)))
542 { 419 {
543 if (background) 420 if (background)
544 { 421 {
545 new_pmap_width = background->width; 422 new_pmap_width = background->width;
546 new_pmap_height = background->height; 423 new_pmap_height = background->height;
547 result = background; 424 result = background;
548 425
549 if (background_tint != TINT_LEAVE_SAME) 426 if (background_tint != TINT_LEAVE_SAME)
550 { 427 {
551 ASImage *tmp = tile_asimage (target->asv, background, 0, 0, 428 ASImage *tmp = tile_asimage (asv, background, 0, 0,
552 target_width, target_height, background_tint, 429 target_width, target_height, background_tint,
553 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 430 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
554 if (tmp) 431 if (tmp)
555 result = tmp; 432 result = tmp;
556 } 433 }
… …
560 } 437 }
561 else 438 else
562 { 439 {
563 result = original_asim; 440 result = original_asim;
564 441
565 if ((w != original_asim->width) 442 if (w != original_asim->width
566 || (h != original_asim->height)) 443 || h != original_asim->height)
567 { 444 {
568 result = scale_asimage (target->asv, original_asim, 445 result = scale_asimage (asv, original_asim,
569 w, h, 446 w, h,
570 background ? ASA_ASImage : ASA_XImage, 447 ASA_XImage,
571 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
572 } 449 }
573 450
574 if (background == NULL) 451 if (background == NULL)
575 { 452 {
576 if (h_scale == 0 || v_scale == 0) 453 if (bg_flags & BG_TILE)
577 { 454 {
578 /* if tiling - pixmap has to be sized exactly as the image, 455 /* if tiling - pixmap has to be sized exactly as the image,
579 but there is no need to make it bigger than the window! */ 456 but there is no need to make it bigger than the window! */
580 new_pmap_width = min (result->width, target_width); 457 new_pmap_width = min (result->width, target_width);
581 new_pmap_height = min (result->height, target_height); 458 new_pmap_height = min (result->height, target_height);
582 459
583 /* we also need to tile our image in both directions */ 460 /* we also need to tile our image in both directions */
584 ASImage *tmp = tile_asimage (target->asv, result, 461 ASImage *tmp = tile_asimage (asv, result,
585 (int)result->width - x, 462 (int)result->width - x,
586 (int)result->height - y, 463 (int)result->height - y,
587 new_pmap_width, 464 new_pmap_width,
588 new_pmap_height, 465 new_pmap_height,
589 TINT_LEAVE_SAME, ASA_XImage, 466 TINT_LEAVE_SAME, ASA_XImage,
… …
606 layers[0].clip_width = target_width; 483 layers[0].clip_width = target_width;
607 layers[0].clip_height = target_height; 484 layers[0].clip_height = target_height;
608 layers[0].tint = background_tint; 485 layers[0].tint = background_tint;
609 layers[1].im = result; 486 layers[1].im = result;
610 487
611 if (h_scale == 0 || v_scale == 0) 488 if (bg_flags & BG_TILE)
612 { 489 {
613 /* tile horizontally */ 490 /* tile horizontally */
614 while (x > 0) x -= (int)result->width; 491 while (x > 0) x -= (int)result->width;
615 layers[1].dst_x = x; 492 layers[1].dst_x = x;
616 layers[1].clip_width = result->width+target_width; 493 layers[1].clip_width = result->width+target_width;
… …
620 /* clip horizontally */ 497 /* clip horizontally */
621 layers[1].dst_x = x; 498 layers[1].dst_x = x;
622 layers[1].clip_width = result->width; 499 layers[1].clip_width = result->width;
623 } 500 }
624 501
625 if (h_scale == 0 || v_scale == 0) 502 if (bg_flags & BG_TILE)
626 { 503 {
627 while (y > 0) y -= (int)result->height; 504 while (y > 0) y -= (int)result->height;
628 layers[1].dst_y = y; 505 layers[1].dst_y = y;
629 layers[1].clip_height = result->height + target_height; 506 layers[1].clip_height = result->height + target_height;
630 } 507 }
… …
632 { 509 {
633 layers[1].dst_y = y; 510 layers[1].dst_y = y;
634 layers[1].clip_height = result->height; 511 layers[1].clip_height = result->height;
635 } 512 }
636 513
637 if (target->rs[Rs_blendtype]) 514 if (rs[Rs_blendtype])
638 { 515 {
639 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 516 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
640 if (layers[1].merge_scanlines == NULL) 517 if (layers[1].merge_scanlines == NULL)
641 layers[1].merge_scanlines = alphablend_scanlines; 518 layers[1].merge_scanlines = alphablend_scanlines;
642 } 519 }
643 520
644 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 521 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
645 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 522 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
646 523
647 if (tmp) 524 if (tmp)
648 { 525 {
649 if (result != original_asim) 526 if (result != original_asim)
… …
661 if (result) 538 if (result)
662 { 539 {
663 XGCValues gcv; 540 XGCValues gcv;
664 GC gc; 541 GC gc;
665 542
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 543 /* create Pixmap */
678 if (pixmap == None) 544 if (bg_pixmap == None
545 || bg_pmap_width != new_pmap_width
546 || bg_pmap_height != new_pmap_height)
679 { 547 {
548 if (bg_pixmap)
549 XFreePixmap (dpy, bg_pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 550 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
681 pmap_width = new_pmap_width; 551 bg_pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 552 bg_pmap_height = new_pmap_height;
683 pmap_depth = target->depth;
684 } 553 }
685 /* fill with background color (if result's not completely overlapping it) */ 554 /* fill with background color (if result's not completely overlapping it) */
686 gcv.foreground = target->pix_colors[Color_bg]; 555 gcv.foreground = pix_colors[Color_bg];
687 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 556 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
688 557
689 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 558 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
690 int dst_width = result->width, dst_height = result->height; 559 int dst_width = result->width, dst_height = result->height;
691 if (background == NULL) 560 if (background == NULL)
692 { 561 {
693 if (!(h_scale == 0 || v_scale == 0)) 562 if (!(bg_flags & BG_TILE))
694 { 563 {
695 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 564 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
696 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 565 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
697 } 566 }
698 567
699 if (dst_x > 0 || dst_y > 0 568 if (dst_x > 0 || dst_y > 0
700 || dst_x + dst_width < new_pmap_width 569 || dst_x + dst_width < new_pmap_width
701 || dst_y + dst_height < new_pmap_height) 570 || dst_y + dst_height < new_pmap_height)
702 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 571 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
703 } 572 }
704 573
705 /* put result on pixmap */ 574 /* put result on pixmap */
706 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 575 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
707 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 576 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
708 577
709 if (result != background && result != original_asim) 578 if (result != background && result != original_asim)
710 destroy_asimage (&result); 579 destroy_asimage (&result);
711 580
712 XFreeGC (target->dpy, gc); 581 XFreeGC (dpy, gc);
713 582
714 ret = true; 583 ret = true;
715 } 584 }
716 585
717 if (background) 586 if (background)
… …
721} 590}
722# endif /* HAVE_AFTERIMAGE */ 591# endif /* HAVE_AFTERIMAGE */
723 592
724# ifdef HAVE_PIXBUF 593# ifdef HAVE_PIXBUF
725bool 594bool
726bgPixmap_t::render_image (unsigned long background_flags) 595rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
596 int src_x, int src_y, int dst_x, int dst_y,
597 unsigned int width, unsigned int height)
727{ 598{
728 if (target == NULL) 599 XImage *ximage;
600 char *data, *line;
601 int bytes_per_pixel;
602 int width_r, width_g, width_b;
603 int sh_r, sh_g, sh_b;
604 int rowstride;
605 int channels;
606 unsigned char *row;
607
608 if (visual->c_class != TrueColor)
729 return false; 609 return false;
730 610
611 if (depth == 24 || depth == 32)
612 bytes_per_pixel = 4;
613 else if (depth == 15 || depth == 16)
614 bytes_per_pixel = 2;
615 else
616 return false;
617
618 width_r = ecb_popcount32 (visual->red_mask);
619 width_g = ecb_popcount32 (visual->green_mask);
620 width_b = ecb_popcount32 (visual->blue_mask);
621
622 if (width_r > 8 || width_g > 8 || width_b > 8)
623 return false;
624
625 sh_r = ecb_ctz32 (visual->red_mask);
626 sh_g = ecb_ctz32 (visual->green_mask);
627 sh_b = ecb_ctz32 (visual->blue_mask);
628
629 if (width > INT_MAX / height / bytes_per_pixel)
630 return false;
631
632 data = (char *)malloc (width * height * bytes_per_pixel);
633 if (!data)
634 return false;
635
636 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
637 width, height, bytes_per_pixel * 8, 0);
638 if (!ximage)
639 {
640 free (data);
641 return false;
642 }
643
644 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
645
646 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
647 channels = gdk_pixbuf_get_n_channels (pixbuf);
648 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
649 line = data;
650
651 for (int y = 0; y < height; y++)
652 {
653 for (int x = 0; x < width; x++)
654 {
655 unsigned char *pixel = row + x * channels;
656 uint32_t value;
657
658 value = ((pixel[0] >> (8 - width_r)) << sh_r)
659 | ((pixel[1] >> (8 - width_g)) << sh_g)
660 | ((pixel[2] >> (8 - width_b)) << sh_b);
661
662 if (bytes_per_pixel == 4)
663 ((uint32_t *)line)[x] = value;
664 else
665 ((uint16_t *)line)[x] = value;
666 }
667
668 row += rowstride;
669 line += ximage->bytes_per_line;
670 }
671
672 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
673 XDestroyImage (ximage);
674 return true;
675}
676
677bool
678rxvt_term::render_image (unsigned long tr_flags)
679{
731 if (!pixbuf) 680 if (!pixbuf)
732 return false; 681 return false;
733 682
734 if (background_flags 683 if (tr_flags
735 && !(flags & HAS_RENDER)) 684 && !(bg_flags & BG_HAS_RENDER))
736 return false; 685 return false;
737 686
738 GdkPixbuf *result; 687 GdkPixbuf *result;
739 688
740 int image_width = gdk_pixbuf_get_width (pixbuf); 689 int image_width = gdk_pixbuf_get_width (pixbuf);
741 int image_height = gdk_pixbuf_get_height (pixbuf); 690 int image_height = gdk_pixbuf_get_height (pixbuf);
742 691
743 int target_width = target->szHint.width; 692 int target_width = szHint.width;
744 int target_height = target->szHint.height; 693 int target_height = szHint.height;
745 int new_pmap_width = target_width; 694 int new_pmap_width = target_width;
746 int new_pmap_height = target_height; 695 int new_pmap_height = target_height;
747 696
748 int x = 0; 697 int x = 0;
749 int y = 0; 698 int y = 0;
750 int w = 0; 699 int w = 0;
751 int h = 0; 700 int h = 0;
752 701
753 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
754 703
755 if (!(flags & rootAlign) 704 if (!(bg_flags & BG_ROOT_ALIGN)
756 && (x >= target_width 705 && (x >= target_width
757 || y >= target_height 706 || y >= target_height
758 || (x + w <= 0) 707 || x + w <= 0
759 || (y + h <= 0))) 708 || y + h <= 0))
760 return false; 709 return false;
761 710
762 result = pixbuf; 711 result = pixbuf;
763 712
764 if ((w != image_width) 713 if (w != image_width
765 || (h != image_height)) 714 || h != image_height)
766 { 715 {
767 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
768 w, h, 717 w, h,
769 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
770 } 719 }
771 720
721 if (!result)
722 return false;
723
772 bool ret = false; 724 bool ret = false;
773 725
774 if (result)
775 {
776 XGCValues gcv; 726 XGCValues gcv;
777 GC gc; 727 GC gc;
778 Pixmap root_pmap; 728 Pixmap root_pmap;
779 729
780 image_width = gdk_pixbuf_get_width (result); 730 image_width = gdk_pixbuf_get_width (result);
781 image_height = gdk_pixbuf_get_height (result); 731 image_height = gdk_pixbuf_get_height (result);
782 732
783 if (background_flags) 733 if (tr_flags)
784 { 734 {
785 root_pmap = pixmap; 735 root_pmap = bg_pixmap;
786 pixmap = None; 736 bg_pixmap = None;
737 }
738 else
739 {
740 if (bg_flags & BG_TILE)
787 } 741 {
788 else
789 {
790 if (h_scale == 0 || v_scale == 0)
791 {
792 new_pmap_width = min (image_width, target_width); 742 new_pmap_width = min (image_width, target_width);
793 new_pmap_height = min (image_height, target_height); 743 new_pmap_height = min (image_height, target_height);
794 } 744 }
795 } 745 }
796 746
747 if (bg_pixmap == None
748 || bg_pmap_width != new_pmap_width
749 || bg_pmap_height != new_pmap_height)
750 {
797 if (pixmap) 751 if (bg_pixmap)
798 {
799 if (pmap_width != new_pmap_width
800 || pmap_height != new_pmap_height
801 || pmap_depth != target->depth)
802 {
803 XFreePixmap (target->dpy, pixmap); 752 XFreePixmap (dpy, bg_pixmap);
804 pixmap = None;
805 }
806 }
807
808 if (pixmap == None)
809 {
810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 753 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
811 pmap_width = new_pmap_width; 754 bg_pmap_width = new_pmap_width;
812 pmap_height = new_pmap_height; 755 bg_pmap_height = new_pmap_height;
813 pmap_depth = target->depth; 756 }
757
758 gcv.foreground = pix_colors[Color_bg];
759 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
760
761 if (gc)
762 {
763 if (bg_flags & BG_TILE)
814 } 764 {
815
816 gcv.foreground = target->pix_colors[Color_bg];
817 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
818
819 if (h_scale == 0 || v_scale == 0)
820 {
821 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
822 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 766 pixbuf_to_pixmap (result, tile, gc,
823 0, 0, 767 0, 0,
824 0, 0, 768 0, 0,
825 image_width, image_height, 769 image_width, image_height);
826 XLIB_RGB_DITHER_NONE,
827 0, 0);
828 770
829 gcv.tile = tile; 771 gcv.tile = tile;
830 gcv.fill_style = FillTiled; 772 gcv.fill_style = FillTiled;
831 gcv.ts_x_origin = x; 773 gcv.ts_x_origin = x;
832 gcv.ts_y_origin = y; 774 gcv.ts_y_origin = y;
833 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 775 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
834 776
835 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 777 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
836 XFreePixmap (target->dpy, tile); 778 XFreePixmap (dpy, tile);
837 } 779 }
838 else 780 else
839 { 781 {
840 int src_x, src_y, dst_x, dst_y; 782 int src_x, src_y, dst_x, dst_y;
841 int dst_width, dst_height; 783 int dst_width, dst_height;
… …
844 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 786 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
845 787
846 if (dst_x > 0 || dst_y > 0 788 if (dst_x > 0 || dst_y > 0
847 || dst_x + dst_width < new_pmap_width 789 || dst_x + dst_width < new_pmap_width
848 || dst_y + dst_height < new_pmap_height) 790 || dst_y + dst_height < new_pmap_height)
849 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 791 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
850 792
851 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 793 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
852 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 794 pixbuf_to_pixmap (result, bg_pixmap, gc,
853 src_x, src_y, 795 src_x, src_y,
854 dst_x, dst_y, 796 dst_x, dst_y,
855 dst_width, dst_height, 797 dst_width, dst_height);
856 XLIB_RGB_DITHER_NONE,
857 0, 0);
858 } 798 }
859 799
860#if XRENDER 800#if XRENDER
861 if (background_flags) 801 if (tr_flags)
862 { 802 {
863 Display *dpy = target->dpy;
864 XRenderPictureAttributes pa; 803 XRenderPictureAttributes pa;
865 804
866 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual); 805 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
867 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 806 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
868 807
869 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 808 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
870 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 809 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
871 810
872 pa.repeat = True; 811 pa.repeat = True;
873 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); 812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
874 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
875 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
876 XFreePixmap (dpy, mask_pmap); 815 XFreePixmap (dpy, mask_pmap);
877 816
878 if (src && dst && mask)
879 {
880 XRenderColor mask_c; 817 XRenderColor mask_c;
881 818
882 mask_c.alpha = 0x8000; 819 mask_c.alpha = 0x8000;
883 mask_c.red = 0; 820 mask_c.red = 0;
884 mask_c.green = 0; 821 mask_c.green = 0;
885 mask_c.blue = 0; 822 mask_c.blue = 0;
886 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 823 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
887 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 824 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
888 }
889 825
890 XRenderFreePicture (dpy, src); 826 XRenderFreePicture (dpy, src);
891 XRenderFreePicture (dpy, dst); 827 XRenderFreePicture (dpy, dst);
892 XRenderFreePicture (dpy, mask); 828 XRenderFreePicture (dpy, mask);
893
894 XFreePixmap (dpy, root_pmap);
895 } 829 }
896#endif 830#endif
897 831
898 if (result != pixbuf)
899 g_object_unref (result);
900
901 XFreeGC (target->dpy, gc); 832 XFreeGC (dpy, gc);
902 833
903 ret = true; 834 ret = true;
904 } 835 }
905 836
837 if (result != pixbuf)
838 g_object_unref (result);
839
840 if (tr_flags)
841 XFreePixmap (dpy, root_pmap);
842
906 return ret; 843 return ret;
907} 844}
908# endif /* HAVE_PIXBUF */ 845# endif /* HAVE_PIXBUF */
909 846
910bool 847bool
911bgPixmap_t::set_file (const char *file) 848rxvt_term::bg_set_file (const char *file)
912{ 849{
913 if (!file || !*file) 850 if (!file || !*file)
914 return false; 851 return false;
915 852
853 bool ret = false;
916 if (const char *p = strchr (file, ';')) 854 const char *p = strchr (file, ';');
855
856 if (p)
917 { 857 {
918 size_t len = p - file; 858 size_t len = p - file;
919 char *f = rxvt_temp_buf<char> (len + 1); 859 char *f = rxvt_temp_buf<char> (len + 1);
920 memcpy (f, file, len); 860 memcpy (f, file, len);
921 f[len] = '\0'; 861 f[len] = '\0';
922 file = f; 862 file = f;
923 } 863 }
924 864
925# ifdef HAVE_AFTERIMAGE 865# ifdef HAVE_AFTERIMAGE
926 if (!target->asimman) 866 if (!asimman)
927 target->asimman = create_generic_imageman (target->rs[Rs_path]); 867 asimman = create_generic_imageman (rs[Rs_path]);
928 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 868 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
929 if (image) 869 if (image)
930 { 870 {
931 if (original_asim) 871 if (original_asim)
932 safe_asimage_destroy (original_asim); 872 safe_asimage_destroy (original_asim);
933 original_asim = image; 873 original_asim = image;
934 have_image = true; 874 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
935 return true; 875 ret = true;
936 } 876 }
937# endif 877# endif
938 878
939# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
940 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
941 if (image) 881 if (image)
942 { 882 {
943 if (pixbuf) 883 if (pixbuf)
944 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
945 pixbuf = image; 885 pixbuf = image;
946 have_image = true; 886 bg_flags |= BG_IS_FROM_FILE;
947 return true; 887 ret = true;
948 } 888 }
949# endif 889# endif
950 890
891 if (ret)
892 {
893 if (p)
894 bg_set_geometry (p + 1);
895 else
896 bg_set_default_geometry ();
897 }
898
951 return false; 899 return ret;
952} 900}
953 901
954# endif /* BG_IMAGE_FROM_FILE */ 902# endif /* BG_IMAGE_FROM_FILE */
955 903
956# ifdef ENABLE_TRANSPARENCY 904# ifdef ENABLE_TRANSPARENCY
957bool 905bool
958bgPixmap_t::set_transparent () 906rxvt_term::bg_set_transparent ()
959{ 907{
960 if (!(flags & isTransparent)) 908 if (!(bg_flags & BG_IS_TRANSPARENT))
961 { 909 {
962 flags |= isTransparent; 910 bg_flags |= BG_IS_TRANSPARENT;
963 return true; 911 return true;
964 } 912 }
965 913
966 return false; 914 return false;
967} 915}
968 916
969bool 917bool
970bgPixmap_t::set_blur_radius (const char *geom) 918rxvt_term::bg_set_blur (const char *geom)
971{ 919{
972 int changed = 0; 920 bool changed = false;
973 unsigned int hr, vr; 921 unsigned int hr, vr;
974 int junk; 922 int junk;
975 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 923 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
976 924
977 if (!(geom_flags & WidthValue)) 925 if (!(geom_flags & WidthValue))
… …
982 min_it (hr, 128); 930 min_it (hr, 128);
983 min_it (vr, 128); 931 min_it (vr, 128);
984 932
985 if (h_blurRadius != hr) 933 if (h_blurRadius != hr)
986 { 934 {
987 ++changed; 935 changed = true;
988 h_blurRadius = hr; 936 h_blurRadius = hr;
989 } 937 }
990 938
991 if (v_blurRadius != vr) 939 if (v_blurRadius != vr)
992 { 940 {
993 ++changed; 941 changed = true;
994 v_blurRadius = vr; 942 v_blurRadius = vr;
995 } 943 }
996 944
997 if (v_blurRadius == 0 && h_blurRadius == 0) 945 if (v_blurRadius == 0 && h_blurRadius == 0)
998 flags &= ~blurNeeded; 946 bg_flags &= ~BG_NEEDS_BLUR;
999 else 947 else
1000 flags |= blurNeeded; 948 bg_flags |= BG_NEEDS_BLUR;
1001 949
1002 return (changed > 0); 950 return changed;
1003} 951}
1004 952
1005static inline unsigned long 953void
1006compute_tint_shade_flags (rxvt_color *tint, int shade) 954rxvt_term::set_tint_shade_flags ()
1007{ 955{
1008 unsigned long flags = 0;
1009 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1010 bool has_shade = shade != 100; 957 bool has_shade = shade != 100;
1011 958
1012 if (tint) 959 bg_flags &= ~BG_TINT_FLAGS;
960
961 if (bg_flags & BG_TINT_SET)
1013 { 962 {
1014 tint->get (c); 963 tint.get (c);
1015# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
1016 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
1017 && IS_COMPONENT_WHOLESOME (c.g)
1018 && IS_COMPONENT_WHOLESOME (c.b))
1019 flags |= bgPixmap_t::tintWholesome;
1020# undef IS_COMPONENT_WHOLESOME
1021 }
1022
1023 if (has_shade) 964 if (!has_shade
1024 flags |= bgPixmap_t::tintNeeded; 965 && (c.r <= 0x00ff || c.r >= 0xff00)
1025 else if (tint) 966 && (c.g <= 0x00ff || c.g >= 0xff00)
967 && (c.b <= 0x00ff || c.b >= 0xff00))
968 bg_flags |= BG_TINT_BITAND;
1026 { 969 }
1027 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1028 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1029 {
1030 flags |= bgPixmap_t::tintNeeded;
1031 }
1032 }
1033 970
1034 return flags; 971 if (has_shade || (bg_flags & BG_TINT_SET))
972 bg_flags |= BG_NEEDS_TINT;
1035} 973}
1036 974
1037bool 975bool
1038bgPixmap_t::set_tint (rxvt_color &new_tint) 976rxvt_term::bg_set_tint (rxvt_color &new_tint)
1039{ 977{
1040 if (!(flags & tintSet) || tint != new_tint) 978 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
1041 { 979 {
1042 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1043 tint = new_tint; 980 tint = new_tint;
1044 flags = (flags & ~tintFlags) | new_flags | tintSet; 981 bg_flags |= BG_TINT_SET;
982 set_tint_shade_flags ();
1045 return true; 983 return true;
1046 } 984 }
1047 985
1048 return false; 986 return false;
1049} 987}
1050 988
1051bool 989bool
1052bgPixmap_t::unset_tint ()
1053{
1054 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1055
1056 if (new_flags != (flags & tintFlags))
1057 {
1058 flags = (flags & ~tintFlags) | new_flags;
1059 return true;
1060 }
1061
1062 return false;
1063}
1064
1065bool
1066bgPixmap_t::set_shade (const char *shade_str) 990rxvt_term::bg_set_shade (const char *shade_str)
1067{ 991{
1068 int new_shade = (shade_str) ? atoi (shade_str) : 100; 992 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1069 993
1070 clamp_it (new_shade, -100, 200); 994 clamp_it (new_shade, -100, 200);
1071 if (new_shade < 0) 995 if (new_shade < 0)
1072 new_shade = 200 - (100 + new_shade); 996 new_shade = 200 - (100 + new_shade);
1073 997
1074 if (new_shade != shade) 998 if (new_shade != shade)
1075 { 999 {
1076 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1077 shade = new_shade; 1000 shade = new_shade;
1078 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1001 set_tint_shade_flags ();
1079 return true; 1002 return true;
1080 } 1003 }
1081 1004
1082 return false; 1005 return false;
1083} 1006}
… …
1104 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1027 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1105} 1028}
1106#endif 1029#endif
1107 1030
1108bool 1031bool
1109bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1032rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1110{ 1033{
1111 bool ret = false; 1034 bool ret = false;
1112#if XRENDER 1035#if XRENDER
1113 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1036 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1114 double *kernel = (double *)malloc (size * sizeof (double)); 1037 double *kernel = (double *)malloc (size * sizeof (double));
1115 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1038 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1116 1039
1117 Display *dpy = target->dpy;
1118 XRenderPictureAttributes pa; 1040 XRenderPictureAttributes pa;
1119 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1041 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1120 1042
1121 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1043 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1044 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1123 1045
1124 if (kernel && params && src && dst) 1046 if (kernel && params)
1125 { 1047 {
1126 if (h_blurRadius) 1048 if (h_blurRadius)
1127 { 1049 {
1128 size = h_blurRadius * 2 + 1; 1050 size = h_blurRadius * 2 + 1;
1129 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1051 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1142 1064
1143 if (v_blurRadius) 1065 if (v_blurRadius)
1144 { 1066 {
1145 size = v_blurRadius * 2 + 1; 1067 size = v_blurRadius * 2 + 1;
1146 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1068 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1147 swap (params[0], params[1]); 1069 ::swap (params[0], params[1]);
1148 1070
1149 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1071 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1150 XRenderComposite (dpy, 1072 XRenderComposite (dpy,
1151 PictOpSrc, 1073 PictOpSrc,
1152 src, 1074 src,
… …
1168#endif 1090#endif
1169 return ret; 1091 return ret;
1170} 1092}
1171 1093
1172bool 1094bool
1173bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1095rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1174{ 1096{
1175 Display *dpy = target->dpy;
1176 bool ret = false; 1097 bool ret = false;
1177 1098
1178 if (flags & tintWholesome) 1099 if (bg_flags & BG_TINT_BITAND)
1179 { 1100 {
1180 XGCValues gcv; 1101 XGCValues gcv;
1181 GC gc; 1102 GC gc;
1182 1103
1183 /* In this case we can tint image server-side getting significant 1104 /* In this case we can tint image server-side getting significant
… …
1195 } 1116 }
1196 } 1117 }
1197 else 1118 else
1198 { 1119 {
1199# if XRENDER 1120# if XRENDER
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1121 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1201 1122
1202 if (flags & tintSet) 1123 if (bg_flags & BG_TINT_SET)
1203 tint.get (c); 1124 tint.get (c);
1204 1125
1205 if (shade <= 100) 1126 if (shade <= 100)
1206 { 1127 {
1207 c.r = (c.r * shade) / 100; 1128 c.r = c.r * shade / 100;
1208 c.g = (c.g * shade) / 100; 1129 c.g = c.g * shade / 100;
1209 c.b = (c.b * shade) / 100; 1130 c.b = c.b * shade / 100;
1210 } 1131 }
1211 else 1132 else
1212 { 1133 {
1213 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1134 c.r = c.r * (200 - shade) / 100;
1214 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1135 c.g = c.g * (200 - shade) / 100;
1215 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1136 c.b = c.b * (200 - shade) / 100;
1216 } 1137 }
1217 1138
1218 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1139 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1219 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1140 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1220 XRenderPictureAttributes pa; 1141 XRenderPictureAttributes pa;
… …
1227 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1148 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1228 XFreePixmap (dpy, overlay_pmap); 1149 XFreePixmap (dpy, overlay_pmap);
1229 1150
1230 pa.component_alpha = True; 1151 pa.component_alpha = True;
1231 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1152 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1232 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1153 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1233 XFreePixmap (dpy, mask_pmap); 1154 XFreePixmap (dpy, mask_pmap);
1234 1155
1235 if (mask_pic && overlay_pic && back_pic)
1236 {
1237 XRenderColor mask_c; 1156 XRenderColor mask_c;
1238 1157
1239 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1240 mask_c.alpha = 0xffff; 1158 mask_c.alpha = 0xffff;
1159 mask_c.red =
1160 mask_c.green =
1161 mask_c.blue = 0;
1162 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1163
1164 mask_c.alpha = 0;
1165 mask_c.red = 0xffff - c.r;
1166 mask_c.green = 0xffff - c.g;
1167 mask_c.blue = 0xffff - c.b;
1168 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1169 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1170
1171 if (shade > 100)
1172 {
1173 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1174 mask_c.alpha = 0;
1241 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1175 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1242 1176
1243 mask_c.alpha = 0;
1244 mask_c.red = 0xffff - c.r;
1245 mask_c.green = 0xffff - c.g;
1246 mask_c.blue = 0xffff - c.b;
1247 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1248 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1177 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1178 }
1179
1249 ret = true; 1180 ret = true;
1250 }
1251 1181
1252 XRenderFreePicture (dpy, mask_pic); 1182 XRenderFreePicture (dpy, mask_pic);
1253 XRenderFreePicture (dpy, overlay_pic); 1183 XRenderFreePicture (dpy, overlay_pic);
1254 XRenderFreePicture (dpy, back_pic); 1184 XRenderFreePicture (dpy, back_pic);
1255# endif 1185# endif
1256 } 1186 }
1257 1187
1258 return ret; 1188 return ret;
1259} 1189}
1260 1190
1261/* make_transparency_pixmap() 1191/*
1262 * Builds a pixmap of the same size as the terminal window that contains 1192 * Builds a pixmap of the same size as the terminal window that contains
1263 * the tiled portion of the root pixmap that is supposed to be covered by 1193 * the tiled portion of the root pixmap that is supposed to be covered by
1264 * our window. 1194 * our window.
1265 */ 1195 */
1266unsigned long 1196unsigned long
1267bgPixmap_t::make_transparency_pixmap () 1197rxvt_term::make_transparency_pixmap ()
1268{ 1198{
1269 unsigned long result = 0; 1199 unsigned long result = 0;
1270
1271 if (target == NULL)
1272 return 0;
1273 1200
1274 /* root dimensions may change from call to call - but Display structure should 1201 /* root dimensions may change from call to call - but Display structure should
1275 * be always up-to-date, so let's use it : 1202 * be always up-to-date, so let's use it :
1276 */ 1203 */
1277 int screen = target->display->screen; 1204 int screen = display->screen;
1278 Display *dpy = target->dpy;
1279 int root_depth = DefaultDepth (dpy, screen); 1205 int root_depth = DefaultDepth (dpy, screen);
1280 int root_width = DisplayWidth (dpy, screen); 1206 int root_width = DisplayWidth (dpy, screen);
1281 int root_height = DisplayHeight (dpy, screen); 1207 int root_height = DisplayHeight (dpy, screen);
1282 unsigned int root_pmap_width, root_pmap_height; 1208 unsigned int root_pmap_width, root_pmap_height;
1283 int window_width = target->szHint.width; 1209 int window_width = szHint.width;
1284 int window_height = target->szHint.height; 1210 int window_height = szHint.height;
1285 int sx, sy; 1211 int sx, sy;
1286 XGCValues gcv; 1212 XGCValues gcv;
1287 GC gc; 1213 GC gc;
1288 1214
1289 target->get_window_origin (sx, sy); 1215 sx = target_x;
1216 sy = target_y;
1290 1217
1291 /* check if we are outside of the visible part of the virtual screen : */ 1218 /* check if we are outside of the visible part of the virtual screen : */
1292 if (sx + window_width <= 0 || sy + window_height <= 0 1219 if (sx + window_width <= 0 || sy + window_height <= 0
1293 || sx >= root_width || sy >= root_height) 1220 || sx >= root_width || sy >= root_height)
1294 return 0; 1221 return 0;
… …
1298 { 1225 {
1299 Window wdummy; 1226 Window wdummy;
1300 int idummy; 1227 int idummy;
1301 unsigned int udummy; 1228 unsigned int udummy;
1302 1229
1303 target->allowedxerror = -1; 1230 allowedxerror = -1;
1304 1231
1305 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) 1232 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1306 root_pixmap = None; 1233 root_pixmap = None;
1307 1234
1308 target->allowedxerror = 0; 1235 allowedxerror = 0;
1309 } 1236 }
1310 1237
1311 Pixmap recoded_root_pmap = root_pixmap; 1238 Pixmap recoded_root_pmap = root_pixmap;
1312 1239
1313 if (root_pixmap != None && root_depth != target->depth) 1240 if (root_pixmap != None && root_depth != depth)
1314 { 1241 {
1315#if XRENDER 1242#if XRENDER
1316 if (flags & HAS_RENDER) 1243 if (bg_flags & BG_HAS_RENDER)
1317 { 1244 {
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246
1318 XRenderPictureAttributes pa; 1247 XRenderPictureAttributes pa;
1319 1248
1320 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1249 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1321 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1250 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1322 1251
1323 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1324 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1252 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1325 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1253 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1326 1254
1327 if (src && dst)
1328 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1255 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1329 else
1330 {
1331 XFreePixmap (dpy, recoded_root_pmap);
1332 root_pixmap = None;
1333 }
1334 1256
1335 XRenderFreePicture (dpy, src); 1257 XRenderFreePicture (dpy, src);
1336 XRenderFreePicture (dpy, dst); 1258 XRenderFreePicture (dpy, dst);
1337 } 1259 }
1338 else 1260 else
1339#endif 1261#endif
1340 root_pixmap = None; 1262 recoded_root_pmap = None;
1341 } 1263 }
1342 1264
1343 if (root_pixmap == None) 1265 if (recoded_root_pmap == None)
1344 return 0; 1266 return 0;
1345 1267
1268 if (bg_pixmap == None
1269 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height)
1271 {
1272 if (bg_pixmap)
1273 XFreePixmap (dpy, bg_pixmap);
1346 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1347 1275 bg_pmap_width = window_width;
1348 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1276 bg_pmap_height = window_height;
1349 return 0; 1277 }
1350 1278
1351 /* straightforward pixmap copy */ 1279 /* straightforward pixmap copy */
1280 while (sx < 0) sx += root_width;
1281 while (sy < 0) sy += root_height;
1282
1352 gcv.tile = recoded_root_pmap; 1283 gcv.tile = recoded_root_pmap;
1353 gcv.fill_style = FillTiled; 1284 gcv.fill_style = FillTiled;
1354
1355 while (sx < 0) sx += (int)root_width;
1356 while (sy < 0) sy += (int)root_height;
1357
1358 gcv.ts_x_origin = -sx; 1285 gcv.ts_x_origin = -sx;
1359 gcv.ts_y_origin = -sy; 1286 gcv.ts_y_origin = -sy;
1360 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1287 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1361 1288
1362 if (gc) 1289 if (gc)
1363 { 1290 {
1364 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1291 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1365 result |= transpPmapTiled; 1292 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1366 XFreeGC (dpy, gc); 1293 XFreeGC (dpy, gc);
1367 }
1368 1294
1369 if (tiled_root_pmap != None) 1295 if (!(bg_flags & BG_CLIENT_RENDER))
1370 {
1371 if (!need_client_side_rendering ())
1372 { 1296 {
1373 if ((flags & blurNeeded) 1297 if ((bg_flags & BG_NEEDS_BLUR)
1374 && (flags & HAS_RENDER_CONV)) 1298 && (bg_flags & BG_HAS_RENDER_CONV))
1375 {
1376 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1377 result |= transpPmapBlurred;
1378 } 1299 {
1379 if ((flags & tintNeeded) 1300 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1380 && (flags & (tintWholesome | HAS_RENDER))) 1301 result &= ~BG_NEEDS_BLUR;
1381 { 1302 }
1303 if ((bg_flags & BG_NEEDS_TINT)
1304 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1305 {
1382 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1383 result |= transpPmapTinted; 1307 result &= ~BG_NEEDS_TINT;
1384 } 1308 }
1385 } /* server side rendering completed */ 1309 } /* server side rendering completed */
1386
1387 if (pixmap)
1388 XFreePixmap (dpy, pixmap);
1389
1390 pixmap = tiled_root_pmap;
1391 pmap_width = window_width;
1392 pmap_height = window_height;
1393 pmap_depth = target->depth;
1394 } 1310 }
1395 1311
1396 if (recoded_root_pmap != root_pixmap) 1312 if (recoded_root_pmap != root_pixmap)
1397 XFreePixmap (dpy, recoded_root_pmap); 1313 XFreePixmap (dpy, recoded_root_pmap);
1398 1314
1399 return result; 1315 return result;
1400} 1316}
1401 1317
1402void 1318void
1403bgPixmap_t::set_root_pixmap () 1319rxvt_term::bg_set_root_pixmap ()
1404{ 1320{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1321 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1406 if (new_root_pixmap == None) 1322 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1323 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1408 1324
1409 root_pixmap = new_root_pixmap; 1325 root_pixmap = new_root_pixmap;
1410} 1326}
1411# endif /* ENABLE_TRANSPARENCY */ 1327# endif /* ENABLE_TRANSPARENCY */
1412 1328
1413# ifndef HAVE_AFTERIMAGE 1329#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1414static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1330static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1415# endif 1331# endif
1416 1332
1417bool 1333bool
1418bgPixmap_t::render () 1334rxvt_term::bg_render ()
1419{ 1335{
1420 unsigned long background_flags = 0; 1336 unsigned long tr_flags = 0;
1421 1337
1422 if (target == NULL)
1423 return false;
1424
1425 invalidate (); 1338 bg_invalidate ();
1426# ifdef ENABLE_TRANSPARENCY 1339# ifdef ENABLE_TRANSPARENCY
1427 if (flags & isTransparent) 1340 if (bg_flags & BG_IS_TRANSPARENT)
1428 { 1341 {
1429 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1430 background_flags = make_transparency_pixmap (); 1343 tr_flags = make_transparency_pixmap ();
1431 if (background_flags == 0) 1344 if (tr_flags == 0)
1432 return false; 1345 return false;
1433 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1346 bg_flags |= BG_IS_VALID;
1434 flags = flags & ~isInvalid;
1435 } 1347 }
1436# endif 1348# endif
1437 1349
1438# ifdef BG_IMAGE_FROM_FILE 1350# ifdef BG_IMAGE_FROM_FILE
1439 if (have_image 1351 if ((bg_flags & BG_IS_FROM_FILE)
1440 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1352 || (tr_flags & BG_EFFECTS_FLAGS))
1441 { 1353 {
1442 if (render_image (background_flags)) 1354 if (render_image (tr_flags))
1443 flags = flags & ~isInvalid; 1355 bg_flags |= BG_IS_VALID;
1444 } 1356 }
1445# endif 1357# endif
1446 1358
1359# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1447 XImage *result = NULL; 1360 XImage *result = NULL;
1448 1361
1449 if (background_flags && (flags & isInvalid)) 1362 if (tr_flags & BG_NEEDS_TINT)
1450 { 1363 {
1451 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1364 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1452 } 1365 }
1453 1366
1454 if (result) 1367 if (result)
1455 { 1368 {
1456# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1457 /* our own client-side tinting */ 1369 /* our own client-side tinting */
1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1370 //if (tr_flags & BG_NEEDS_TINT)
1371 if (1)
1459 { 1372 {
1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1461 if (flags & tintSet) 1374 if (bg_flags & BG_TINT_SET)
1462 tint.get (c); 1375 tint.get (c);
1463 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1464 } 1377 }
1465# endif
1466 1378
1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1379 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1468 1380
1469 if (gc) 1381 if (gc)
1470 { 1382 {
1471 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1472 1384
1473 XFreeGC (target->dpy, gc); 1385 XFreeGC (dpy, gc);
1474 flags = flags & ~isInvalid;
1475 } 1386 }
1476 1387
1477 XDestroyImage (result); 1388 XDestroyImage (result);
1478 } 1389 }
1390# endif
1479 1391
1480 if (flags & isInvalid) 1392 if (!(bg_flags & BG_IS_VALID))
1481 { 1393 {
1482 if (pixmap != None) 1394 if (bg_pixmap != None)
1483 { 1395 {
1484 XFreePixmap (target->dpy, pixmap); 1396 XFreePixmap (dpy, bg_pixmap);
1485 pixmap = None; 1397 bg_pixmap = None;
1486 } 1398 }
1487 } 1399 }
1488 1400
1489 apply (); 1401 scr_recolour (false);
1402 bg_flags |= BG_NEEDS_REFRESH;
1490 1403
1491 valid_since = ev::now (); 1404 bg_valid_since = ev::now ();
1492 1405
1493 return true; 1406 return true;
1494} 1407}
1495 1408
1496void 1409void
1497bgPixmap_t::set_target (rxvt_term *new_target) 1410rxvt_term::bg_init ()
1498{ 1411{
1499 target = new_target; 1412#ifdef ENABLE_TRANSPARENCY
1413 shade = 100;
1414#endif
1500 1415
1501 flags &= ~(HAS_RENDER | HAS_RENDER_CONV); 1416 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1502#if XRENDER 1417#if XRENDER
1503 int major, minor; 1418 int major, minor;
1504 if (XRenderQueryVersion (target->dpy, &major, &minor)) 1419 if (XRenderQueryVersion (dpy, &major, &minor))
1505 flags |= HAS_RENDER; 1420 bg_flags |= BG_HAS_RENDER;
1506 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt); 1421 XFilters *filters = XRenderQueryFilters (dpy, vt);
1507 if (filters) 1422 if (filters)
1508 { 1423 {
1509 for (int i = 0; i < filters->nfilter; i++) 1424 for (int i = 0; i < filters->nfilter; i++)
1510 if (!strcmp (filters->filter[i], FilterConvolution)) 1425 if (!strcmp (filters->filter[i], FilterConvolution))
1511 flags |= HAS_RENDER_CONV; 1426 bg_flags |= BG_HAS_RENDER_CONV;
1512 1427
1513 XFree (filters); 1428 XFree (filters);
1514 } 1429 }
1515#endif 1430#endif
1516} 1431}
1517 1432
1518void
1519bgPixmap_t::apply ()
1520{
1521 if (target == NULL)
1522 return;
1523
1524 if (pixmap != None)
1525 {
1526 /* set target's background to pixmap */
1527# ifdef ENABLE_TRANSPARENCY
1528 if (flags & isTransparent)
1529 {
1530 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1531 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1532
1533 if (target->scrollBar.win)
1534 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1535 }
1536 else
1537# endif
1538 {
1539 /* force old pixmap dereference in case it was transparent before :*/
1540 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1541 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1542 /* do we also need to set scrollbar's background here ? */
1543
1544 if (target->scrollBar.win)
1545 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1546 }
1547 }
1548 else
1549 {
1550 /* set target background to a pixel */
1551 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1552 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1553 /* do we also need to set scrollbar's background here ? */
1554 if (target->scrollBar.win)
1555 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1556 }
1557
1558 /* don't want Expose on the parent or vt. It is better to use
1559 scr_touch or we get a great deal of flicker otherwise: */
1560 XClearWindow (target->dpy, target->parent[0]);
1561
1562 if (target->scrollBar.state && target->scrollBar.win)
1563 {
1564 target->scrollBar.state = STATE_IDLE;
1565 target->scrollBar.show (0);
1566 }
1567
1568 target->want_refresh = 1;
1569 flags |= hasChanged;
1570}
1571
1572#endif /* HAVE_BG_PIXMAP */ 1433#endif /* HAVE_BG_PIXMAP */
1573 1434
1574#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1435#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1575/* taken from aterm-0.4.2 */ 1436/* based on code from aterm-0.4.2 */
1576 1437
1577static void 1438static void
1578ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1439shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1579{ 1440{
1580 int sh_r, sh_g, sh_b; 1441 int sh_r, sh_g, sh_b;
1581 uint32_t mask_r, mask_g, mask_b; 1442 uint32_t mask_r, mask_g, mask_b;
1582 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1443 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1583 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1444 rgba low;
1584 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1445 rgba high;
1585 int i; 1446 int i;
1586 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1447 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1587 1448
1588 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1449 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1589 1450
1590 /* for convenience */ 1451 /* for convenience */
1591 mask_r = visual->red_mask; 1452 mask_r = visual->red_mask;
1592 mask_g = visual->green_mask; 1453 mask_g = visual->green_mask;
1593 mask_b = visual->blue_mask; 1454 mask_b = visual->blue_mask;
1594 1455
1595 /* boring lookup table pre-initialization */ 1456 /* boring lookup table pre-initialization */
1596 switch (srcImage->depth) 1457 switch (ximage->depth)
1597 { 1458 {
1598 case 15: 1459 case 15:
1599 if ((mask_r != 0x7c00) || 1460 if ((mask_r != 0x7c00) ||
1600 (mask_g != 0x03e0) || 1461 (mask_g != 0x03e0) ||
1601 (mask_b != 0x001f)) 1462 (mask_b != 0x001f))
… …
1654 /* prepare limits for color transformation (each channel is handled separately) */ 1515 /* prepare limits for color transformation (each channel is handled separately) */
1655 if (shade > 100) 1516 if (shade > 100)
1656 { 1517 {
1657 shade = 200 - shade; 1518 shade = 200 - shade;
1658 1519
1659 lower_lim_r = 65535-rm; 1520 high.r = c.r * shade / 100;
1660 lower_lim_g = 65535-gm; 1521 high.g = c.g * shade / 100;
1661 lower_lim_b = 65535-bm; 1522 high.b = c.b * shade / 100;
1662 1523
1663 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1524 low.r = 65535 * (100 - shade) / 100;
1664 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1525 low.g = 65535 * (100 - shade) / 100;
1665 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1526 low.b = 65535 * (100 - shade) / 100;
1666
1667 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1668 } 1527 }
1669 else 1528 else
1670 { 1529 {
1530 high.r = c.r * shade / 100;
1531 high.g = c.g * shade / 100;
1532 high.b = c.b * shade / 100;
1671 1533
1672 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1534 low.r = low.g = low.b = 0;
1673
1674 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1675 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1676 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1677 } 1535 }
1678 1536
1679 /* fill our lookup tables */ 1537 /* fill our lookup tables */
1680 for (i = 0; i <= mask_r>>sh_r; i++) 1538 for (i = 0; i <= mask_r>>sh_r; i++)
1681 { 1539 {
1682 uint32_t tmp; 1540 uint32_t tmp;
1683 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1541 tmp = i * high.r;
1684 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1542 tmp += (mask_r>>sh_r) * low.r;
1685 lookup_r[i] = (tmp/65535)<<sh_r; 1543 lookup_r[i] = (tmp/65535)<<sh_r;
1686 } 1544 }
1687 for (i = 0; i <= mask_g>>sh_g; i++) 1545 for (i = 0; i <= mask_g>>sh_g; i++)
1688 { 1546 {
1689 uint32_t tmp; 1547 uint32_t tmp;
1690 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1548 tmp = i * high.g;
1691 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1549 tmp += (mask_g>>sh_g) * low.g;
1692 lookup_g[i] = (tmp/65535)<<sh_g; 1550 lookup_g[i] = (tmp/65535)<<sh_g;
1693 } 1551 }
1694 for (i = 0; i <= mask_b>>sh_b; i++) 1552 for (i = 0; i <= mask_b>>sh_b; i++)
1695 { 1553 {
1696 uint32_t tmp; 1554 uint32_t tmp;
1697 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1555 tmp = i * high.b;
1698 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1556 tmp += (mask_b>>sh_b) * low.b;
1699 lookup_b[i] = (tmp/65535)<<sh_b; 1557 lookup_b[i] = (tmp/65535)<<sh_b;
1700 } 1558 }
1701 1559
1702 /* apply table to input image (replacing colors by newly calculated ones) */ 1560 /* apply table to input image (replacing colors by newly calculated ones) */
1703 if (srcImage->bits_per_pixel == 32 1561 if (ximage->bits_per_pixel == 32
1704 && (srcImage->depth == 24 || srcImage->depth == 32) 1562 && (ximage->depth == 24 || ximage->depth == 32)
1705 && srcImage->byte_order == host_byte_order) 1563 && ximage->byte_order == host_byte_order)
1706 { 1564 {
1707 uint32_t *p1, *pf, *p, *pl; 1565 uint32_t *p1, *pf, *p, *pl;
1708 p1 = (uint32_t *) srcImage->data; 1566 p1 = (uint32_t *) ximage->data;
1709 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1567 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1710 1568
1711 while (p1 < pf) 1569 while (p1 < pf)
1712 { 1570 {
1713 p = p1; 1571 p = p1;
1714 pl = p1 + srcImage->width; 1572 pl = p1 + ximage->width;
1715 for (; p < pl; p++) 1573 for (; p < pl; p++)
1716 { 1574 {
1717 *p = lookup_r[(*p & 0xff0000) >> 16] | 1575 *p = lookup_r[(*p & 0xff0000) >> 16] |
1718 lookup_g[(*p & 0x00ff00) >> 8] | 1576 lookup_g[(*p & 0x00ff00) >> 8] |
1719 lookup_b[(*p & 0x0000ff)] | 1577 lookup_b[(*p & 0x0000ff)] |
1720 (*p & 0xff000000); 1578 (*p & 0xff000000);
1721 } 1579 }
1722 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1580 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1723 } 1581 }
1724 } 1582 }
1725 else 1583 else
1726 { 1584 {
1727 for (int y = 0; y < srcImage->height; y++) 1585 for (int y = 0; y < ximage->height; y++)
1728 for (int x = 0; x < srcImage->width; x++) 1586 for (int x = 0; x < ximage->width; x++)
1729 { 1587 {
1730 unsigned long pixel = XGetPixel (srcImage, x, y); 1588 unsigned long pixel = XGetPixel (ximage, x, y);
1731 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1589 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1732 lookup_g[(pixel & mask_g) >> sh_g] | 1590 lookup_g[(pixel & mask_g) >> sh_g] |
1733 lookup_b[(pixel & mask_b) >> sh_b]; 1591 lookup_b[(pixel & mask_b) >> sh_b];
1734 XPutPixel (srcImage, x, y, pixel); 1592 XPutPixel (ximage, x, y, pixel);
1735 } 1593 }
1736 } 1594 }
1737 1595
1738 free (lookup); 1596 free (lookup);
1739} 1597}

Diff Legend

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