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.133 by sf-exg, Tue Jan 11 09:21:14 2011 UTC vs.
Revision 1.145 by sf-exg, Fri Jan 28 00:21:10 2011 UTC

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

Diff Legend

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