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

Diff Legend

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