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.1 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.30 by ayin, Tue Feb 19 10:47:03 2008 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xmp.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) \
38 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\
40 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)
41 39
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
90bgPixmap_t::bgPixmap_t ()
91{
92 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL;
96#endif
97#ifdef BG_IMAGE_FROM_FILE
98 h_scale = v_scale = 0;
99 h_align = v_align = 0;
100#endif
101 flags = 0;
102 pixmap = None;
103 valid_since = invalid_since = 0;
104 target = 0;
105}
106
107void
108bgPixmap_t::destroy ()
109{
110#ifdef HAVE_AFTERIMAGE
111 if (original_asim)
112 safe_asimage_destroy (original_asim);
113#endif
114
115 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap);
117}
118
92bool 119bool
93bgPixmap_t::window_size_sensitive () 120bgPixmap_t::window_size_sensitive ()
94{ 121{
95# ifdef XPM_BACKGROUND
96# ifdef HAVE_AFTERIMAGE
97 if (original_asim != NULL)
98# endif
99 {
100 if (h_scale != 0 || v_scale != 0
101 || h_align != 0 || v_align != 0)
102 return true;
103 }
104# endif
105# ifdef ENABLE_TRANSPARENCY 122# ifdef ENABLE_TRANSPARENCY
106 if (flags & isTransparent) 123 if (flags & isTransparent)
107 return true; 124 return true;
108# 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
109 return false; 138 return false;
110} 139}
111 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
112bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
113{ 163{
114# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
115 if (original_asim != NULL) 165 if (original_asim)
116 return true; 166 return true;
117# endif 167# endif
118# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
119 if (flags & isTransparent) 169 if (flags & isTransparent)
120 { 170 {
171# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
121 if (((flags & blurNeeded) && !(flags & blurServerSide)) 172 if ((flags & blurNeeded) && !(flags & blurServerSide))
173 return true;
174# endif
122 || ((flags & tintNeeded) && !(flags & tintServerSide))) 175 if ((flags & tintNeeded) && !(flags & tintServerSide))
123 return true; 176 return true;
124 } 177 }
125# endif 178# endif
126 return false; 179 return false;
127} 180}
128 181
129# ifdef XPM_BACKGROUND 182# ifdef BG_IMAGE_FROM_FILE
130static inline bool 183static inline bool
131check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 184check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132{ 185{
133 if (geom_flags & flag) 186 if (geom_flags & flag)
134 { 187 {
146static inline bool 199static inline bool
147check_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)
148{ 201{
149 if (geom_flags & flag) 202 if (geom_flags & flag)
150 { 203 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
151 if (new_value < -100) 206 if (new_value < -100)
152 new_value = -100; 207 new_value = -100;
153 else if (new_value > 200) 208 else if (new_value > 200)
154 new_value = 200; 209 new_value = 200;
210 }
155 if (new_value != align) 211 if (new_value != align)
156 { 212 {
157 align = new_value; 213 align = new_value;
158 return true; 214 return true;
159 } 215 }
204 int x = 0, y = 0; 260 int x = 0, y = 0;
205 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
206 unsigned int n; 262 unsigned int n;
207 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
208 char *p; 264 char *p;
209# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
210 266
211 if (geom == NULL) 267 if (geom == NULL)
212 return false; 268 return false;
213 269
214 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
221 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
222 { 278 {
223 char *ops; 279 char *ops;
224 new_flags |= geometrySet; 280 new_flags |= geometrySet;
225 281
226 strncpy (str, geom, n); 282 memcpy (str, geom, n);
227 str[n] = '\0'; 283 str[n] = '\0';
228 if (str[0] == ':') 284 if (str[0] == ':')
229 ops = &str[0]; 285 ops = &str[0];
230 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
231 ops = &str[0]; 287 ops = &str[0];
251 y = x; 307 y = x;
252 geom_flags |= YValue; 308 geom_flags |= YValue;
253 } 309 }
254 310
255 if (flags & geometrySet) 311 if (flags & geometrySet)
312 {
256 {/* new geometry is an adjustment to the old one ! */ 313 /* new geometry is an adjustment to the old one ! */
257 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 314 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
258 { 315 {
259 if (w == 0 && h != 0) 316 if (w == 0 && h != 0)
260 { 317 {
261 w = h_scale; 318 w = h_scale;
277 } 334 }
278 } 335 }
279 else /* setting up geometry from scratch */ 336 else /* setting up geometry from scratch */
280 { 337 {
281 if (!(geom_flags & XValue)) 338 if (!(geom_flags & XValue))
339 {
282 {/* use default geometry - centered */ 340 /* use default geometry - centered */
283 x = y = defaultAlign; 341 x = y = defaultAlign;
284 } 342 }
285 else if (!(geom_flags & YValue)) 343 else if (!(geom_flags & YValue))
286 y = x; 344 y = x;
287 345
288 if ((geom_flags & (WidthValue|HeightValue)) == 0) 346 if ((geom_flags & (WidthValue|HeightValue)) == 0)
347 {
289 {/* use default geometry - scaled */ 348 /* use default geometry - scaled */
290 w = h = defaultScale; 349 w = h = defaultScale;
291 } 350 }
292 else if (geom_flags & WidthValue) 351 else if (geom_flags & WidthValue)
293 { 352 {
294 if (!(geom_flags & HeightValue)) 353 if (!(geom_flags & HeightValue))
297 else 356 else
298 w = h; 357 w = h;
299 } 358 }
300 } /* done parsing geometry string */ 359 } /* done parsing geometry string */
301 else if (!(flags & geometrySet)) 360 else if (!(flags & geometrySet))
361 {
302 { /* default geometry - scaled and centered */ 362 /* default geometry - scaled and centered */
303 x = y = defaultAlign; 363 x = y = defaultAlign;
304 w = h = defaultScale; 364 w = h = defaultScale;
305 } 365 }
306 366
307 if (!(flags & geometrySet)) 367 if (!(flags & geometrySet))
308 geom_flags |= WidthValue|HeightValue|XValue|YValue; 368 geom_flags |= WidthValue|HeightValue|XValue|YValue;
309 369
310 if (ops) 370 if (ops)
311 { 371 {
312 while (*ops) 372 while (*ops)
313 { 373 {
314 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
315# 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)
316 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
317 { 378 {
318 w = h = 0; 379 w = h = noScale;
319 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
320 } 381 }
321 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
322 { 383 {
323 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
324 { 385 {
325 w = 100; 386 w = windowScale;
326 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
327 } 388 }
328 new_flags |= propScale; 389 new_flags |= propScale;
329 } 390 }
330 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
331 { 392 {
332 if (w == 0) 393 if (w == 0) w = windowScale;
333 w = 100; 394
334 h = 0; 395 h = noScale;
335 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
336 } 397 }
337 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
338 { 399 {
339 if (h == 0) 400 if (h == 0) h = windowScale;
340 h = 100; 401
341 w = 0; 402 w = noScale;
342 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
343 } 404 }
344 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
345 { 406 {
346 if (h == 0) 407 if (h == 0) h = windowScale;
347 h = 100;
348 if (w == 0) 408 if (w == 0) w = windowScale;
349 w = 100; 409
350 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
351 } 411 }
352 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
353 { 413 {
354 w = h = 100; 414 w = h = windowScale;
355 x = y = 50; 415 x = y = centerAlign;
356 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
357 } 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 }
358# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
359 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
360 } /* done parsing ops */ 427 } /* done parsing ops */
361 } 428 }
362 429
363 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
364 ++changed;
365 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
366 ++changed;
367 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
368 ++changed;
369 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
370 ++changed;
371 } 434 }
372 435
373 if (new_flags != flags) 436 if (new_flags != flags)
374 { 437 {
375 flags = new_flags; 438 flags = new_flags;
376 changed++; 439 changed++;
377 } 440 }
441
378//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
379// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
380 return (changed > 0); 444 return (changed > 0);
381} 445}
382 446
383# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
399 463
400 TIMING_TEST_START (asim); 464 TIMING_TEST_START (asim);
401 465
402 if (original_asim) 466 if (original_asim)
403 { 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)
404 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)
405 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);
406 } 480 }
407 481
408 if (original_asim == NULL 482 if (!original_asim
409 || x >= target_width 483 || x >= target_width
410 || y >= target_height 484 || y >= target_height
411 || (w > 0 && x + w <= 0) 485 || (w > 0 && x + w <= 0)
412 || (h > 0 && y + h <= 0)) 486 || (h > 0 && y + h <= 0))
413 { 487 {
414 if (background) 488 if (background)
415 { 489 {
416 new_pmap_width = background->width; 490 new_pmap_width = background->width;
417 new_pmap_height = background->height; 491 new_pmap_height = background->height;
418 result = background; 492 result = background;
493
419 if (background_tint != TINT_LEAVE_SAME) 494 if (background_tint != TINT_LEAVE_SAME)
420 { 495 {
421 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 496 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
422 target_width, target_height, background_tint, 497 target_width, target_height, background_tint,
423 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 498 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
429 new_pmap_width = new_pmap_height = 0; 504 new_pmap_width = new_pmap_height = 0;
430 } 505 }
431 else 506 else
432 { 507 {
433 result = original_asim; 508 result = original_asim;
509
434 if ((w > 0 && w != original_asim->width) 510 if ((w > 0 && w != original_asim->width)
435 || (h > 0 && h != original_asim->height)) 511 || (h > 0 && h != original_asim->height))
436 { 512 {
437 result = scale_asimage (target->asv, original_asim, 513 result = scale_asimage (target->asv, original_asim,
438 w > 0 ? w : original_asim->width, 514 w > 0 ? w : original_asim->width,
439 h > 0 ? h : original_asim->height, 515 h > 0 ? h : original_asim->height,
440 background ? ASA_ASImage : ASA_XImage, 516 background ? ASA_ASImage : ASA_XImage,
441 100, ASIMAGE_QUALITY_DEFAULT); 517 100, ASIMAGE_QUALITY_DEFAULT);
442 } 518 }
519
443 if (background == NULL) 520 if (background == NULL)
521 {
444 {/* 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! */
445 if (h_scale == 0) 524 if (h_scale == 0)
446 new_pmap_width = result->width; 525 new_pmap_width = min (result->width, target_width);
447 if (v_scale == 0) 526 if (v_scale == 0)
448 new_pmap_height = result->height; 527 new_pmap_height = min (result->height, target_height);
449 /* 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 */
450 if (h_scale == 0 || v_scale == 0) 529 if (h_scale == 0 || v_scale == 0)
451 { 530 {
452 ASImage *tmp = tile_asimage (target->asv, result, 531 ASImage *tmp = tile_asimage (target->asv, result,
453 (h_scale > 0) ? 0 : (int)result->width - x, 532 (h_scale > 0) ? 0 : (int)result->width - x,
454 (v_scale > 0) ? 0 : (int)result->height - y, 533 (v_scale > 0) ? 0 : (int)result->height - y,
534 new_pmap_width,
455 result->width, result->height, 535 new_pmap_height,
456 TINT_LEAVE_SAME, ASA_XImage, 536 TINT_LEAVE_SAME, ASA_XImage,
457 100, ASIMAGE_QUALITY_DEFAULT); 537 100, ASIMAGE_QUALITY_DEFAULT);
458 if (tmp) 538 if (tmp)
459 { 539 {
460 if (result != original_asim) 540 if (result != original_asim)
461 destroy_asimage (&result); 541 destroy_asimage (&result);
542
462 result = tmp; 543 result = tmp;
463 } 544 }
464 } 545 }
465 } 546 }
466 else 547 else
548 {
467 {/* 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 */
468 ASImageLayer *layers = create_image_layers (2); 550 ASImageLayer *layers = create_image_layers (2);
469 ASImage *merged_im = NULL; 551 ASImage *merged_im = NULL;
470 552
471 layers[0].im = background; 553 layers[0].im = background;
472 layers[0].clip_width = target_width; 554 layers[0].clip_width = target_width;
473 layers[0].clip_height = target_height; 555 layers[0].clip_height = target_height;
474 layers[0].tint = background_tint; 556 layers[0].tint = background_tint;
475 layers[1].im = result; 557 layers[1].im = result;
558
476 if (w <= 0) 559 if (w <= 0)
560 {
477 {/* tile horizontally */ 561 /* tile horizontally */
478 while (x > 0) x -= (int)result->width; 562 while (x > 0) x -= (int)result->width;
479 layers[1].dst_x = x; 563 layers[1].dst_x = x;
480 layers[1].clip_width = result->width+target_width; 564 layers[1].clip_width = result->width+target_width;
481 } 565 }
482 else 566 else
567 {
483 {/* clip horizontally */ 568 /* clip horizontally */
484 layers[1].dst_x = x; 569 layers[1].dst_x = x;
485 layers[1].clip_width = result->width; 570 layers[1].clip_width = result->width;
486 } 571 }
572
487 if (h <= 0) 573 if (h <= 0)
488 { 574 {
489 while (y > 0) y -= (int)result->height; 575 while (y > 0) y -= (int)result->height;
490 layers[1].dst_y = y; 576 layers[1].dst_y = y;
491 layers[1].clip_height = result->height + target_height; 577 layers[1].clip_height = result->height + target_height;
493 else 579 else
494 { 580 {
495 layers[1].dst_y = y; 581 layers[1].dst_y = y;
496 layers[1].clip_height = result->height; 582 layers[1].clip_height = result->height;
497 } 583 }
584
498 if (target->rs[Rs_blendtype]) 585 if (target->rs[Rs_blendtype])
499 { 586 {
500 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 587 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
501 if (layers[1].merge_scanlines == NULL) 588 if (layers[1].merge_scanlines == NULL)
502 layers[1].merge_scanlines = alphablend_scanlines; 589 layers[1].merge_scanlines = alphablend_scanlines;
503 } 590 }
591
504 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,
505 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 593 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
594
506 if (tmp) 595 if (tmp)
507 { 596 {
508 if (result != original_asim) 597 if (result != original_asim)
509 destroy_asimage (&result); 598 destroy_asimage (&result);
599
510 result = tmp; 600 result = tmp;
511 } 601 }
602
512 free (layers); 603 free (layers);
513 } 604 }
514 } 605 }
515 TIMING_TEST_PRINT_RESULT (asim); 606 TIMING_TEST_PRINT_RESULT (asim);
516 607
545 636
546 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;
547 int dst_width = result->width, dst_height = result->height; 638 int dst_width = result->width, dst_height = result->height;
548 if (background == NULL) 639 if (background == NULL)
549 { 640 {
550 if (h_scale > 0)
551 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 );
552 if (v_scale > 0)
553 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);
554 643
555 if (dst_x > 0 || dst_y > 0 644 if (dst_x > 0 || dst_y > 0
556 || dst_x + dst_width < new_pmap_width 645 || dst_x + dst_width < new_pmap_width
557 || dst_y + dst_height < new_pmap_height) 646 || dst_y + dst_height < new_pmap_height)
558 {
559 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);
560 }
561 } 648 }
562 649
563 /* put result on pixmap */ 650 /* put result on pixmap */
564 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 651 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
565 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);
566 653
567 if (result != background && result != original_asim) 654 if (result != background && result != original_asim)
568 destroy_asimage (&result); 655 destroy_asimage (&result);
569 656
570 XFreeGC (target->dpy, gc); 657 XFreeGC (target->dpy, gc);
571 TIMING_TEST_PRINT_RESULT (asim); 658 TIMING_TEST_PRINT_RESULT (asim);
578bool 665bool
579bgPixmap_t::set_file (const char *file) 666bgPixmap_t::set_file (const char *file)
580{ 667{
581 char *f; 668 char *f;
582 669
583 assert (file != NULL); 670 assert (file);
584 671
585 if (*file != '\0') 672 if (*file)
586 { 673 {
587# ifdef HAVE_AFTERIMAGE 674# ifdef HAVE_AFTERIMAGE
588 if (target->asimman == NULL) 675 if (target->asimman == NULL)
589 target->asimman = create_generic_imageman (target->rs[Rs_path]); 676 target->asimman = create_generic_imageman (target->rs[Rs_path]);
677
590 if ((f = strchr (file, ';')) == NULL) 678 if ((f = strchr (file, ';')) == NULL)
591 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 679 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
592 else 680 else
593 { 681 {
594 size_t len = f - file; 682 size_t len = f - file;
595 f = (char *)malloc (len + 1); 683 f = (char *)malloc (len + 1);
596 strncpy (f, file, len); 684 memcpy (f, file, len);
597 f[len] = '\0'; 685 f[len] = '\0';
598 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
599 free (f); 687 free (f);
600 } 688 }
689
601 return (original_asim != NULL); 690 return original_asim;
602# endif 691# endif
603 } 692 }
693
604 return false; 694 return false;
605} 695}
606 696
607# endif /* XPM_BACKGROUND */ 697# endif /* BG_IMAGE_FROM_FILE */
608 698
609# ifdef ENABLE_TRANSPARENCY 699# ifdef ENABLE_TRANSPARENCY
610bool 700bool
611bgPixmap_t::set_transparent () 701bgPixmap_t::set_transparent ()
612{ 702{
613 if (!(flags & isTransparent)) 703 if (!(flags & isTransparent))
614 { 704 {
615 flags |= isTransparent; 705 flags |= isTransparent;
616 return true; 706 return true;
617 } 707 }
708
618 return false; 709 return false;
619} 710}
620 711
621bool 712bool
622bgPixmap_t::set_blur_radius (const char *geom) 713bgPixmap_t::set_blur_radius (const char *geom)
640 if (v_blurRadius != vr) 731 if (v_blurRadius != vr)
641 { 732 {
642 ++changed; 733 ++changed;
643 v_blurRadius = vr; 734 v_blurRadius = vr;
644 } 735 }
645 736
646 if (v_blurRadius == 0 && h_blurRadius == 0) 737 if (v_blurRadius == 0 && h_blurRadius == 0)
647 flags &= ~blurNeeded; 738 flags &= ~blurNeeded;
648 else 739 else
649 flags |= blurNeeded; 740 flags |= blurNeeded;
650 741
654static inline unsigned long 745static inline unsigned long
655compute_tint_shade_flags (rxvt_color *tint, int shade) 746compute_tint_shade_flags (rxvt_color *tint, int shade)
656{ 747{
657 unsigned long flags = 0; 748 unsigned long flags = 0;
658 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 749 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
750 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200);
659 751
660 if (tint) 752 if (tint)
661 { 753 {
662 tint->get (c); 754 tint->get (c);
663# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 755# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
664 if (IS_COMPONENT_WHOLESOME (c.r) 756 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
665 && IS_COMPONENT_WHOLESOME (c.g) 757 && IS_COMPONENT_WHOLESOME (c.g)
666 && IS_COMPONENT_WHOLESOME (c.b)) 758 && IS_COMPONENT_WHOLESOME (c.b))
667 flags |= bgPixmap_t::tintWholesome; 759 flags |= bgPixmap_t::tintWholesome;
668# undef IS_COMPONENT_WHOLESOME 760# undef IS_COMPONENT_WHOLESOME
669 } 761 }
670 762
671 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200)) 763 if (has_shade)
672 flags |= bgPixmap_t::tintNeeded; 764 flags |= bgPixmap_t::tintNeeded;
673 else if (tint) 765 else if (tint)
674 { 766 {
675 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 767 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
676 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 768 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
677 { 769 {
678 flags |= bgPixmap_t::tintNeeded; 770 flags |= bgPixmap_t::tintNeeded;
679 } 771 }
680 } 772 }
681 773
682 if (flags & bgPixmap_t::tintNeeded) 774 if (flags & bgPixmap_t::tintNeeded)
683 { 775 {
684 if (flags & bgPixmap_t::tintWholesome) 776 if (flags & bgPixmap_t::tintWholesome)
685 flags |= bgPixmap_t::tintServerSide; 777 flags |= bgPixmap_t::tintServerSide;
778 else
779 {
686#if XFT 780#if XFT
687 flags |= bgPixmap_t::tintServerSide; 781 flags |= bgPixmap_t::tintServerSide;
688#endif 782#endif
783 }
689 } 784 }
690 785
691 return flags; 786 return flags;
692} 787}
693 788
699 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 794 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
700 tint = new_tint; 795 tint = new_tint;
701 flags = (flags & ~tintFlags) | new_flags | tintSet; 796 flags = (flags & ~tintFlags) | new_flags | tintSet;
702 return true; 797 return true;
703 } 798 }
799
704 return false; 800 return false;
705} 801}
706 802
707bool 803bool
708bgPixmap_t::unset_tint () 804bgPixmap_t::unset_tint ()
712 if (new_flags != (flags & tintFlags)) 808 if (new_flags != (flags & tintFlags))
713 { 809 {
714 flags = (flags&~tintFlags)|new_flags; 810 flags = (flags&~tintFlags)|new_flags;
715 return true; 811 return true;
716 } 812 }
813
717 return false; 814 return false;
718} 815}
719 816
720bool 817bool
721bgPixmap_t::set_shade (const char *shade_str) 818bgPixmap_t::set_shade (const char *shade_str)
722{ 819{
723 int new_shade = (shade_str) ? atoi (shade_str) : 0; 820 int new_shade = (shade_str) ? atoi (shade_str) : 0;
724 821
822 if (new_shade < 0 && new_shade > -100)
823 new_shade = 200 - (100 + new_shade);
725 if (new_shade == 100) 824 else if (new_shade == 100)
726 new_shade = 0; 825 new_shade = 0;
727 826
728 if (new_shade != shade) 827 if (new_shade != shade)
729 { 828 {
730 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);
731 shade = new_shade; 830 shade = new_shade;
732 flags = (flags & ~tintFlags) | new_flags; 831 flags = (flags & (~tintFlags | tintSet)) | new_flags;
733 return true; 832 return true;
734 } 833 }
834
735 return false; 835 return false;
736} 836}
737 837
738/* make_transparency_pixmap() 838/* make_transparency_pixmap()
739 * 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
740 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 840 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
741 * our window. 841 * our window.
742 */ 842 */
743unsigned long 843unsigned long
744bgPixmap_t::make_transparency_pixmap () 844bgPixmap_t::make_transparency_pixmap ()
745{ 845{
769 if (sx + window_width <= 0 || sy + window_height <= 0 869 if (sx + window_width <= 0 || sy + window_height <= 0
770 || sx >= root_width || sy >= root_height) 870 || sx >= root_width || sy >= root_height)
771 return 0; 871 return 0;
772 872
773 if (root_pixmap != None) 873 if (root_pixmap != None)
874 {
774 {/* 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 : */
775 int junk; 876 int junk;
776 unsigned int ujunk; 877 unsigned int ujunk;
777 /* root pixmap may be bad - allow a error */ 878 /* root pixmap may be bad - allow a error */
778 target->allowedxerror = -1; 879 target->allowedxerror = -1;
779 880
788 889
789 if (tiled_root_pmap == None) /* something really bad happened - abort */ 890 if (tiled_root_pmap == None) /* something really bad happened - abort */
790 return 0; 891 return 0;
791 892
792 if (root_pixmap == None) 893 if (root_pixmap == None)
894 {
793 { /* use tricks to obtain the root background image :*/ 895 /* use tricks to obtain the root background image :*/
794 /* we want to create Overrideredirect window overlapping out window 896 /* we want to create Overrideredirect window overlapping out window
795 with background type of Parent Relative and then grab it */ 897 with background type of Parent Relative and then grab it */
796 XSetWindowAttributes attr; 898 XSetWindowAttributes attr;
797 Window src; 899 Window src;
798 bool success = false; 900 bool success = false;
813 XGrabServer (dpy); 915 XGrabServer (dpy);
814 XMapRaised (dpy, src); 916 XMapRaised (dpy, src);
815 XSync (dpy, False); 917 XSync (dpy, False);
816 918
817 /* XSync should get window where it's properly exposed, 919 /* XSync should get window where it's properly exposed,
818 * 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 : */
819 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 921 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
820 ++ev_count; 922 ++ev_count;
821 923
822 if (ev_count > 0); 924 if (ev_count > 0);
925 {
823 { /* hooray! - we can grab the image! */ 926 /* hooray! - we can grab the image! */
824 gc = XCreateGC (dpy, root, 0, NULL); 927 gc = XCreateGC (dpy, root, 0, NULL);
825 if (gc) 928 if (gc)
826 { 929 {
827 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);
828 success = true; 931 success = true;
829 } 932 }
830 } 933 }
934
831 XDestroyWindow (dpy, src); 935 XDestroyWindow (dpy, src);
832 XUngrabServer (dpy); 936 XUngrabServer (dpy);
833 //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);
834 } 938 }
835 939
840 } 944 }
841 else 945 else
842 result |= transpPmapTiled; 946 result |= transpPmapTiled;
843 } 947 }
844 else 948 else
949 {
845 {/* strightforward pixmap copy */ 950 /* strightforward pixmap copy */
846 gcv.tile = root_pixmap; 951 gcv.tile = root_pixmap;
847 gcv.fill_style = FillTiled; 952 gcv.fill_style = FillTiled;
848 953
849 while (sx < 0) sx += (int)window_width; 954 while (sx < 0) sx += (int)root_width;
850 while (sy < 0) sy += (int)window_height; 955 while (sy < 0) sy += (int)root_height;
851 956
852 gcv.ts_x_origin = -sx; 957 gcv.ts_x_origin = -sx;
853 gcv.ts_y_origin = -sy; 958 gcv.ts_y_origin = -sy;
854 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 959 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
855 960
861 } 966 }
862 TIMING_TEST_PRINT_RESULT (tp); 967 TIMING_TEST_PRINT_RESULT (tp);
863 968
864 if (tiled_root_pmap != None) 969 if (tiled_root_pmap != None)
865 { 970 {
866 if (!need_client_side_rendering ()) 971 if (!need_client_side_rendering ())
867 { 972 {
868 if ((flags & tintNeeded)) 973 if ((flags & tintNeeded))
869 { 974 {
870 if (flags & tintWholesome) 975 if (flags & tintWholesome)
871 { 976 {
872 /* In this case we can tint image server-side getting significant 977 /* In this case we can tint image server-side getting significant
873 * performance improvements, as we eliminate XImage transfer 978 * performance improvements, as we eliminate XImage transfer
898 { 1003 {
899 c.r = (c.r * shade) / 100; 1004 c.r = (c.r * shade) / 100;
900 c.g = (c.g * shade) / 100; 1005 c.g = (c.g * shade) / 100;
901 c.b = (c.b * shade) / 100; 1006 c.b = (c.b * shade) / 100;
902 } 1007 }
903 else if( shade > 100 && shade < 200) 1008 else if (shade > 100 && shade < 200)
904 { 1009 {
905 c.r = (c.r * (200 - shade)) / 100; 1010 c.r = (c.r * (200 - shade)) / 100;
906 c.g = (c.g * (200 - shade)) / 100; 1011 c.g = (c.g * (200 - shade)) / 100;
907 c.b = (c.b * (200 - shade)) / 100; 1012 c.b = (c.b * (200 - shade)) / 100;
908 } 1013 }
914 pf.direct.greenMask = 0xff; 1019 pf.direct.greenMask = 0xff;
915 pf.direct.blueMask = 0xff; 1020 pf.direct.blueMask = 0xff;
916 pf.direct.alphaMask = 0xff; 1021 pf.direct.alphaMask = 0xff;
917 1022
918 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1023 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
919 (PictFormatType| 1024 (PictFormatType|
920 PictFormatDepth| 1025 PictFormatDepth|
921 PictFormatRedMask| 1026 PictFormatRedMask|
922 PictFormatGreenMask| 1027 PictFormatGreenMask|
923 PictFormatBlueMask| 1028 PictFormatBlueMask|
924 PictFormatAlphaMask), 1029 PictFormatAlphaMask),
925 &pf, 1030 &pf,
926 0); 1031 0);
927 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1032 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
928 XRenderPictureAttributes pa ; 1033 XRenderPictureAttributes pa ;
929 1034
930 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); 1035 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
931 1036
933 1038
934 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1039 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
935 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1040 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
936 XFreePixmap (dpy, overlay_pmap); 1041 XFreePixmap (dpy, overlay_pmap);
937 1042
938 pa.component_alpha = True; 1043 pa.component_alpha = True;
939 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1044 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
940 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1045 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
941 XFreePixmap (dpy, mask_pmap); 1046 XFreePixmap (dpy, mask_pmap);
942 1047
943 if (mask_pic && overlay_pic && back_pic) 1048 if (mask_pic && overlay_pic && back_pic)
945 XRenderColor mask_c; 1050 XRenderColor mask_c;
946 1051
947 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1052 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
948 mask_c.alpha = 0xffff; 1053 mask_c.alpha = 0xffff;
949 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1054 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
950 memset (&mask_c, 0x0, sizeof (mask_c)); 1055
951 mask_c.alpha = 0; 1056 mask_c.alpha = 0;
952 1057 mask_c.red = 0xffff - c.r;
953 if (c.r == c.b && c.b == c.g) /* pure shading */ 1058 mask_c.green = 0xffff - c.g;
954 { 1059 mask_c.blue = 0xffff - c.b;
955 mask_c.red = mask_c.green = mask_c.blue = 0xffff - c.r;
956 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1060 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
957 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);
958 }
959 else
960 {
961 mask_c.red = 0xffff - c.r;
962 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
963 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
964 mask_c.red = 0;
965 mask_c.green = 0xffff - c.g;
966 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
967 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
968 mask_c.green = 0;
969 mask_c.blue = 0xffff - c.b;
970 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
971 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
972 }
973 result |= transpPmapTinted; 1062 result |= transpPmapTinted;
974 } 1063 }
1064
975 XRenderFreePicture (dpy, mask_pic); 1065 XRenderFreePicture (dpy, mask_pic);
976 XRenderFreePicture (dpy, overlay_pic); 1066 XRenderFreePicture (dpy, overlay_pic);
977 XRenderFreePicture (dpy, back_pic); 1067 XRenderFreePicture (dpy, back_pic);
978# if DO_TIMING_TEST 1068# if DO_TIMING_TEST
979 XSync (dpy, False); 1069 XSync (dpy, False);
980# endif 1070# endif
981# endif 1071# endif
982 } 1072 }
983 } 1073 }
984 } /* server side rendering completed */ 1074 } /* server side rendering completed */
985 1075
989 pixmap = tiled_root_pmap; 1079 pixmap = tiled_root_pmap;
990 pmap_width = window_width; 1080 pmap_width = window_width;
991 pmap_height = window_height; 1081 pmap_height = window_height;
992 pmap_depth = root_depth; 1082 pmap_depth = root_depth;
993 } 1083 }
994 1084
995 if (gc) 1085 if (gc)
996 XFreeGC (dpy, gc); 1086 XFreeGC (dpy, gc);
997 1087
998 TIMING_TEST_PRINT_RESULT (tp); 1088 TIMING_TEST_PRINT_RESULT (tp);
999 1089
1000 return result; 1090 return result;
1001} 1091}
1002 1092
1003bool 1093bool
1004bgPixmap_t::set_root_pixmap () 1094bgPixmap_t::set_root_pixmap ()
1005{ 1095{
1006 Pixmap new_root_pixmap = None;
1007
1008 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1096 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1009 if (new_root_pixmap == None) 1097 if (new_root_pixmap == None)
1010 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1098 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1011 1099
1012 if (new_root_pixmap != root_pixmap) 1100 if (new_root_pixmap != root_pixmap)
1013 { 1101 {
1014 root_pixmap = new_root_pixmap; 1102 root_pixmap = new_root_pixmap;
1015 return true; 1103 return true;
1016 } 1104 }
1105
1017 return false; 1106 return false;
1018} 1107}
1019# endif /* ENABLE_TRANSPARENCY */ 1108# endif /* ENABLE_TRANSPARENCY */
1020 1109
1021# ifndef HAVE_AFTERIMAGE 1110# ifndef HAVE_AFTERIMAGE
1022static 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);
1023# endif 1112# endif
1024 1113
1025
1026bool 1114bool
1027bgPixmap_t::render () 1115bgPixmap_t::render ()
1028{ 1116{
1029 unsigned long background_flags = 0; 1117 unsigned long background_flags = 0;
1030 1118
1031 if (target == NULL) 1119 if (target == NULL)
1032 return false; 1120 return false;
1121
1122 TIMING_TEST_START (tp);
1033 1123
1034 invalidate(); 1124 invalidate();
1035# ifdef ENABLE_TRANSPARENCY 1125# ifdef ENABLE_TRANSPARENCY
1036 if (flags & isTransparent) 1126 if (flags & isTransparent)
1037 { 1127 {
1090 } 1180 }
1091 else if (background_flags && pmap_depth != target->depth) 1181 else if (background_flags && pmap_depth != target->depth)
1092 { 1182 {
1093 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1183 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1094 } 1184 }
1185
1095# else /* our own client-side tinting */ 1186# elif !XFT /* our own client-side tinting */
1187
1188 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1189 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1190
1096 if (background_flags && (flags & isInvalid)) 1191 if (background_flags && (flags & isInvalid))
1097 { 1192 {
1098 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1193 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1099 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1194 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1100 { 1195 {
1104 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1199 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1105 } 1200 }
1106 } 1201 }
1107# endif /* HAVE_AFTERIMAGE */ 1202# endif /* HAVE_AFTERIMAGE */
1108 1203
1109 if (result != NULL) 1204 if (result)
1110 { 1205 {
1111 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1206 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1207
1112 if (gc) 1208 if (gc)
1113 { 1209 {
1114 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1210 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1115 { 1211 {
1116 XFreePixmap (target->dpy, pixmap); 1212 XFreePixmap (target->dpy, pixmap);
1117 pixmap = None; 1213 pixmap = None;
1118 } 1214 }
1215
1119 if (pixmap == None) 1216 if (pixmap == None)
1120 { 1217 {
1121 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);
1122 pmap_width = result->width; 1219 pmap_width = result->width;
1123 pmap_height = result->height; 1220 pmap_height = result->height;
1124 pmap_depth = target->depth; 1221 pmap_depth = target->depth;
1125 } 1222 }
1223
1126 if (pmap_depth != result->depth) 1224 if (pmap_depth != result->depth)
1225 {
1127 { /* Bad Match error will ensue ! stupid X !!!! */ 1226 /* Bad Match error will ensue ! stupid X !!!! */
1128 if( result->depth == 24 && pmap_depth == 32) 1227 if (result->depth == 24 && pmap_depth == 32)
1129 result->depth = 32; 1228 result->depth = 32;
1130 else if( result->depth == 32 && pmap_depth == 24) 1229 else if (result->depth == 32 && pmap_depth == 24)
1131 result->depth = 24; 1230 result->depth = 24;
1132 else 1231 else
1133 { 1232 {
1134 /* TODO: implement image recoding */ 1233 /* TODO: implement image recoding */
1135 } 1234 }
1136 } 1235 }
1236
1137 if (pmap_depth == result->depth) 1237 if (pmap_depth == result->depth)
1138 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
1139 XFreeGC (target->dpy, gc); 1240 XFreeGC (target->dpy, gc);
1140 flags = flags & ~isInvalid; 1241 flags = flags & ~isInvalid;
1141 } 1242 }
1243
1142 XDestroyImage (result); 1244 XDestroyImage (result);
1143 } 1245 }
1144 1246
1145 if (flags & isInvalid) 1247 if (flags & isInvalid)
1146 { 1248 {
1151 } 1253 }
1152 } 1254 }
1153 1255
1154 apply (); 1256 apply ();
1155 1257
1258 XSync (target->dpy, False);
1259 valid_since = ev::now ();
1260
1261 TIMING_TEST_PRINT_RESULT (tp);
1262
1156 return true; 1263 return true;
1157} 1264}
1158 1265
1159bool 1266bool
1160bgPixmap_t::set_target (rxvt_term *new_target) 1267bgPixmap_t::set_target (rxvt_term *new_target)
1161{ 1268{
1162 if (new_target) 1269 if (new_target)
1163 if (target != new_target) 1270 if (target != new_target)
1164 { 1271 {
1170 } 1277 }
1171 return false; 1278 return false;
1172} 1279}
1173 1280
1174void 1281void
1175bgPixmap_t::apply() 1282bgPixmap_t::apply ()
1176{ 1283{
1177 if (target) 1284 if (target)
1178 { 1285 {
1179 flags &= ~isVtOrigin; 1286 flags &= ~isVtOrigin;
1287
1180 if (pixmap != None) 1288 if (pixmap != None)
1289 {
1181 { /* set target's background to pixmap */ 1290 /* set target's background to pixmap */
1182# ifdef ENABLE_TRANSPARENCY 1291# ifdef ENABLE_TRANSPARENCY
1183 if (flags & isTransparent) 1292 if (flags & isTransparent)
1184 { 1293 {
1185 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1294 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1186 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1295 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1187# if HAVE_SCROLLBARS 1296
1188 if (target->scrollBar.win) 1297 if (target->scrollBar.win)
1189 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1298 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1190# endif
1191 } 1299 }
1192 else 1300 else
1193# endif 1301# endif
1194 { 1302 {
1195 flags |= isVtOrigin; 1303 flags |= isVtOrigin;
1196 /* force old pixmap dereference in case it was transparent before :*/ 1304 /* force old pixmap dereference in case it was transparent before :*/
1197 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1305 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1198 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1306 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1199 /* do we also need to set scrollbar's background here ? */ 1307 /* do we also need to set scrollbar's background here ? */
1200# if HAVE_SCROLLBARS 1308
1201 if (target->scrollBar.win) 1309 if (target->scrollBar.win)
1202 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1310 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1203# endif
1204 } 1311 }
1205 } 1312 }
1206 else 1313 else
1314 {
1207 { /* set target background to a pixel */ 1315 /* set target background to a pixel */
1208 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1316 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1209 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1317 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1210 /* do we also need to set scrollbar's background here ? */ 1318 /* do we also need to set scrollbar's background here ? */
1211# if HAVE_SCROLLBARS
1212 if (target->scrollBar.win) 1319 if (target->scrollBar.win)
1213 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1320 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1214# endif
1215 } 1321 }
1216 1322
1217 /* don't want Expose on the parent */ 1323 /* don't want Expose on the parent or vt. It is better to use
1324 scr_touch or we get a great deal of flicker otherwise: */
1218 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1325 XClearWindow (target->dpy, target->parent[0]);
1219 /* do want Expose on the vt, so we get refreshed properly */
1220 XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1221 1326
1222# if HAVE_SCROLLBARS
1223 if (target->scrollBar.win) 1327 if (target->scrollBar.win)
1224 { 1328 {
1225 target->scrollBar.setIdle (); 1329 target->scrollBar.state = STATE_IDLE;
1226 target->scrollbar_show (0); 1330 target->scrollBar.show (0);
1227 } 1331 }
1228# endif
1229 }
1230}
1231 1332
1333 target->want_refresh = 1;
1334 flags |= hasChanged;
1335 }
1336}
1337
1232#endif /* HAVE_BG_PIXMAP */ 1338#endif /* HAVE_BG_PIXMAP */
1233 1339
1234#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1340#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1235/* taken from aterm-0.4.2 */ 1341/* taken from aterm-0.4.2 */
1236 1342
1237typedef uint32_t RUINT32T; 1343typedef uint32_t RUINT32T;
1238 1344
1239static void 1345static void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines