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.11 by sasha, Wed Nov 14 22:25:41 2007 UTC vs.
Revision 1.28 by ayin, Tue Jan 29 13:57:23 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
116bgPixmap_t::window_size_sensitive () 120bgPixmap_t::window_size_sensitive ()
117{ 121{
118# ifdef BG_IMAGE_FROM_FILE
119# ifdef HAVE_AFTERIMAGE
120 if (original_asim != NULL)
121# endif
122 {
123 if (h_scale != 0 || v_scale != 0
124 || h_align != 0 || v_align != 0)
125 return true;
126 }
127# endif
128# ifdef ENABLE_TRANSPARENCY 122# ifdef ENABLE_TRANSPARENCY
129 if (flags & isTransparent) 123 if (flags & isTransparent)
130 return true; 124 return true;
131# endif 125# endif
126
127# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE
129 if (original_asim)
130# endif
131 {
132 if (h_scale != 0 || v_scale != 0
133 || h_align != 0 || v_align != 0)
134 return true;
135 }
136# endif
137
132 return false; 138 return false;
133} 139}
134 140
141bool
142bgPixmap_t::window_position_sensitive ()
143{
144# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent)
146 return true;
147# endif
148
149# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE
151 if (original_asim)
152# endif
153 {
154 if (h_align == rootAlign || v_align == rootAlign)
155 return true;
156 }
157# endif
158
159 return false;
160};
161
135bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
136{ 163{
137# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
138 if (original_asim != NULL) 165 if (original_asim)
139 return true; 166 return true;
140# endif 167# endif
141# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
142 if (flags & isTransparent) 169 if (flags & isTransparent)
143 { 170 {
… …
172static inline bool 199static inline bool
173check_set_align_value (int geom_flags, int flag, int &align, int new_value) 200check_set_align_value (int geom_flags, int flag, int &align, int new_value)
174{ 201{
175 if (geom_flags & flag) 202 if (geom_flags & flag)
176 { 203 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
177 if (new_value < -100) 206 if (new_value < -100)
178 new_value = -100; 207 new_value = -100;
179 else if (new_value > 200) 208 else if (new_value > 200)
180 new_value = 200; 209 new_value = 200;
210 }
181 if (new_value != align) 211 if (new_value != align)
182 { 212 {
183 align = new_value; 213 align = new_value;
184 return true; 214 return true;
185 } 215 }
… …
230 int x = 0, y = 0; 260 int x = 0, y = 0;
231 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
232 unsigned int n; 262 unsigned int n;
233 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
234 char *p; 264 char *p;
235# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
236 266
237 if (geom == NULL) 267 if (geom == NULL)
238 return false; 268 return false;
239 269
240 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
… …
247 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
248 { 278 {
249 char *ops; 279 char *ops;
250 new_flags |= geometrySet; 280 new_flags |= geometrySet;
251 281
252 strncpy (str, geom, n); 282 memcpy (str, geom, n);
253 str[n] = '\0'; 283 str[n] = '\0';
254 if (str[0] == ':') 284 if (str[0] == ':')
255 ops = &str[0]; 285 ops = &str[0];
256 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
257 ops = &str[0]; 287 ops = &str[0];
… …
277 y = x; 307 y = x;
278 geom_flags |= YValue; 308 geom_flags |= YValue;
279 } 309 }
280 310
281 if (flags & geometrySet) 311 if (flags & geometrySet)
312 {
282 {/* new geometry is an adjustment to the old one ! */ 313 /* new geometry is an adjustment to the old one ! */
283 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 314 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
284 { 315 {
285 if (w == 0 && h != 0) 316 if (w == 0 && h != 0)
286 { 317 {
287 w = h_scale; 318 w = h_scale;
… …
303 } 334 }
304 } 335 }
305 else /* setting up geometry from scratch */ 336 else /* setting up geometry from scratch */
306 { 337 {
307 if (!(geom_flags & XValue)) 338 if (!(geom_flags & XValue))
339 {
308 {/* use default geometry - centered */ 340 /* use default geometry - centered */
309 x = y = defaultAlign; 341 x = y = defaultAlign;
310 } 342 }
311 else if (!(geom_flags & YValue)) 343 else if (!(geom_flags & YValue))
312 y = x; 344 y = x;
313 345
314 if ((geom_flags & (WidthValue|HeightValue)) == 0) 346 if ((geom_flags & (WidthValue|HeightValue)) == 0)
347 {
315 {/* use default geometry - scaled */ 348 /* use default geometry - scaled */
316 w = h = defaultScale; 349 w = h = defaultScale;
317 } 350 }
318 else if (geom_flags & WidthValue) 351 else if (geom_flags & WidthValue)
319 { 352 {
320 if (!(geom_flags & HeightValue)) 353 if (!(geom_flags & HeightValue))
… …
323 else 356 else
324 w = h; 357 w = h;
325 } 358 }
326 } /* done parsing geometry string */ 359 } /* done parsing geometry string */
327 else if (!(flags & geometrySet)) 360 else if (!(flags & geometrySet))
361 {
328 { /* default geometry - scaled and centered */ 362 /* default geometry - scaled and centered */
329 x = y = defaultAlign; 363 x = y = defaultAlign;
330 w = h = defaultScale; 364 w = h = defaultScale;
331 } 365 }
332 366
333 if (!(flags & geometrySet)) 367 if (!(flags & geometrySet))
… …
336 if (ops) 370 if (ops)
337 { 371 {
338 while (*ops) 372 while (*ops)
339 { 373 {
340 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
341# 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)
342 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
343 { 378 {
344 w = h = 0; 379 w = h = noScale;
345 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
346 } 381 }
347 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
348 { 383 {
349 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
350 { 385 {
351 w = 100; 386 w = windowScale;
352 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
353 } 388 }
354 new_flags |= propScale; 389 new_flags |= propScale;
355 } 390 }
356 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
357 { 392 {
358 if (w == 0) 393 if (w == 0) w = windowScale;
359 w = 100; 394
360 h = 0; 395 h = noScale;
361 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
362 } 397 }
363 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
364 { 399 {
365 if (h == 0) 400 if (h == 0) h = windowScale;
366 h = 100; 401
367 w = 0; 402 w = noScale;
368 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
369 } 404 }
370 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
371 { 406 {
372 if (h == 0) 407 if (h == 0) h = windowScale;
373 h = 100;
374 if (w == 0) 408 if (w == 0) w = windowScale;
375 w = 100; 409
376 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
377 } 411 }
378 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
379 { 413 {
380 w = h = 100; 414 w = h = windowScale;
381 x = y = 50; 415 x = y = centerAlign;
382 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
383 } 417 }
418 else if (CHECK_GEOM_OPS ("root"))
419 {
420 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
423 }
384# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
385 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
386 } /* done parsing ops */ 427 } /* done parsing ops */
387 } 428 }
388 429
389 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
390 ++changed;
391 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
392 ++changed;
393 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
394 ++changed;
395 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
396 ++changed;
397 } 434 }
398 435
399 if (new_flags != flags) 436 if (new_flags != flags)
400 { 437 {
401 flags = new_flags; 438 flags = new_flags;
402 changed++; 439 changed++;
403 } 440 }
441
404//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
405// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
406 return (changed > 0); 444 return (changed > 0);
407} 445}
408 446
409# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
… …
425 463
426 TIMING_TEST_START (asim); 464 TIMING_TEST_START (asim);
427 465
428 if (original_asim) 466 if (original_asim)
429 { 467 {
468 if (h_align == rootAlign || v_align == rootAlign)
469 {
470 target->get_window_origin(x, y);
471 x = -x;
472 y = -y;
473 }
474
475 if (h_align != rootAlign)
430 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
478 if (v_align != rootAlign)
431 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);
432 } 480 }
433 481
434 if (original_asim == NULL 482 if (!original_asim
435 || x >= target_width 483 || x >= target_width
436 || y >= target_height 484 || y >= target_height
437 || (w > 0 && x + w <= 0) 485 || (w > 0 && x + w <= 0)
438 || (h > 0 && y + h <= 0)) 486 || (h > 0 && y + h <= 0))
439 { 487 {
440 if (background) 488 if (background)
441 { 489 {
442 new_pmap_width = background->width; 490 new_pmap_width = background->width;
443 new_pmap_height = background->height; 491 new_pmap_height = background->height;
444 result = background; 492 result = background;
493
445 if (background_tint != TINT_LEAVE_SAME) 494 if (background_tint != TINT_LEAVE_SAME)
446 { 495 {
447 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 496 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
448 target_width, target_height, background_tint, 497 target_width, target_height, background_tint,
449 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 498 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
… …
455 new_pmap_width = new_pmap_height = 0; 504 new_pmap_width = new_pmap_height = 0;
456 } 505 }
457 else 506 else
458 { 507 {
459 result = original_asim; 508 result = original_asim;
509
460 if ((w > 0 && w != original_asim->width) 510 if ((w > 0 && w != original_asim->width)
461 || (h > 0 && h != original_asim->height)) 511 || (h > 0 && h != original_asim->height))
462 { 512 {
463 result = scale_asimage (target->asv, original_asim, 513 result = scale_asimage (target->asv, original_asim,
464 w > 0 ? w : original_asim->width, 514 w > 0 ? w : original_asim->width,
465 h > 0 ? h : original_asim->height, 515 h > 0 ? h : original_asim->height,
466 background ? ASA_ASImage : ASA_XImage, 516 background ? ASA_ASImage : ASA_XImage,
467 100, ASIMAGE_QUALITY_DEFAULT); 517 100, ASIMAGE_QUALITY_DEFAULT);
468 } 518 }
519
469 if (background == NULL) 520 if (background == NULL)
521 {
470 {/* if tiling - pixmap has to be sized exactly as the image */ 522 /* if tiling - pixmap has to be sized exactly as the image,
523 but there is no need to make it bigger than the window! */
471 if (h_scale == 0) 524 if (h_scale == 0)
472 new_pmap_width = result->width; 525 new_pmap_width = min (result->width, target_width);
473 if (v_scale == 0) 526 if (v_scale == 0)
474 new_pmap_height = result->height; 527 new_pmap_height = min (result->height, target_height);
475 /* 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 */
476 if (h_scale == 0 || v_scale == 0) 529 if (h_scale == 0 || v_scale == 0)
477 { 530 {
478 ASImage *tmp = tile_asimage (target->asv, result, 531 ASImage *tmp = tile_asimage (target->asv, result,
479 (h_scale > 0) ? 0 : (int)result->width - x, 532 (h_scale > 0) ? 0 : (int)result->width - x,
480 (v_scale > 0) ? 0 : (int)result->height - y, 533 (v_scale > 0) ? 0 : (int)result->height - y,
534 new_pmap_width,
481 result->width, result->height, 535 new_pmap_height,
482 TINT_LEAVE_SAME, ASA_XImage, 536 TINT_LEAVE_SAME, ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 537 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 538 if (tmp)
485 { 539 {
486 if (result != original_asim) 540 if (result != original_asim)
487 destroy_asimage (&result); 541 destroy_asimage (&result);
542
488 result = tmp; 543 result = tmp;
489 } 544 }
490 } 545 }
491 } 546 }
492 else 547 else
548 {
493 {/* 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 */
494 ASImageLayer *layers = create_image_layers (2); 550 ASImageLayer *layers = create_image_layers (2);
495 ASImage *merged_im = NULL; 551 ASImage *merged_im = NULL;
496 552
497 layers[0].im = background; 553 layers[0].im = background;
498 layers[0].clip_width = target_width; 554 layers[0].clip_width = target_width;
499 layers[0].clip_height = target_height; 555 layers[0].clip_height = target_height;
500 layers[0].tint = background_tint; 556 layers[0].tint = background_tint;
501 layers[1].im = result; 557 layers[1].im = result;
558
502 if (w <= 0) 559 if (w <= 0)
560 {
503 {/* tile horizontally */ 561 /* tile horizontally */
504 while (x > 0) x -= (int)result->width; 562 while (x > 0) x -= (int)result->width;
505 layers[1].dst_x = x; 563 layers[1].dst_x = x;
506 layers[1].clip_width = result->width+target_width; 564 layers[1].clip_width = result->width+target_width;
507 } 565 }
508 else 566 else
567 {
509 {/* clip horizontally */ 568 /* clip horizontally */
510 layers[1].dst_x = x; 569 layers[1].dst_x = x;
511 layers[1].clip_width = result->width; 570 layers[1].clip_width = result->width;
512 } 571 }
572
513 if (h <= 0) 573 if (h <= 0)
514 { 574 {
515 while (y > 0) y -= (int)result->height; 575 while (y > 0) y -= (int)result->height;
516 layers[1].dst_y = y; 576 layers[1].dst_y = y;
517 layers[1].clip_height = result->height + target_height; 577 layers[1].clip_height = result->height + target_height;
… …
519 else 579 else
520 { 580 {
521 layers[1].dst_y = y; 581 layers[1].dst_y = y;
522 layers[1].clip_height = result->height; 582 layers[1].clip_height = result->height;
523 } 583 }
584
524 if (target->rs[Rs_blendtype]) 585 if (target->rs[Rs_blendtype])
525 { 586 {
526 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 587 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
527 if (layers[1].merge_scanlines == NULL) 588 if (layers[1].merge_scanlines == NULL)
528 layers[1].merge_scanlines = alphablend_scanlines; 589 layers[1].merge_scanlines = alphablend_scanlines;
529 } 590 }
591
530 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,
531 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 593 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
594
532 if (tmp) 595 if (tmp)
533 { 596 {
534 if (result != original_asim) 597 if (result != original_asim)
535 destroy_asimage (&result); 598 destroy_asimage (&result);
599
536 result = tmp; 600 result = tmp;
537 } 601 }
602
538 free (layers); 603 free (layers);
539 } 604 }
540 } 605 }
541 TIMING_TEST_PRINT_RESULT (asim); 606 TIMING_TEST_PRINT_RESULT (asim);
542 607
… …
571 636
572 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;
573 int dst_width = result->width, dst_height = result->height; 638 int dst_width = result->width, dst_height = result->height;
574 if (background == NULL) 639 if (background == NULL)
575 { 640 {
576 if (h_scale > 0)
577 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 );
578 if (v_scale > 0)
579 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);
580 643
581 if (dst_x > 0 || dst_y > 0 644 if (dst_x > 0 || dst_y > 0
582 || dst_x + dst_width < new_pmap_width 645 || dst_x + dst_width < new_pmap_width
583 || dst_y + dst_height < new_pmap_height) 646 || dst_y + dst_height < new_pmap_height)
584 {
585 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);
586 }
587 } 648 }
588 649
589 /* put result on pixmap */ 650 /* put result on pixmap */
590 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 651 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
591 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);
… …
604bool 665bool
605bgPixmap_t::set_file (const char *file) 666bgPixmap_t::set_file (const char *file)
606{ 667{
607 char *f; 668 char *f;
608 669
609 assert (file != NULL); 670 assert (file);
610 671
611 if (*file != '\0') 672 if (*file)
612 { 673 {
613# ifdef HAVE_AFTERIMAGE 674# ifdef HAVE_AFTERIMAGE
614 if (target->asimman == NULL) 675 if (target->asimman == NULL)
615 target->asimman = create_generic_imageman (target->rs[Rs_path]); 676 target->asimman = create_generic_imageman (target->rs[Rs_path]);
677
616 if ((f = strchr (file, ';')) == NULL) 678 if ((f = strchr (file, ';')) == NULL)
617 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 679 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
618 else 680 else
619 { 681 {
620 size_t len = f - file; 682 size_t len = f - file;
621 f = (char *)malloc (len + 1); 683 f = (char *)malloc (len + 1);
622 strncpy (f, file, len); 684 memcpy (f, file, len);
623 f[len] = '\0'; 685 f[len] = '\0';
624 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
625 free (f); 687 free (f);
626 } 688 }
689
627 return (original_asim != NULL); 690 return original_asim;
628# endif 691# endif
629 } 692 }
693
630 return false; 694 return false;
631} 695}
632 696
633# endif /* BG_IMAGE_FROM_FILE */ 697# endif /* BG_IMAGE_FROM_FILE */
634 698
635# ifdef ENABLE_TRANSPARENCY 699# ifdef ENABLE_TRANSPARENCY
636bool 700bool
637bgPixmap_t::set_transparent () 701bgPixmap_t::set_transparent ()
638{ 702{
639 if (!(flags & isTransparent)) 703 if (!(flags & isTransparent))
640 { 704 {
641 flags |= isTransparent; 705 flags |= isTransparent;
642 return true; 706 return true;
643 } 707 }
708
644 return false; 709 return false;
645} 710}
646 711
647bool 712bool
648bgPixmap_t::set_blur_radius (const char *geom) 713bgPixmap_t::set_blur_radius (const char *geom)
… …
729 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 794 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
730 tint = new_tint; 795 tint = new_tint;
731 flags = (flags & ~tintFlags) | new_flags | tintSet; 796 flags = (flags & ~tintFlags) | new_flags | tintSet;
732 return true; 797 return true;
733 } 798 }
799
734 return false; 800 return false;
735} 801}
736 802
737bool 803bool
738bgPixmap_t::unset_tint () 804bgPixmap_t::unset_tint ()
… …
742 if (new_flags != (flags & tintFlags)) 808 if (new_flags != (flags & tintFlags))
743 { 809 {
744 flags = (flags&~tintFlags)|new_flags; 810 flags = (flags&~tintFlags)|new_flags;
745 return true; 811 return true;
746 } 812 }
813
747 return false; 814 return false;
748} 815}
749 816
750bool 817bool
751bgPixmap_t::set_shade (const char *shade_str) 818bgPixmap_t::set_shade (const char *shade_str)
752{ 819{
753 int new_shade = (shade_str) ? atoi (shade_str) : 0; 820 int new_shade = (shade_str) ? atoi (shade_str) : 0;
754 821
755 if (new_shade < 0 && new_shade > -100) 822 if (new_shade < 0 && new_shade > -100)
756 new_shade = 200 - (100 + new_shade); 823 new_shade = 200 - (100 + new_shade);
757 else if (new_shade == 100) 824 else if (new_shade == 100)
758 new_shade = 0; 825 new_shade = 0;
759 826
760 if (new_shade != shade) 827 if (new_shade != shade)
761 { 828 {
762 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);
763 shade = new_shade; 830 shade = new_shade;
764 flags = (flags & (~tintFlags | tintSet)) | new_flags; 831 flags = (flags & (~tintFlags | tintSet)) | new_flags;
765 return true; 832 return true;
766 } 833 }
834
767 return false; 835 return false;
768} 836}
769 837
770/* make_transparency_pixmap() 838/* make_transparency_pixmap()
771 * 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
… …
801 if (sx + window_width <= 0 || sy + window_height <= 0 869 if (sx + window_width <= 0 || sy + window_height <= 0
802 || sx >= root_width || sy >= root_height) 870 || sx >= root_width || sy >= root_height)
803 return 0; 871 return 0;
804 872
805 if (root_pixmap != None) 873 if (root_pixmap != None)
874 {
806 {/* 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 : */
807 int junk; 876 int junk;
808 unsigned int ujunk; 877 unsigned int ujunk;
809 /* root pixmap may be bad - allow a error */ 878 /* root pixmap may be bad - allow a error */
810 target->allowedxerror = -1; 879 target->allowedxerror = -1;
811 880
… …
820 889
821 if (tiled_root_pmap == None) /* something really bad happened - abort */ 890 if (tiled_root_pmap == None) /* something really bad happened - abort */
822 return 0; 891 return 0;
823 892
824 if (root_pixmap == None) 893 if (root_pixmap == None)
894 {
825 { /* use tricks to obtain the root background image :*/ 895 /* use tricks to obtain the root background image :*/
826 /* we want to create Overrideredirect window overlapping out window 896 /* we want to create Overrideredirect window overlapping out window
827 with background type of Parent Relative and then grab it */ 897 with background type of Parent Relative and then grab it */
828 XSetWindowAttributes attr; 898 XSetWindowAttributes attr;
829 Window src; 899 Window src;
830 bool success = false; 900 bool success = false;
… …
845 XGrabServer (dpy); 915 XGrabServer (dpy);
846 XMapRaised (dpy, src); 916 XMapRaised (dpy, src);
847 XSync (dpy, False); 917 XSync (dpy, False);
848 918
849 /* XSync should get window where it's properly exposed, 919 /* XSync should get window where it's properly exposed,
850 * 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 : */
851 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 921 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
852 ++ev_count; 922 ++ev_count;
853 923
854 if (ev_count > 0); 924 if (ev_count > 0);
925 {
855 { /* hooray! - we can grab the image! */ 926 /* hooray! - we can grab the image! */
856 gc = XCreateGC (dpy, root, 0, NULL); 927 gc = XCreateGC (dpy, root, 0, NULL);
857 if (gc) 928 if (gc)
858 { 929 {
859 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);
860 success = true; 931 success = true;
861 } 932 }
862 } 933 }
934
863 XDestroyWindow (dpy, src); 935 XDestroyWindow (dpy, src);
864 XUngrabServer (dpy); 936 XUngrabServer (dpy);
865 //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);
866 } 938 }
867 939
… …
872 } 944 }
873 else 945 else
874 result |= transpPmapTiled; 946 result |= transpPmapTiled;
875 } 947 }
876 else 948 else
949 {
877 {/* strightforward pixmap copy */ 950 /* strightforward pixmap copy */
878 gcv.tile = root_pixmap; 951 gcv.tile = root_pixmap;
879 gcv.fill_style = FillTiled; 952 gcv.fill_style = FillTiled;
880 953
881 while (sx < 0) sx += (int)root_width; 954 while (sx < 0) sx += (int)root_width;
882 while (sy < 0) sy += (int)root_height; 955 while (sy < 0) sy += (int)root_height;
… …
930 { 1003 {
931 c.r = (c.r * shade) / 100; 1004 c.r = (c.r * shade) / 100;
932 c.g = (c.g * shade) / 100; 1005 c.g = (c.g * shade) / 100;
933 c.b = (c.b * shade) / 100; 1006 c.b = (c.b * shade) / 100;
934 } 1007 }
935 else if( shade > 100 && shade < 200) 1008 else if (shade > 100 && shade < 200)
936 { 1009 {
937 c.r = (c.r * (200 - shade)) / 100; 1010 c.r = (c.r * (200 - shade)) / 100;
938 c.g = (c.g * (200 - shade)) / 100; 1011 c.g = (c.g * (200 - shade)) / 100;
939 c.b = (c.b * (200 - shade)) / 100; 1012 c.b = (c.b * (200 - shade)) / 100;
940 } 1013 }
… …
986 mask_c.blue = 0xffff - c.b; 1059 mask_c.blue = 0xffff - c.b;
987 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1060 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
988 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);
989 result |= transpPmapTinted; 1062 result |= transpPmapTinted;
990 } 1063 }
1064
991 XRenderFreePicture (dpy, mask_pic); 1065 XRenderFreePicture (dpy, mask_pic);
992 XRenderFreePicture (dpy, overlay_pic); 1066 XRenderFreePicture (dpy, overlay_pic);
993 XRenderFreePicture (dpy, back_pic); 1067 XRenderFreePicture (dpy, back_pic);
994# if DO_TIMING_TEST 1068# if DO_TIMING_TEST
995 XSync (dpy, False); 1069 XSync (dpy, False);
… …
1017} 1091}
1018 1092
1019bool 1093bool
1020bgPixmap_t::set_root_pixmap () 1094bgPixmap_t::set_root_pixmap ()
1021{ 1095{
1022 Pixmap new_root_pixmap = None;
1023
1024 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1096 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1025 if (new_root_pixmap == None) 1097 if (new_root_pixmap == None)
1026 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1098 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1027 1099
1028 if (new_root_pixmap != root_pixmap) 1100 if (new_root_pixmap != root_pixmap)
1029 { 1101 {
1030 root_pixmap = new_root_pixmap; 1102 root_pixmap = new_root_pixmap;
1031 return true; 1103 return true;
1032 } 1104 }
1105
1033 return false; 1106 return false;
1034} 1107}
1035# endif /* ENABLE_TRANSPARENCY */ 1108# endif /* ENABLE_TRANSPARENCY */
1036 1109
1037# ifndef HAVE_AFTERIMAGE 1110# ifndef HAVE_AFTERIMAGE
1038static 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);
1039# endif 1112# endif
1040
1041 1113
1042bool 1114bool
1043bgPixmap_t::render () 1115bgPixmap_t::render ()
1044{ 1116{
1045 unsigned long background_flags = 0; 1117 unsigned long background_flags = 0;
… …
1127 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1199 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1128 } 1200 }
1129 } 1201 }
1130# endif /* HAVE_AFTERIMAGE */ 1202# endif /* HAVE_AFTERIMAGE */
1131 1203
1132 if (result != NULL) 1204 if (result)
1133 { 1205 {
1134 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1206 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1207
1135 if (gc) 1208 if (gc)
1136 { 1209 {
1137 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1210 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1138 { 1211 {
1139 XFreePixmap (target->dpy, pixmap); 1212 XFreePixmap (target->dpy, pixmap);
1140 pixmap = None; 1213 pixmap = None;
1141 } 1214 }
1215
1142 if (pixmap == None) 1216 if (pixmap == None)
1143 { 1217 {
1144 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);
1145 pmap_width = result->width; 1219 pmap_width = result->width;
1146 pmap_height = result->height; 1220 pmap_height = result->height;
1147 pmap_depth = target->depth; 1221 pmap_depth = target->depth;
1148 } 1222 }
1223
1149 if (pmap_depth != result->depth) 1224 if (pmap_depth != result->depth)
1225 {
1150 { /* Bad Match error will ensue ! stupid X !!!! */ 1226 /* Bad Match error will ensue ! stupid X !!!! */
1151 if( result->depth == 24 && pmap_depth == 32) 1227 if (result->depth == 24 && pmap_depth == 32)
1152 result->depth = 32; 1228 result->depth = 32;
1153 else if( result->depth == 32 && pmap_depth == 24) 1229 else if (result->depth == 32 && pmap_depth == 24)
1154 result->depth = 24; 1230 result->depth = 24;
1155 else 1231 else
1156 { 1232 {
1157 /* TODO: implement image recoding */ 1233 /* TODO: implement image recoding */
1158 } 1234 }
1159 } 1235 }
1236
1160 if (pmap_depth == result->depth) 1237 if (pmap_depth == result->depth)
1161 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
1162 XFreeGC (target->dpy, gc); 1240 XFreeGC (target->dpy, gc);
1163 flags = flags & ~isInvalid; 1241 flags = flags & ~isInvalid;
1164 } 1242 }
1243
1165 XDestroyImage (result); 1244 XDestroyImage (result);
1166 } 1245 }
1167 1246
1168 if (flags & isInvalid) 1247 if (flags & isInvalid)
1169 { 1248 {
… …
1173 pixmap = None; 1252 pixmap = None;
1174 } 1253 }
1175 } 1254 }
1176 1255
1177 apply (); 1256 apply ();
1257
1258 XSync (target->dpy, False);
1259 valid_since = ev::now ();
1178 1260
1179 TIMING_TEST_PRINT_RESULT (tp); 1261 TIMING_TEST_PRINT_RESULT (tp);
1180 1262
1181 return true; 1263 return true;
1182} 1264}
… …
1195 } 1277 }
1196 return false; 1278 return false;
1197} 1279}
1198 1280
1199void 1281void
1200bgPixmap_t::apply() 1282bgPixmap_t::apply ()
1201{ 1283{
1202 if (target) 1284 if (target)
1203 { 1285 {
1204 flags &= ~isVtOrigin; 1286 flags &= ~isVtOrigin;
1205 if (pixmap != None) 1287 if (pixmap != None)
1288 {
1206 { /* set target's background to pixmap */ 1289 /* set target's background to pixmap */
1207# ifdef ENABLE_TRANSPARENCY 1290# ifdef ENABLE_TRANSPARENCY
1208 if (flags & isTransparent) 1291 if (flags & isTransparent)
1209 { 1292 {
1210 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1293 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1211 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1294 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1212# if HAVE_SCROLLBARS
1213 if (target->scrollBar.win) 1295 if (target->scrollBar.win)
1214 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1296 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1215# endif
1216 } 1297 }
1217 else 1298 else
1218# endif 1299# endif
1219 { 1300 {
1220 flags |= isVtOrigin; 1301 flags |= isVtOrigin;
1221 /* force old pixmap dereference in case it was transparent before :*/ 1302 /* force old pixmap dereference in case it was transparent before :*/
1222 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1303 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1223 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1304 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1224 /* do we also need to set scrollbar's background here ? */ 1305 /* do we also need to set scrollbar's background here ? */
1225# if HAVE_SCROLLBARS
1226 if (target->scrollBar.win) 1306 if (target->scrollBar.win)
1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1307 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228# endif
1229 } 1308 }
1230 } 1309 }
1231 else 1310 else
1311 {
1232 { /* set target background to a pixel */ 1312 /* set target background to a pixel */
1233 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1313 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1234 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1314 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1235 /* do we also need to set scrollbar's background here ? */ 1315 /* do we also need to set scrollbar's background here ? */
1236# if HAVE_SCROLLBARS
1237 if (target->scrollBar.win) 1316 if (target->scrollBar.win)
1238 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1317 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1239# endif
1240 } 1318 }
1241 /* 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
1242 scr_touch or we get a great deal of flicker otherwise: */ 1320 scr_touch or we get a great deal of flicker otherwise: */
1243 XClearWindow (target->dpy, target->parent[0]); 1321 XClearWindow (target->dpy, target->parent[0]);
1244 1322
1245# if HAVE_SCROLLBARS
1246 if (target->scrollBar.win) 1323 if (target->scrollBar.win)
1247 { 1324 {
1248 target->scrollBar.setIdle (); 1325 target->scrollBar.state = STATE_IDLE;
1249 target->scrollbar_show (0); 1326 target->scrollbar_show (0);
1250 } 1327 }
1251# endif
1252 1328
1253 target->want_refresh = 1; 1329 target->want_refresh = 1;
1254 flags |= hasChanged; 1330 flags |= hasChanged;
1255 } 1331 }
1256} 1332}
1257 1333
1258#endif /* HAVE_BG_PIXMAP */ 1334#endif /* HAVE_BG_PIXMAP */
1259 1335
1260#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1336#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1261/* taken from aterm-0.4.2 */ 1337/* taken from aterm-0.4.2 */
1262 1338
1263typedef uint32_t RUINT32T; 1339typedef uint32_t RUINT32T;

Diff Legend

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