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

Diff Legend

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