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

Diff Legend

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