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

Diff Legend

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