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.13 by sasha, Thu Nov 15 18:40:10 2007 UTC vs.
Revision 1.27 by ayin, Sun Jan 27 22:48:33 2008 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv;\
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
… …
87 * scale Scale both up and down 85 * scale Scale both up and down
88 * auto Same as 100x100+50+50 86 * auto Same as 100x100+50+50
89 */ 87 */
90 88
91#ifdef HAVE_BG_PIXMAP 89#ifdef HAVE_BG_PIXMAP
92bgPixmap_t::bgPixmap_t() 90bgPixmap_t::bgPixmap_t ()
93{ 91{
92 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 94#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 95 original_asim = NULL;
96#endif 96#endif
97#ifdef BG_IMAGE_FROM_FILE 97#ifdef BG_IMAGE_FROM_FILE
98 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
99 h_align = v_align = 0; 99 h_align = v_align = 0;
100#endif 100#endif
101 flags = 0; 101 flags = 0;
102 pixmap = None; 102 pixmap = None;
103 valid_since = invalid_since = 0;
104 target = 0;
103} 105}
104 106
105bgPixmap_t::~bgPixmap_t() 107void
108bgPixmap_t::destroy ()
106{ 109{
107#ifdef HAVE_AFTERIMAGE 110#ifdef HAVE_AFTERIMAGE
108 if (original_asim) 111 if (original_asim)
109 safe_asimage_destroy (original_asim); 112 safe_asimage_destroy (original_asim);
110#endif 113#endif
114
111 if (pixmap && target) 115 if (pixmap && target)
112 XFreePixmap (target->dpy, pixmap); 116 XFreePixmap (target->dpy, pixmap);
113} 117}
114 118
115bool 119bool
… …
120 return true; 124 return true;
121# endif 125# endif
122 126
123# ifdef BG_IMAGE_FROM_FILE 127# ifdef BG_IMAGE_FROM_FILE
124# ifdef HAVE_AFTERIMAGE 128# ifdef HAVE_AFTERIMAGE
125 if (original_asim != NULL) 129 if (original_asim)
126# endif 130# endif
127 { 131 {
128 if (h_scale != 0 || v_scale != 0 132 if (h_scale != 0 || v_scale != 0
129 || h_align != 0 || v_align != 0) 133 || h_align != 0 || v_align != 0)
130 return true; 134 return true;
… …
142 return true; 146 return true;
143# endif 147# endif
144 148
145# ifdef BG_IMAGE_FROM_FILE 149# ifdef BG_IMAGE_FROM_FILE
146# ifdef HAVE_AFTERIMAGE 150# ifdef HAVE_AFTERIMAGE
147 if (original_asim != NULL) 151 if (original_asim)
148# endif 152# endif
149 { 153 {
150 if (h_align == rootAlign || v_align == rootAlign) 154 if (h_align == rootAlign || v_align == rootAlign)
151 return true; 155 return true;
152 } 156 }
… …
156}; 160};
157 161
158bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
159{ 163{
160# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
161 if (original_asim != NULL) 165 if (original_asim)
162 return true; 166 return true;
163# endif 167# endif
164# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
165 if (flags & isTransparent) 169 if (flags & isTransparent)
166 { 170 {
… …
256 int x = 0, y = 0; 260 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
258 unsigned int n; 262 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
260 char *p; 264 char *p;
261# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 266
263 if (geom == NULL) 267 if (geom == NULL)
264 return false; 268 return false;
265 269
266 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
… …
273 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
274 { 278 {
275 char *ops; 279 char *ops;
276 new_flags |= geometrySet; 280 new_flags |= geometrySet;
277 281
278 strncpy (str, geom, n); 282 memcpy (str, geom, n);
279 str[n] = '\0'; 283 str[n] = '\0';
280 if (str[0] == ':') 284 if (str[0] == ':')
281 ops = &str[0]; 285 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0]; 287 ops = &str[0];
… …
303 y = x; 307 y = x;
304 geom_flags |= YValue; 308 geom_flags |= YValue;
305 } 309 }
306 310
307 if (flags & geometrySet) 311 if (flags & geometrySet)
312 {
308 {/* new geometry is an adjustment to the old one ! */ 313 /* new geometry is an adjustment to the old one ! */
309 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 314 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
310 { 315 {
311 if (w == 0 && h != 0) 316 if (w == 0 && h != 0)
312 { 317 {
313 w = h_scale; 318 w = h_scale;
… …
329 } 334 }
330 } 335 }
331 else /* setting up geometry from scratch */ 336 else /* setting up geometry from scratch */
332 { 337 {
333 if (!(geom_flags & XValue)) 338 if (!(geom_flags & XValue))
339 {
334 {/* use default geometry - centered */ 340 /* use default geometry - centered */
335 x = y = defaultAlign; 341 x = y = defaultAlign;
336 } 342 }
337 else if (!(geom_flags & YValue)) 343 else if (!(geom_flags & YValue))
338 y = x; 344 y = x;
339 345
340 if ((geom_flags & (WidthValue|HeightValue)) == 0) 346 if ((geom_flags & (WidthValue|HeightValue)) == 0)
347 {
341 {/* use default geometry - scaled */ 348 /* use default geometry - scaled */
342 w = h = defaultScale; 349 w = h = defaultScale;
343 } 350 }
344 else if (geom_flags & WidthValue) 351 else if (geom_flags & WidthValue)
345 { 352 {
346 if (!(geom_flags & HeightValue)) 353 if (!(geom_flags & HeightValue))
… …
349 else 356 else
350 w = h; 357 w = h;
351 } 358 }
352 } /* done parsing geometry string */ 359 } /* done parsing geometry string */
353 else if (!(flags & geometrySet)) 360 else if (!(flags & geometrySet))
361 {
354 { /* default geometry - scaled and centered */ 362 /* default geometry - scaled and centered */
355 x = y = defaultAlign; 363 x = y = defaultAlign;
356 w = h = defaultScale; 364 w = h = defaultScale;
357 } 365 }
358 366
359 if (!(flags & geometrySet)) 367 if (!(flags & geometrySet))
… …
362 if (ops) 370 if (ops)
363 { 371 {
364 while (*ops) 372 while (*ops)
365 { 373 {
366 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
367# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 376# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
368 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
369 { 378 {
370 w = h = noScale; 379 w = h = noScale;
371 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
372 } 381 }
373 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
374 { 383 {
375 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
376 { 385 {
377 w = windowScale; 386 w = windowScale;
378 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
379 } 388 }
380 new_flags |= propScale; 389 new_flags |= propScale;
381 } 390 }
382 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
383 { 392 {
384 if (w == 0)
385 w = windowScale; 393 if (w == 0) w = windowScale;
394
386 h = noScale; 395 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
388 } 397 }
389 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
390 { 399 {
391 if (h == 0)
392 h = windowScale; 400 if (h == 0) h = windowScale;
401
393 w = noScale; 402 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
395 } 404 }
396 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
397 { 406 {
398 if (h == 0)
399 h = windowScale; 407 if (h == 0) h = windowScale;
400 if (w == 0)
401 w = windowScale; 408 if (w == 0) w = windowScale;
409
402 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
403 } 411 }
404 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
405 { 413 {
406 w = h = windowScale; 414 w = h = windowScale;
407 x = y = centerAlign; 415 x = y = centerAlign;
408 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
409 } 417 }
410 else if (CHECK_GEOM_OPS("root")) 418 else if (CHECK_GEOM_OPS ("root"))
411 { 419 {
412 w = h = noScale; 420 w = h = noScale;
413 x = y = rootAlign; 421 x = y = rootAlign;
414 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
415 } 423 }
416# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
417 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 427 } /* done parsing ops */
419 } 428 }
420 429
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
422 ++changed;
423 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
424 ++changed;
425 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
426 ++changed;
427 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
428 ++changed;
429 } 434 }
430 435
431 if (new_flags != flags) 436 if (new_flags != flags)
432 { 437 {
433 flags = new_flags; 438 flags = new_flags;
434 changed++; 439 changed++;
435 } 440 }
441
436//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
437// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
438 return (changed > 0); 444 return (changed > 0);
439} 445}
440 446
441# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
… …
463 { 469 {
464 target->get_window_origin(x, y); 470 target->get_window_origin(x, y);
465 x = -x; 471 x = -x;
466 y = -y; 472 y = -y;
467 } 473 }
474
468 if (h_align != rootAlign) 475 if (h_align != rootAlign)
469 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 476 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
477
470 if (v_align != rootAlign) 478 if (v_align != rootAlign)
471 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 479 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
472 } 480 }
473 481
474 if (original_asim == NULL 482 if (!original_asim
475 || x >= target_width 483 || x >= target_width
476 || y >= target_height 484 || y >= target_height
477 || (w > 0 && x + w <= 0) 485 || (w > 0 && x + w <= 0)
478 || (h > 0 && y + h <= 0)) 486 || (h > 0 && y + h <= 0))
479 { 487 {
480 if (background) 488 if (background)
481 { 489 {
482 new_pmap_width = background->width; 490 new_pmap_width = background->width;
483 new_pmap_height = background->height; 491 new_pmap_height = background->height;
484 result = background; 492 result = background;
493
485 if (background_tint != TINT_LEAVE_SAME) 494 if (background_tint != TINT_LEAVE_SAME)
486 { 495 {
487 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 496 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
488 target_width, target_height, background_tint, 497 target_width, target_height, background_tint,
489 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 498 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
… …
495 new_pmap_width = new_pmap_height = 0; 504 new_pmap_width = new_pmap_height = 0;
496 } 505 }
497 else 506 else
498 { 507 {
499 result = original_asim; 508 result = original_asim;
509
500 if ((w > 0 && w != original_asim->width) 510 if ((w > 0 && w != original_asim->width)
501 || (h > 0 && h != original_asim->height)) 511 || (h > 0 && h != original_asim->height))
502 { 512 {
503 result = scale_asimage (target->asv, original_asim, 513 result = scale_asimage (target->asv, original_asim,
504 w > 0 ? w : original_asim->width, 514 w > 0 ? w : original_asim->width,
505 h > 0 ? h : original_asim->height, 515 h > 0 ? h : original_asim->height,
506 background ? ASA_ASImage : ASA_XImage, 516 background ? ASA_ASImage : ASA_XImage,
507 100, ASIMAGE_QUALITY_DEFAULT); 517 100, ASIMAGE_QUALITY_DEFAULT);
508 } 518 }
519
509 if (background == NULL) 520 if (background == NULL)
521 {
510 {/* if tiling - pixmap has to be sized exactly as the image, 522 /* if tiling - pixmap has to be sized exactly as the image,
511 but there is no need to make it bigger then the window! */ 523 but there is no need to make it bigger than the window! */
512 if (h_scale == 0) 524 if (h_scale == 0)
513 new_pmap_width = min (result->width, target_width); 525 new_pmap_width = min (result->width, target_width);
514 if (v_scale == 0) 526 if (v_scale == 0)
515 new_pmap_height = min (result->height, target_height); 527 new_pmap_height = min (result->height, target_height);
516 /* we also need to tile our image in one or both directions */ 528 /* we also need to tile our image in one or both directions */
517 if (h_scale == 0 || v_scale == 0) 529 if (h_scale == 0 || v_scale == 0)
518 { 530 {
519 ASImage *tmp = tile_asimage (target->asv, result, 531 ASImage *tmp = tile_asimage (target->asv, result,
520 (h_scale > 0) ? 0 : (int)result->width - x, 532 (h_scale > 0) ? 0 : (int)result->width - x,
521 (v_scale > 0) ? 0 : (int)result->height - y, 533 (v_scale > 0) ? 0 : (int)result->height - y,
522 new_pmap_width, 534 new_pmap_width,
523 new_pmap_height, 535 new_pmap_height,
524 TINT_LEAVE_SAME, ASA_XImage, 536 TINT_LEAVE_SAME, ASA_XImage,
525 100, ASIMAGE_QUALITY_DEFAULT); 537 100, ASIMAGE_QUALITY_DEFAULT);
526 if (tmp) 538 if (tmp)
527 { 539 {
528 if (result != original_asim) 540 if (result != original_asim)
529 destroy_asimage (&result); 541 destroy_asimage (&result);
542
530 result = tmp; 543 result = tmp;
531 } 544 }
532 } 545 }
533 } 546 }
534 else 547 else
548 {
535 {/* if blending background and image - pixmap has to be sized same as target window */ 549 /* if blending background and image - pixmap has to be sized same as target window */
536 ASImageLayer *layers = create_image_layers (2); 550 ASImageLayer *layers = create_image_layers (2);
537 ASImage *merged_im = NULL; 551 ASImage *merged_im = NULL;
538 552
539 layers[0].im = background; 553 layers[0].im = background;
540 layers[0].clip_width = target_width; 554 layers[0].clip_width = target_width;
541 layers[0].clip_height = target_height; 555 layers[0].clip_height = target_height;
542 layers[0].tint = background_tint; 556 layers[0].tint = background_tint;
543 layers[1].im = result; 557 layers[1].im = result;
558
544 if (w <= 0) 559 if (w <= 0)
560 {
545 {/* tile horizontally */ 561 /* tile horizontally */
546 while (x > 0) x -= (int)result->width; 562 while (x > 0) x -= (int)result->width;
547 layers[1].dst_x = x; 563 layers[1].dst_x = x;
548 layers[1].clip_width = result->width+target_width; 564 layers[1].clip_width = result->width+target_width;
549 } 565 }
550 else 566 else
567 {
551 {/* clip horizontally */ 568 /* clip horizontally */
552 layers[1].dst_x = x; 569 layers[1].dst_x = x;
553 layers[1].clip_width = result->width; 570 layers[1].clip_width = result->width;
554 } 571 }
572
555 if (h <= 0) 573 if (h <= 0)
556 { 574 {
557 while (y > 0) y -= (int)result->height; 575 while (y > 0) y -= (int)result->height;
558 layers[1].dst_y = y; 576 layers[1].dst_y = y;
559 layers[1].clip_height = result->height + target_height; 577 layers[1].clip_height = result->height + target_height;
… …
561 else 579 else
562 { 580 {
563 layers[1].dst_y = y; 581 layers[1].dst_y = y;
564 layers[1].clip_height = result->height; 582 layers[1].clip_height = result->height;
565 } 583 }
584
566 if (target->rs[Rs_blendtype]) 585 if (target->rs[Rs_blendtype])
567 { 586 {
568 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 587 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
569 if (layers[1].merge_scanlines == NULL) 588 if (layers[1].merge_scanlines == NULL)
570 layers[1].merge_scanlines = alphablend_scanlines; 589 layers[1].merge_scanlines = alphablend_scanlines;
571 } 590 }
591
572 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 592 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
573 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 593 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
594
574 if (tmp) 595 if (tmp)
575 { 596 {
576 if (result != original_asim) 597 if (result != original_asim)
577 destroy_asimage (&result); 598 destroy_asimage (&result);
599
578 result = tmp; 600 result = tmp;
579 } 601 }
602
580 free (layers); 603 free (layers);
581 } 604 }
582 } 605 }
583 TIMING_TEST_PRINT_RESULT (asim); 606 TIMING_TEST_PRINT_RESULT (asim);
584 607
… …
613 636
614 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 637 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
615 int dst_width = result->width, dst_height = result->height; 638 int dst_width = result->width, dst_height = result->height;
616 if (background == NULL) 639 if (background == NULL)
617 { 640 {
618 if (h_scale > 0)
619 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 641 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
620 if (v_scale > 0)
621 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 642 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
622 643
623 if (dst_x > 0 || dst_y > 0 644 if (dst_x > 0 || dst_y > 0
624 || dst_x + dst_width < new_pmap_width 645 || dst_x + dst_width < new_pmap_width
625 || dst_y + dst_height < new_pmap_height) 646 || dst_y + dst_height < new_pmap_height)
626 {
627 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 647 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
628 }
629 } 648 }
630 649
631 /* put result on pixmap */ 650 /* put result on pixmap */
632 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 651 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
633 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 652 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
646bool 665bool
647bgPixmap_t::set_file (const char *file) 666bgPixmap_t::set_file (const char *file)
648{ 667{
649 char *f; 668 char *f;
650 669
651 assert (file != NULL); 670 assert (file);
652 671
653 if (*file != '\0') 672 if (*file)
654 { 673 {
655# ifdef HAVE_AFTERIMAGE 674# ifdef HAVE_AFTERIMAGE
656 if (target->asimman == NULL) 675 if (target->asimman == NULL)
657 target->asimman = create_generic_imageman (target->rs[Rs_path]); 676 target->asimman = create_generic_imageman (target->rs[Rs_path]);
677
658 if ((f = strchr (file, ';')) == NULL) 678 if ((f = strchr (file, ';')) == NULL)
659 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 679 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
660 else 680 else
661 { 681 {
662 size_t len = f - file; 682 size_t len = f - file;
663 f = (char *)malloc (len + 1); 683 f = (char *)malloc (len + 1);
664 strncpy (f, file, len); 684 memcpy (f, file, len);
665 f[len] = '\0'; 685 f[len] = '\0';
666 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
667 free (f); 687 free (f);
668 } 688 }
689
669 return (original_asim != NULL); 690 return original_asim;
670# endif 691# endif
671 } 692 }
693
672 return false; 694 return false;
673} 695}
674 696
675# endif /* BG_IMAGE_FROM_FILE */ 697# endif /* BG_IMAGE_FROM_FILE */
676 698
… …
681 if (!(flags & isTransparent)) 703 if (!(flags & isTransparent))
682 { 704 {
683 flags |= isTransparent; 705 flags |= isTransparent;
684 return true; 706 return true;
685 } 707 }
708
686 return false; 709 return false;
687} 710}
688 711
689bool 712bool
690bgPixmap_t::set_blur_radius (const char *geom) 713bgPixmap_t::set_blur_radius (const char *geom)
… …
771 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 794 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
772 tint = new_tint; 795 tint = new_tint;
773 flags = (flags & ~tintFlags) | new_flags | tintSet; 796 flags = (flags & ~tintFlags) | new_flags | tintSet;
774 return true; 797 return true;
775 } 798 }
799
776 return false; 800 return false;
777} 801}
778 802
779bool 803bool
780bgPixmap_t::unset_tint () 804bgPixmap_t::unset_tint ()
… …
784 if (new_flags != (flags & tintFlags)) 808 if (new_flags != (flags & tintFlags))
785 { 809 {
786 flags = (flags&~tintFlags)|new_flags; 810 flags = (flags&~tintFlags)|new_flags;
787 return true; 811 return true;
788 } 812 }
813
789 return false; 814 return false;
790} 815}
791 816
792bool 817bool
793bgPixmap_t::set_shade (const char *shade_str) 818bgPixmap_t::set_shade (const char *shade_str)
794{ 819{
795 int new_shade = (shade_str) ? atoi (shade_str) : 0; 820 int new_shade = (shade_str) ? atoi (shade_str) : 0;
796 821
797 if (new_shade < 0 && new_shade > -100) 822 if (new_shade < 0 && new_shade > -100)
798 new_shade = 200 - (100 + new_shade); 823 new_shade = 200 - (100 + new_shade);
799 else if (new_shade == 100) 824 else if (new_shade == 100)
800 new_shade = 0; 825 new_shade = 0;
801 826
802 if (new_shade != shade) 827 if (new_shade != shade)
803 { 828 {
804 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 829 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
805 shade = new_shade; 830 shade = new_shade;
806 flags = (flags & (~tintFlags | tintSet)) | new_flags; 831 flags = (flags & (~tintFlags | tintSet)) | new_flags;
807 return true; 832 return true;
808 } 833 }
834
809 return false; 835 return false;
810} 836}
811 837
812/* make_transparency_pixmap() 838/* make_transparency_pixmap()
813 * Builds a pixmap sized the same as terminal window, with depth same as the root window 839 * Builds a pixmap sized the same as terminal window, with depth same as the root window
… …
843 if (sx + window_width <= 0 || sy + window_height <= 0 869 if (sx + window_width <= 0 || sy + window_height <= 0
844 || sx >= root_width || sy >= root_height) 870 || sx >= root_width || sy >= root_height)
845 return 0; 871 return 0;
846 872
847 if (root_pixmap != None) 873 if (root_pixmap != None)
874 {
848 {/* we want to validate the pixmap and get it's size at the same time : */ 875 /* we want to validate the pixmap and get it's size at the same time : */
849 int junk; 876 int junk;
850 unsigned int ujunk; 877 unsigned int ujunk;
851 /* root pixmap may be bad - allow a error */ 878 /* root pixmap may be bad - allow a error */
852 target->allowedxerror = -1; 879 target->allowedxerror = -1;
853 880
… …
862 889
863 if (tiled_root_pmap == None) /* something really bad happened - abort */ 890 if (tiled_root_pmap == None) /* something really bad happened - abort */
864 return 0; 891 return 0;
865 892
866 if (root_pixmap == None) 893 if (root_pixmap == None)
894 {
867 { /* use tricks to obtain the root background image :*/ 895 /* use tricks to obtain the root background image :*/
868 /* we want to create Overrideredirect window overlapping out window 896 /* we want to create Overrideredirect window overlapping out window
869 with background type of Parent Relative and then grab it */ 897 with background type of Parent Relative and then grab it */
870 XSetWindowAttributes attr; 898 XSetWindowAttributes attr;
871 Window src; 899 Window src;
872 bool success = false; 900 bool success = false;
… …
887 XGrabServer (dpy); 915 XGrabServer (dpy);
888 XMapRaised (dpy, src); 916 XMapRaised (dpy, src);
889 XSync (dpy, False); 917 XSync (dpy, False);
890 918
891 /* XSync should get window where it's properly exposed, 919 /* XSync should get window where it's properly exposed,
892 * but to be on the safe side - let's check for the actuall event to arrive : */ 920 * but to be on the safe side - let's check for the actual event to arrive : */
893 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 921 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
894 ++ev_count; 922 ++ev_count;
895 923
896 if (ev_count > 0); 924 if (ev_count > 0);
925 {
897 { /* hooray! - we can grab the image! */ 926 /* hooray! - we can grab the image! */
898 gc = XCreateGC (dpy, root, 0, NULL); 927 gc = XCreateGC (dpy, root, 0, NULL);
899 if (gc) 928 if (gc)
900 { 929 {
901 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 930 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
902 success = true; 931 success = true;
903 } 932 }
904 } 933 }
934
905 XDestroyWindow (dpy, src); 935 XDestroyWindow (dpy, src);
906 XUngrabServer (dpy); 936 XUngrabServer (dpy);
907 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 937 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
908 } 938 }
909 939
… …
914 } 944 }
915 else 945 else
916 result |= transpPmapTiled; 946 result |= transpPmapTiled;
917 } 947 }
918 else 948 else
949 {
919 {/* strightforward pixmap copy */ 950 /* strightforward pixmap copy */
920 gcv.tile = root_pixmap; 951 gcv.tile = root_pixmap;
921 gcv.fill_style = FillTiled; 952 gcv.fill_style = FillTiled;
922 953
923 while (sx < 0) sx += (int)root_width; 954 while (sx < 0) sx += (int)root_width;
924 while (sy < 0) sy += (int)root_height; 955 while (sy < 0) sy += (int)root_height;
… …
972 { 1003 {
973 c.r = (c.r * shade) / 100; 1004 c.r = (c.r * shade) / 100;
974 c.g = (c.g * shade) / 100; 1005 c.g = (c.g * shade) / 100;
975 c.b = (c.b * shade) / 100; 1006 c.b = (c.b * shade) / 100;
976 } 1007 }
977 else if( shade > 100 && shade < 200) 1008 else if (shade > 100 && shade < 200)
978 { 1009 {
979 c.r = (c.r * (200 - shade)) / 100; 1010 c.r = (c.r * (200 - shade)) / 100;
980 c.g = (c.g * (200 - shade)) / 100; 1011 c.g = (c.g * (200 - shade)) / 100;
981 c.b = (c.b * (200 - shade)) / 100; 1012 c.b = (c.b * (200 - shade)) / 100;
982 } 1013 }
… …
1028 mask_c.blue = 0xffff - c.b; 1059 mask_c.blue = 0xffff - c.b;
1029 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1060 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1030 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1061 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1031 result |= transpPmapTinted; 1062 result |= transpPmapTinted;
1032 } 1063 }
1064
1033 XRenderFreePicture (dpy, mask_pic); 1065 XRenderFreePicture (dpy, mask_pic);
1034 XRenderFreePicture (dpy, overlay_pic); 1066 XRenderFreePicture (dpy, overlay_pic);
1035 XRenderFreePicture (dpy, back_pic); 1067 XRenderFreePicture (dpy, back_pic);
1036# if DO_TIMING_TEST 1068# if DO_TIMING_TEST
1037 XSync (dpy, False); 1069 XSync (dpy, False);
… …
1059} 1091}
1060 1092
1061bool 1093bool
1062bgPixmap_t::set_root_pixmap () 1094bgPixmap_t::set_root_pixmap ()
1063{ 1095{
1064 Pixmap new_root_pixmap = None;
1065
1066 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1096 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1067 if (new_root_pixmap == None) 1097 if (new_root_pixmap == None)
1068 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1098 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1069 1099
1070 if (new_root_pixmap != root_pixmap) 1100 if (new_root_pixmap != root_pixmap)
1071 { 1101 {
1072 root_pixmap = new_root_pixmap; 1102 root_pixmap = new_root_pixmap;
1073 return true; 1103 return true;
1074 } 1104 }
1105
1075 return false; 1106 return false;
1076} 1107}
1077# endif /* ENABLE_TRANSPARENCY */ 1108# endif /* ENABLE_TRANSPARENCY */
1078 1109
1079# ifndef HAVE_AFTERIMAGE 1110# ifndef HAVE_AFTERIMAGE
1080static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1111static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
1081# endif 1112# endif
1082
1083 1113
1084bool 1114bool
1085bgPixmap_t::render () 1115bgPixmap_t::render ()
1086{ 1116{
1087 unsigned long background_flags = 0; 1117 unsigned long background_flags = 0;
… …
1169 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1199 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1170 } 1200 }
1171 } 1201 }
1172# endif /* HAVE_AFTERIMAGE */ 1202# endif /* HAVE_AFTERIMAGE */
1173 1203
1174 if (result != NULL) 1204 if (result)
1175 { 1205 {
1176 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1206 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1207
1177 if (gc) 1208 if (gc)
1178 { 1209 {
1179 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1210 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1180 { 1211 {
1181 XFreePixmap (target->dpy, pixmap); 1212 XFreePixmap (target->dpy, pixmap);
1182 pixmap = None; 1213 pixmap = None;
1183 } 1214 }
1215
1184 if (pixmap == None) 1216 if (pixmap == None)
1185 { 1217 {
1186 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1218 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1187 pmap_width = result->width; 1219 pmap_width = result->width;
1188 pmap_height = result->height; 1220 pmap_height = result->height;
1189 pmap_depth = target->depth; 1221 pmap_depth = target->depth;
1190 } 1222 }
1223
1191 if (pmap_depth != result->depth) 1224 if (pmap_depth != result->depth)
1225 {
1192 { /* Bad Match error will ensue ! stupid X !!!! */ 1226 /* Bad Match error will ensue ! stupid X !!!! */
1193 if( result->depth == 24 && pmap_depth == 32) 1227 if (result->depth == 24 && pmap_depth == 32)
1194 result->depth = 32; 1228 result->depth = 32;
1195 else if( result->depth == 32 && pmap_depth == 24) 1229 else if (result->depth == 32 && pmap_depth == 24)
1196 result->depth = 24; 1230 result->depth = 24;
1197 else 1231 else
1198 { 1232 {
1199 /* TODO: implement image recoding */ 1233 /* TODO: implement image recoding */
1200 } 1234 }
1201 } 1235 }
1236
1202 if (pmap_depth == result->depth) 1237 if (pmap_depth == result->depth)
1203 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1238 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1239
1204 XFreeGC (target->dpy, gc); 1240 XFreeGC (target->dpy, gc);
1205 flags = flags & ~isInvalid; 1241 flags = flags & ~isInvalid;
1206 } 1242 }
1243
1207 XDestroyImage (result); 1244 XDestroyImage (result);
1208 } 1245 }
1209 1246
1210 if (flags & isInvalid) 1247 if (flags & isInvalid)
1211 { 1248 {
… …
1215 pixmap = None; 1252 pixmap = None;
1216 } 1253 }
1217 } 1254 }
1218 1255
1219 apply (); 1256 apply ();
1257
1258 XSync (target->dpy, False);
1259 valid_since = ev::now ();
1220 1260
1221 TIMING_TEST_PRINT_RESULT (tp); 1261 TIMING_TEST_PRINT_RESULT (tp);
1222 1262
1223 return true; 1263 return true;
1224} 1264}
… …
1237 } 1277 }
1238 return false; 1278 return false;
1239} 1279}
1240 1280
1241void 1281void
1242bgPixmap_t::apply() 1282bgPixmap_t::apply ()
1243{ 1283{
1244 if (target) 1284 if (target)
1245 { 1285 {
1246 flags &= ~isVtOrigin; 1286 flags &= ~isVtOrigin;
1247 if (pixmap != None) 1287 if (pixmap != None)
1288 {
1248 { /* set target's background to pixmap */ 1289 /* set target's background to pixmap */
1249# ifdef ENABLE_TRANSPARENCY 1290# ifdef ENABLE_TRANSPARENCY
1250 if (flags & isTransparent) 1291 if (flags & isTransparent)
1251 { 1292 {
1252 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1293 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1253 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1294 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1254# if HAVE_SCROLLBARS
1255 if (target->scrollBar.win) 1295 if (target->scrollBar.win)
1256 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1296 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1257# endif
1258 } 1297 }
1259 else 1298 else
1260# endif 1299# endif
1261 { 1300 {
1262 flags |= isVtOrigin; 1301 flags |= isVtOrigin;
1263 /* force old pixmap dereference in case it was transparent before :*/ 1302 /* force old pixmap dereference in case it was transparent before :*/
1264 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1303 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1265 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1304 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1266 /* do we also need to set scrollbar's background here ? */ 1305 /* do we also need to set scrollbar's background here ? */
1267# if HAVE_SCROLLBARS
1268 if (target->scrollBar.win) 1306 if (target->scrollBar.win)
1269 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1307 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1270# endif
1271 } 1308 }
1272 } 1309 }
1273 else 1310 else
1311 {
1274 { /* set target background to a pixel */ 1312 /* set target background to a pixel */
1275 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1313 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1276 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1314 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1277 /* do we also need to set scrollbar's background here ? */ 1315 /* do we also need to set scrollbar's background here ? */
1278# if HAVE_SCROLLBARS
1279 if (target->scrollBar.win) 1316 if (target->scrollBar.win)
1280 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1317 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1281# endif
1282 } 1318 }
1283 /* don't want Expose on the parent or vt. It is better to use 1319 /* don't want Expose on the parent or vt. It is better to use
1284 scr_touch or we get a great deal of flicker otherwise: */ 1320 scr_touch or we get a great deal of flicker otherwise: */
1285 XClearWindow (target->dpy, target->parent[0]); 1321 XClearWindow (target->dpy, target->parent[0]);
1286 1322
1287# if HAVE_SCROLLBARS
1288 if (target->scrollBar.win) 1323 if (target->scrollBar.win)
1289 { 1324 {
1290 target->scrollBar.setIdle (); 1325 target->scrollBar.setIdle ();
1291 target->scrollbar_show (0); 1326 target->scrollbar_show (0);
1292 } 1327 }
1293# endif
1294 1328
1295 target->want_refresh = 1; 1329 target->want_refresh = 1;
1296 flags |= hasChanged; 1330 flags |= hasChanged;
1297 } 1331 }
1298} 1332}

Diff Legend

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