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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines