… | |
… | |
87 | */ |
87 | */ |
88 | |
88 | |
89 | #ifdef HAVE_BG_PIXMAP |
89 | #ifdef HAVE_BG_PIXMAP |
90 | bgPixmap_t::bgPixmap_t () |
90 | bgPixmap_t::bgPixmap_t () |
91 | { |
91 | { |
|
|
92 | // this is basically redundant as bgPixmap_t is only used in |
|
|
93 | // zero_initialised-derived structs |
92 | #ifdef HAVE_AFTERIMAGE |
94 | #ifdef HAVE_AFTERIMAGE |
93 | original_asim = NULL; |
95 | original_asim = NULL; |
94 | #endif |
96 | #endif |
95 | #ifdef BG_IMAGE_FROM_FILE |
97 | #ifdef BG_IMAGE_FROM_FILE |
96 | h_scale = v_scale = 0; |
98 | h_scale = v_scale = 0; |
97 | h_align = v_align = 0; |
99 | h_align = v_align = 0; |
98 | #endif |
100 | #endif |
99 | flags = 0; |
101 | flags = 0; |
100 | pixmap = None; |
102 | pixmap = None; |
|
|
103 | valid_since = invalid_since = 0; |
|
|
104 | target = 0; |
101 | } |
105 | } |
102 | |
106 | |
103 | void |
107 | void |
104 | bgPixmap_t::destroy () |
108 | bgPixmap_t::destroy () |
105 | { |
109 | { |
… | |
… | |
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 | |
158 | bool bgPixmap_t::need_client_side_rendering () |
162 | bool 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]; |
… | |
… | |
366 | if (ops) |
370 | if (ops) |
367 | { |
371 | { |
368 | while (*ops) |
372 | while (*ops) |
369 | { |
373 | { |
370 | while (*ops == ':' || isspace(*ops)) ++ops; |
374 | while (*ops == ':' || isspace(*ops)) ++ops; |
|
|
375 | |
371 | # 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) |
372 | if (CHECK_GEOM_OPS("tile")) |
377 | if (CHECK_GEOM_OPS ("tile")) |
373 | { |
378 | { |
374 | w = h = noScale; |
379 | w = h = noScale; |
375 | geom_flags |= WidthValue|HeightValue; |
380 | geom_flags |= WidthValue|HeightValue; |
376 | } |
381 | } |
377 | else if (CHECK_GEOM_OPS("propscale")) |
382 | else if (CHECK_GEOM_OPS ("propscale")) |
378 | { |
383 | { |
379 | if (w == 0 && h == 0) |
384 | if (w == 0 && h == 0) |
380 | { |
385 | { |
381 | w = windowScale; |
386 | w = windowScale; |
382 | geom_flags |= WidthValue; |
387 | geom_flags |= WidthValue; |
383 | } |
388 | } |
384 | new_flags |= propScale; |
389 | new_flags |= propScale; |
385 | } |
390 | } |
386 | else if (CHECK_GEOM_OPS("hscale")) |
391 | else if (CHECK_GEOM_OPS ("hscale")) |
387 | { |
392 | { |
388 | if (w == 0) |
|
|
389 | w = windowScale; |
393 | if (w == 0) w = windowScale; |
|
|
394 | |
390 | h = noScale; |
395 | h = noScale; |
391 | geom_flags |= WidthValue|HeightValue; |
396 | geom_flags |= WidthValue|HeightValue; |
392 | } |
397 | } |
393 | else if (CHECK_GEOM_OPS("vscale")) |
398 | else if (CHECK_GEOM_OPS ("vscale")) |
394 | { |
399 | { |
395 | if (h == 0) |
|
|
396 | h = windowScale; |
400 | if (h == 0) h = windowScale; |
|
|
401 | |
397 | w = noScale; |
402 | w = noScale; |
398 | geom_flags |= WidthValue|HeightValue; |
403 | geom_flags |= WidthValue|HeightValue; |
399 | } |
404 | } |
400 | else if (CHECK_GEOM_OPS("scale")) |
405 | else if (CHECK_GEOM_OPS ("scale")) |
401 | { |
406 | { |
402 | if (h == 0) |
|
|
403 | h = windowScale; |
407 | if (h == 0) h = windowScale; |
404 | if (w == 0) |
|
|
405 | w = windowScale; |
408 | if (w == 0) w = windowScale; |
|
|
409 | |
406 | geom_flags |= WidthValue|HeightValue; |
410 | geom_flags |= WidthValue|HeightValue; |
407 | } |
411 | } |
408 | else if (CHECK_GEOM_OPS("auto")) |
412 | else if (CHECK_GEOM_OPS ("auto")) |
409 | { |
413 | { |
410 | w = h = windowScale; |
414 | w = h = windowScale; |
411 | x = y = centerAlign; |
415 | x = y = centerAlign; |
412 | geom_flags |= WidthValue|HeightValue|XValue|YValue; |
416 | geom_flags |= WidthValue|HeightValue|XValue|YValue; |
413 | } |
417 | } |
414 | else if (CHECK_GEOM_OPS("root")) |
418 | else if (CHECK_GEOM_OPS ("root")) |
415 | { |
419 | { |
416 | w = h = noScale; |
420 | w = h = noScale; |
417 | x = y = rootAlign; |
421 | x = y = rootAlign; |
418 | geom_flags |= WidthValue|HeightValue|XValue|YValue; |
422 | geom_flags |= WidthValue|HeightValue|XValue|YValue; |
419 | } |
423 | } |
420 | # undef CHECK_GEOM_OPS |
424 | # undef CHECK_GEOM_OPS |
|
|
425 | |
421 | while (*ops != ':' && *ops != '\0') ++ops; |
426 | while (*ops != ':' && *ops != '\0') ++ops; |
422 | } /* done parsing ops */ |
427 | } /* done parsing ops */ |
423 | } |
428 | } |
424 | |
429 | |
425 | if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) |
430 | if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; |
426 | ++changed; |
|
|
427 | if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) |
431 | if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; |
428 | ++changed; |
|
|
429 | if (check_set_align_value (geom_flags, XValue, h_align, x)) |
432 | if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; |
430 | ++changed; |
|
|
431 | if (check_set_align_value (geom_flags, YValue, v_align, y)) |
433 | if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; |
432 | ++changed; |
|
|
433 | } |
434 | } |
434 | |
435 | |
435 | if (new_flags != flags) |
436 | if (new_flags != flags) |
436 | { |
437 | { |
437 | flags = new_flags; |
438 | flags = new_flags; |
438 | changed++; |
439 | changed++; |
439 | } |
440 | } |
|
|
441 | |
440 | //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", |
442 | //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", |
441 | // flags, h_scale, v_scale, h_align, v_align); |
443 | // flags, h_scale, v_scale, h_align, v_align); |
442 | return (changed > 0); |
444 | return (changed > 0); |
443 | } |
445 | } |
444 | |
446 | |
… | |
… | |
467 | { |
469 | { |
468 | target->get_window_origin(x, y); |
470 | target->get_window_origin(x, y); |
469 | x = -x; |
471 | x = -x; |
470 | y = -y; |
472 | y = -y; |
471 | } |
473 | } |
|
|
474 | |
472 | if (h_align != rootAlign) |
475 | if (h_align != rootAlign) |
473 | 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 | |
474 | if (v_align != rootAlign) |
478 | if (v_align != rootAlign) |
475 | 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); |
476 | } |
480 | } |
477 | |
481 | |
478 | if (original_asim == NULL |
482 | if (!original_asim |
479 | || x >= target_width |
483 | || x >= target_width |
480 | || y >= target_height |
484 | || y >= target_height |
481 | || (w > 0 && x + w <= 0) |
485 | || (w > 0 && x + w <= 0) |
482 | || (h > 0 && y + h <= 0)) |
486 | || (h > 0 && y + h <= 0)) |
483 | { |
487 | { |
484 | if (background) |
488 | if (background) |
485 | { |
489 | { |
486 | new_pmap_width = background->width; |
490 | new_pmap_width = background->width; |
487 | new_pmap_height = background->height; |
491 | new_pmap_height = background->height; |
488 | result = background; |
492 | result = background; |
|
|
493 | |
489 | if (background_tint != TINT_LEAVE_SAME) |
494 | if (background_tint != TINT_LEAVE_SAME) |
490 | { |
495 | { |
491 | ASImage* tmp = tile_asimage (target->asv, background, 0, 0, |
496 | ASImage* tmp = tile_asimage (target->asv, background, 0, 0, |
492 | target_width, target_height, background_tint, |
497 | target_width, target_height, background_tint, |
493 | ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); |
498 | ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); |
… | |
… | |
499 | new_pmap_width = new_pmap_height = 0; |
504 | new_pmap_width = new_pmap_height = 0; |
500 | } |
505 | } |
501 | else |
506 | else |
502 | { |
507 | { |
503 | result = original_asim; |
508 | result = original_asim; |
|
|
509 | |
504 | if ((w > 0 && w != original_asim->width) |
510 | if ((w > 0 && w != original_asim->width) |
505 | || (h > 0 && h != original_asim->height)) |
511 | || (h > 0 && h != original_asim->height)) |
506 | { |
512 | { |
507 | result = scale_asimage (target->asv, original_asim, |
513 | result = scale_asimage (target->asv, original_asim, |
508 | w > 0 ? w : original_asim->width, |
514 | w > 0 ? w : original_asim->width, |
509 | h > 0 ? h : original_asim->height, |
515 | h > 0 ? h : original_asim->height, |
510 | background ? ASA_ASImage : ASA_XImage, |
516 | background ? ASA_ASImage : ASA_XImage, |
511 | 100, ASIMAGE_QUALITY_DEFAULT); |
517 | 100, ASIMAGE_QUALITY_DEFAULT); |
512 | } |
518 | } |
|
|
519 | |
513 | if (background == NULL) |
520 | if (background == NULL) |
514 | { |
521 | { |
515 | /* if tiling - pixmap has to be sized exactly as the image, |
522 | /* if tiling - pixmap has to be sized exactly as the image, |
516 | 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! */ |
517 | if (h_scale == 0) |
524 | if (h_scale == 0) |
518 | new_pmap_width = min (result->width, target_width); |
525 | new_pmap_width = min (result->width, target_width); |
519 | if (v_scale == 0) |
526 | if (v_scale == 0) |
520 | new_pmap_height = min (result->height, target_height); |
527 | new_pmap_height = min (result->height, target_height); |
521 | /* 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 */ |
522 | if (h_scale == 0 || v_scale == 0) |
529 | if (h_scale == 0 || v_scale == 0) |
523 | { |
530 | { |
524 | ASImage *tmp = tile_asimage (target->asv, result, |
531 | ASImage *tmp = tile_asimage (target->asv, result, |
525 | (h_scale > 0) ? 0 : (int)result->width - x, |
532 | (h_scale > 0) ? 0 : (int)result->width - x, |
526 | (v_scale > 0) ? 0 : (int)result->height - y, |
533 | (v_scale > 0) ? 0 : (int)result->height - y, |
527 | new_pmap_width, |
534 | new_pmap_width, |
528 | new_pmap_height, |
535 | new_pmap_height, |
529 | TINT_LEAVE_SAME, ASA_XImage, |
536 | TINT_LEAVE_SAME, ASA_XImage, |
530 | 100, ASIMAGE_QUALITY_DEFAULT); |
537 | 100, ASIMAGE_QUALITY_DEFAULT); |
531 | if (tmp) |
538 | if (tmp) |
532 | { |
539 | { |
533 | if (result != original_asim) |
540 | if (result != original_asim) |
534 | destroy_asimage (&result); |
541 | destroy_asimage (&result); |
|
|
542 | |
535 | result = tmp; |
543 | result = tmp; |
536 | } |
544 | } |
537 | } |
545 | } |
538 | } |
546 | } |
539 | else |
547 | else |
… | |
… | |
545 | layers[0].im = background; |
553 | layers[0].im = background; |
546 | layers[0].clip_width = target_width; |
554 | layers[0].clip_width = target_width; |
547 | layers[0].clip_height = target_height; |
555 | layers[0].clip_height = target_height; |
548 | layers[0].tint = background_tint; |
556 | layers[0].tint = background_tint; |
549 | layers[1].im = result; |
557 | layers[1].im = result; |
|
|
558 | |
550 | if (w <= 0) |
559 | if (w <= 0) |
551 | { |
560 | { |
552 | /* tile horizontally */ |
561 | /* tile horizontally */ |
553 | while (x > 0) x -= (int)result->width; |
562 | while (x > 0) x -= (int)result->width; |
554 | layers[1].dst_x = x; |
563 | layers[1].dst_x = x; |
… | |
… | |
558 | { |
567 | { |
559 | /* clip horizontally */ |
568 | /* clip horizontally */ |
560 | layers[1].dst_x = x; |
569 | layers[1].dst_x = x; |
561 | layers[1].clip_width = result->width; |
570 | layers[1].clip_width = result->width; |
562 | } |
571 | } |
|
|
572 | |
563 | if (h <= 0) |
573 | if (h <= 0) |
564 | { |
574 | { |
565 | while (y > 0) y -= (int)result->height; |
575 | while (y > 0) y -= (int)result->height; |
566 | layers[1].dst_y = y; |
576 | layers[1].dst_y = y; |
567 | layers[1].clip_height = result->height + target_height; |
577 | layers[1].clip_height = result->height + target_height; |
… | |
… | |
569 | else |
579 | else |
570 | { |
580 | { |
571 | layers[1].dst_y = y; |
581 | layers[1].dst_y = y; |
572 | layers[1].clip_height = result->height; |
582 | layers[1].clip_height = result->height; |
573 | } |
583 | } |
|
|
584 | |
574 | if (target->rs[Rs_blendtype]) |
585 | if (target->rs[Rs_blendtype]) |
575 | { |
586 | { |
576 | layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); |
587 | layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); |
577 | if (layers[1].merge_scanlines == NULL) |
588 | if (layers[1].merge_scanlines == NULL) |
578 | layers[1].merge_scanlines = alphablend_scanlines; |
589 | layers[1].merge_scanlines = alphablend_scanlines; |
579 | } |
590 | } |
|
|
591 | |
580 | 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, |
581 | ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); |
593 | ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); |
|
|
594 | |
582 | if (tmp) |
595 | if (tmp) |
583 | { |
596 | { |
584 | if (result != original_asim) |
597 | if (result != original_asim) |
585 | destroy_asimage (&result); |
598 | destroy_asimage (&result); |
|
|
599 | |
586 | result = tmp; |
600 | result = tmp; |
587 | } |
601 | } |
|
|
602 | |
588 | free (layers); |
603 | free (layers); |
589 | } |
604 | } |
590 | } |
605 | } |
591 | TIMING_TEST_PRINT_RESULT (asim); |
606 | TIMING_TEST_PRINT_RESULT (asim); |
592 | |
607 | |
… | |
… | |
621 | |
636 | |
622 | 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; |
623 | int dst_width = result->width, dst_height = result->height; |
638 | int dst_width = result->width, dst_height = result->height; |
624 | if (background == NULL) |
639 | if (background == NULL) |
625 | { |
640 | { |
626 | if (h_scale > 0) |
|
|
627 | 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 ); |
628 | if (v_scale > 0) |
|
|
629 | 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); |
630 | |
643 | |
631 | if (dst_x > 0 || dst_y > 0 |
644 | if (dst_x > 0 || dst_y > 0 |
632 | || dst_x + dst_width < new_pmap_width |
645 | || dst_x + dst_width < new_pmap_width |
633 | || dst_y + dst_height < new_pmap_height) |
646 | || dst_y + dst_height < new_pmap_height) |
634 | { |
|
|
635 | 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); |
636 | } |
|
|
637 | } |
648 | } |
638 | |
649 | |
639 | /* put result on pixmap */ |
650 | /* put result on pixmap */ |
640 | if (dst_x < new_pmap_width && dst_y < new_pmap_height) |
651 | if (dst_x < new_pmap_width && dst_y < new_pmap_height) |
641 | 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); |
… | |
… | |
654 | bool |
665 | bool |
655 | bgPixmap_t::set_file (const char *file) |
666 | bgPixmap_t::set_file (const char *file) |
656 | { |
667 | { |
657 | char *f; |
668 | char *f; |
658 | |
669 | |
659 | assert (file != NULL); |
670 | assert (file); |
660 | |
671 | |
661 | if (*file != '\0') |
672 | if (*file) |
662 | { |
673 | { |
663 | # ifdef HAVE_AFTERIMAGE |
674 | # ifdef HAVE_AFTERIMAGE |
664 | if (target->asimman == NULL) |
675 | if (target->asimman == NULL) |
665 | target->asimman = create_generic_imageman (target->rs[Rs_path]); |
676 | target->asimman = create_generic_imageman (target->rs[Rs_path]); |
|
|
677 | |
666 | if ((f = strchr (file, ';')) == NULL) |
678 | if ((f = strchr (file, ';')) == NULL) |
667 | original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); |
679 | original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); |
668 | else |
680 | else |
669 | { |
681 | { |
670 | size_t len = f - file; |
682 | size_t len = f - file; |
671 | f = (char *)malloc (len + 1); |
683 | f = (char *)malloc (len + 1); |
672 | strncpy (f, file, len); |
684 | memcpy (f, file, len); |
673 | f[len] = '\0'; |
685 | f[len] = '\0'; |
674 | original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); |
686 | original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); |
675 | free (f); |
687 | free (f); |
676 | } |
688 | } |
|
|
689 | |
677 | return (original_asim != NULL); |
690 | return original_asim; |
678 | # endif |
691 | # endif |
679 | } |
692 | } |
|
|
693 | |
680 | return false; |
694 | return false; |
681 | } |
695 | } |
682 | |
696 | |
683 | # endif /* BG_IMAGE_FROM_FILE */ |
697 | # endif /* BG_IMAGE_FROM_FILE */ |
684 | |
698 | |
… | |
… | |
689 | if (!(flags & isTransparent)) |
703 | if (!(flags & isTransparent)) |
690 | { |
704 | { |
691 | flags |= isTransparent; |
705 | flags |= isTransparent; |
692 | return true; |
706 | return true; |
693 | } |
707 | } |
|
|
708 | |
694 | return false; |
709 | return false; |
695 | } |
710 | } |
696 | |
711 | |
697 | bool |
712 | bool |
698 | bgPixmap_t::set_blur_radius (const char *geom) |
713 | bgPixmap_t::set_blur_radius (const char *geom) |
… | |
… | |
1238 | } |
1253 | } |
1239 | } |
1254 | } |
1240 | |
1255 | |
1241 | apply (); |
1256 | apply (); |
1242 | |
1257 | |
|
|
1258 | XSync (target->dpy, False); |
|
|
1259 | valid_since = ev::now (); |
|
|
1260 | |
1243 | TIMING_TEST_PRINT_RESULT (tp); |
1261 | TIMING_TEST_PRINT_RESULT (tp); |
1244 | |
1262 | |
1245 | return true; |
1263 | return true; |
1246 | } |
1264 | } |
1247 | |
1265 | |
… | |
… | |
1264 | bgPixmap_t::apply () |
1282 | bgPixmap_t::apply () |
1265 | { |
1283 | { |
1266 | if (target) |
1284 | if (target) |
1267 | { |
1285 | { |
1268 | flags &= ~isVtOrigin; |
1286 | flags &= ~isVtOrigin; |
|
|
1287 | |
1269 | if (pixmap != None) |
1288 | if (pixmap != None) |
1270 | { |
1289 | { |
1271 | /* set target's background to pixmap */ |
1290 | /* set target's background to pixmap */ |
1272 | # ifdef ENABLE_TRANSPARENCY |
1291 | # ifdef ENABLE_TRANSPARENCY |
1273 | if (flags & isTransparent) |
1292 | if (flags & isTransparent) |
1274 | { |
1293 | { |
1275 | XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); |
1294 | XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); |
1276 | XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); |
1295 | XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); |
1277 | # if HAVE_SCROLLBARS |
1296 | |
1278 | if (target->scrollBar.win) |
1297 | if (target->scrollBar.win) |
1279 | XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); |
1298 | XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); |
1280 | # endif |
|
|
1281 | } |
1299 | } |
1282 | else |
1300 | else |
1283 | # endif |
1301 | # endif |
1284 | { |
1302 | { |
1285 | flags |= isVtOrigin; |
1303 | flags |= isVtOrigin; |
1286 | /* force old pixmap dereference in case it was transparent before :*/ |
1304 | /* force old pixmap dereference in case it was transparent before :*/ |
1287 | XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); |
1305 | XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); |
1288 | XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); |
1306 | XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); |
1289 | /* do we also need to set scrollbar's background here ? */ |
1307 | /* do we also need to set scrollbar's background here ? */ |
1290 | # if HAVE_SCROLLBARS |
1308 | |
1291 | if (target->scrollBar.win) |
1309 | if (target->scrollBar.win) |
1292 | XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); |
1310 | XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); |
1293 | # endif |
|
|
1294 | } |
1311 | } |
1295 | } |
1312 | } |
1296 | else |
1313 | else |
1297 | { |
1314 | { |
1298 | /* set target background to a pixel */ |
1315 | /* set target background to a pixel */ |
1299 | XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); |
1316 | XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); |
1300 | XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); |
1317 | XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); |
1301 | /* do we also need to set scrollbar's background here ? */ |
1318 | /* do we also need to set scrollbar's background here ? */ |
1302 | # if HAVE_SCROLLBARS |
|
|
1303 | if (target->scrollBar.win) |
1319 | if (target->scrollBar.win) |
1304 | XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); |
1320 | XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); |
1305 | # endif |
|
|
1306 | } |
1321 | } |
|
|
1322 | |
1307 | /* 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 |
1308 | scr_touch or we get a great deal of flicker otherwise: */ |
1324 | scr_touch or we get a great deal of flicker otherwise: */ |
1309 | XClearWindow (target->dpy, target->parent[0]); |
1325 | XClearWindow (target->dpy, target->parent[0]); |
1310 | |
1326 | |
1311 | # if HAVE_SCROLLBARS |
|
|
1312 | if (target->scrollBar.win) |
1327 | if (target->scrollBar.win) |
1313 | { |
1328 | { |
1314 | target->scrollBar.setIdle (); |
1329 | target->scrollBar.state = STATE_IDLE; |
1315 | target->scrollbar_show (0); |
1330 | target->scrollBar.show (0); |
1316 | } |
1331 | } |
1317 | # endif |
|
|
1318 | |
1332 | |
1319 | target->want_refresh = 1; |
1333 | target->want_refresh = 1; |
1320 | flags |= hasChanged; |
1334 | flags |= hasChanged; |
1321 | } |
1335 | } |
1322 | } |
1336 | } |