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

Diff Legend

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