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

Diff Legend

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