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.131 by sf-exg, Mon Jan 10 19:58:24 2011 UTC vs.
Revision 1.145 by sf-exg, Fri Jan 28 00:21:10 2011 UTC

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

Diff Legend

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