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

Diff Legend

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