ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

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

Diff Legend

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