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.9 by sasha, Mon Oct 29 13:39:43 2007 UTC vs.
Revision 1.41 by sf-exg, Sat Aug 21 16:07:15 2010 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-2008 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
14 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
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 { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 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) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
41 43
42#else 44#else
43#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
44#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
45#endif 47#endif
46 48
47/* 49/*
48 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
49 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
50 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
51 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
52 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
53 * affects on the background image : 55 * effects on the background image :
54 * 56 *
55 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
56 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
57 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
58 * the image in the window. 60 * the image in the window.
… …
87 * scale Scale both up and down 89 * scale Scale both up and down
88 * auto Same as 100x100+50+50 90 * auto Same as 100x100+50+50
89 */ 91 */
90 92
91#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
92bgPixmap_t::bgPixmap_t() 94bgPixmap_t::bgPixmap_t ()
93{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
97#ifdef BG_IMAGE_FROM_FILE 101#ifdef BG_IMAGE_FROM_FILE
98 h_scale = v_scale = 0; 102 h_scale = v_scale = 0;
99 h_align = v_align = 0; 103 h_align = v_align = 0;
100#endif 104#endif
101 flags = 0; 105 flags = 0;
102 pixmap = None; 106 pixmap = None;
107 valid_since = invalid_since = 0;
108 target = 0;
103} 109}
104 110
111void
112bgPixmap_t::destroy ()
113{
114#ifdef HAVE_AFTERIMAGE
115 if (original_asim)
116 safe_asimage_destroy (original_asim);
117#endif
118
119 if (pixmap && target)
120 XFreePixmap (target->dpy, pixmap);
121}
105 122
106bool 123bool
107bgPixmap_t::window_size_sensitive () 124bgPixmap_t::window_size_sensitive ()
108{ 125{
109# ifdef BG_IMAGE_FROM_FILE
110# ifdef HAVE_AFTERIMAGE
111 if (original_asim != NULL)
112# endif
113 {
114 if (h_scale != 0 || v_scale != 0
115 || h_align != 0 || v_align != 0)
116 return true;
117 }
118# endif
119# ifdef ENABLE_TRANSPARENCY 126# ifdef ENABLE_TRANSPARENCY
120 if (flags & isTransparent) 127 if (flags & isTransparent)
121 return true; 128 return true;
122# endif 129# endif
130
131# ifdef BG_IMAGE_FROM_FILE
132# ifdef HAVE_AFTERIMAGE
133 if (original_asim)
134# endif
135 {
136 if (h_scale != 0 || v_scale != 0
137 || h_align != 0 || v_align != 0)
138 return true;
139 }
140# endif
141
123 return false; 142 return false;
124} 143}
125 144
145bool
146bgPixmap_t::window_position_sensitive ()
147{
148# ifdef ENABLE_TRANSPARENCY
149 if (flags & isTransparent)
150 return true;
151# endif
152
153# ifdef BG_IMAGE_FROM_FILE
154# ifdef HAVE_AFTERIMAGE
155 if (original_asim)
156# endif
157 {
158 if (h_align == rootAlign || v_align == rootAlign)
159 return true;
160 }
161# endif
162
163 return false;
164};
165
126bool bgPixmap_t::need_client_side_rendering () 166bool bgPixmap_t::need_client_side_rendering ()
127{ 167{
128# ifdef HAVE_AFTERIMAGE 168# ifdef HAVE_AFTERIMAGE
129 if (original_asim != NULL) 169 if (original_asim)
130 return true; 170 return true;
131# endif 171# endif
132# ifdef ENABLE_TRANSPARENCY 172# ifdef ENABLE_TRANSPARENCY
133 if (flags & isTransparent) 173 if (flags & isTransparent)
134 { 174 {
… …
163static inline bool 203static inline bool
164check_set_align_value (int geom_flags, int flag, int &align, int new_value) 204check_set_align_value (int geom_flags, int flag, int &align, int new_value)
165{ 205{
166 if (geom_flags & flag) 206 if (geom_flags & flag)
167 { 207 {
208 if (new_value != bgPixmap_t::rootAlign)
209 {
168 if (new_value < -100) 210 if (new_value < -100)
169 new_value = -100; 211 new_value = -100;
170 else if (new_value > 200) 212 else if (new_value > 200)
171 new_value = 200; 213 new_value = 200;
214 }
172 if (new_value != align) 215 if (new_value != align)
173 { 216 {
174 align = new_value; 217 align = new_value;
175 return true; 218 return true;
176 } 219 }
… …
220 int geom_flags = 0, changed = 0; 263 int geom_flags = 0, changed = 0;
221 int x = 0, y = 0; 264 int x = 0, y = 0;
222 unsigned int w = 0, h = 0; 265 unsigned int w = 0, h = 0;
223 unsigned int n; 266 unsigned int n;
224 unsigned long new_flags = (flags & (~geometryFlags)); 267 unsigned long new_flags = (flags & (~geometryFlags));
225 char *p; 268 const char *p;
226# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 269# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
227 270
228 if (geom == NULL) 271 if (geom == NULL)
229 return false; 272 return false;
230 273
231 char str[MAXLEN_GEOM]; 274 char str[MAXLEN_GEOM];
… …
238 if (n < MAXLEN_GEOM) 281 if (n < MAXLEN_GEOM)
239 { 282 {
240 char *ops; 283 char *ops;
241 new_flags |= geometrySet; 284 new_flags |= geometrySet;
242 285
243 strncpy (str, geom, n); 286 memcpy (str, geom, n);
244 str[n] = '\0'; 287 str[n] = '\0';
245 if (str[0] == ':') 288 if (str[0] == ':')
246 ops = &str[0]; 289 ops = &str[0];
247 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 290 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
248 ops = &str[0]; 291 ops = &str[0];
… …
268 y = x; 311 y = x;
269 geom_flags |= YValue; 312 geom_flags |= YValue;
270 } 313 }
271 314
272 if (flags & geometrySet) 315 if (flags & geometrySet)
316 {
273 {/* new geometry is an adjustment to the old one ! */ 317 /* new geometry is an adjustment to the old one ! */
274 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 318 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
275 { 319 {
276 if (w == 0 && h != 0) 320 if (w == 0 && h != 0)
277 { 321 {
278 w = h_scale; 322 w = h_scale;
… …
294 } 338 }
295 } 339 }
296 else /* setting up geometry from scratch */ 340 else /* setting up geometry from scratch */
297 { 341 {
298 if (!(geom_flags & XValue)) 342 if (!(geom_flags & XValue))
343 {
299 {/* use default geometry - centered */ 344 /* use default geometry - centered */
300 x = y = defaultAlign; 345 x = y = defaultAlign;
301 } 346 }
302 else if (!(geom_flags & YValue)) 347 else if (!(geom_flags & YValue))
303 y = x; 348 y = x;
304 349
305 if ((geom_flags & (WidthValue|HeightValue)) == 0) 350 if ((geom_flags & (WidthValue|HeightValue)) == 0)
351 {
306 {/* use default geometry - scaled */ 352 /* use default geometry - scaled */
307 w = h = defaultScale; 353 w = h = defaultScale;
308 } 354 }
309 else if (geom_flags & WidthValue) 355 else if (geom_flags & WidthValue)
310 { 356 {
311 if (!(geom_flags & HeightValue)) 357 if (!(geom_flags & HeightValue))
… …
314 else 360 else
315 w = h; 361 w = h;
316 } 362 }
317 } /* done parsing geometry string */ 363 } /* done parsing geometry string */
318 else if (!(flags & geometrySet)) 364 else if (!(flags & geometrySet))
365 {
319 { /* default geometry - scaled and centered */ 366 /* default geometry - scaled and centered */
320 x = y = defaultAlign; 367 x = y = defaultAlign;
321 w = h = defaultScale; 368 w = h = defaultScale;
322 } 369 }
323 370
324 if (!(flags & geometrySet)) 371 if (!(flags & geometrySet))
325 geom_flags |= WidthValue|HeightValue|XValue|YValue; 372 geom_flags |= WidthValue|HeightValue|XValue|YValue;
326 373
327 if (ops) 374 if (ops)
328 { 375 {
329 while (*ops) 376 while (*ops)
330 { 377 {
331 while (*ops == ':' || isspace(*ops)) ++ops; 378 while (*ops == ':' || isspace(*ops)) ++ops;
379
332# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 380# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
333 if (CHECK_GEOM_OPS("tile")) 381 if (CHECK_GEOM_OPS ("tile"))
334 { 382 {
335 w = h = 0; 383 w = h = noScale;
336 geom_flags |= WidthValue|HeightValue; 384 geom_flags |= WidthValue|HeightValue;
337 } 385 }
338 else if (CHECK_GEOM_OPS("propscale")) 386 else if (CHECK_GEOM_OPS ("propscale"))
339 { 387 {
340 if (w == 0 && h == 0) 388 if (w == 0 && h == 0)
341 { 389 {
342 w = 100; 390 w = windowScale;
343 geom_flags |= WidthValue; 391 geom_flags |= WidthValue;
344 } 392 }
345 new_flags |= propScale; 393 new_flags |= propScale;
346 } 394 }
347 else if (CHECK_GEOM_OPS("hscale")) 395 else if (CHECK_GEOM_OPS ("hscale"))
348 { 396 {
349 if (w == 0) 397 if (w == 0) w = windowScale;
350 w = 100; 398
351 h = 0; 399 h = noScale;
352 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
353 } 401 }
354 else if (CHECK_GEOM_OPS("vscale")) 402 else if (CHECK_GEOM_OPS ("vscale"))
355 { 403 {
356 if (h == 0) 404 if (h == 0) h = windowScale;
357 h = 100; 405
358 w = 0; 406 w = noScale;
359 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
360 } 408 }
361 else if (CHECK_GEOM_OPS("scale")) 409 else if (CHECK_GEOM_OPS ("scale"))
362 { 410 {
363 if (h == 0) 411 if (h == 0) h = windowScale;
364 h = 100;
365 if (w == 0) 412 if (w == 0) w = windowScale;
366 w = 100; 413
367 geom_flags |= WidthValue|HeightValue; 414 geom_flags |= WidthValue|HeightValue;
368 } 415 }
369 else if (CHECK_GEOM_OPS("auto")) 416 else if (CHECK_GEOM_OPS ("auto"))
370 { 417 {
371 w = h = 100; 418 w = h = windowScale;
372 x = y = 50; 419 x = y = centerAlign;
373 geom_flags |= WidthValue|HeightValue|XValue|YValue; 420 geom_flags |= WidthValue|HeightValue|XValue|YValue;
374 } 421 }
422 else if (CHECK_GEOM_OPS ("root"))
423 {
424 w = h = noScale;
425 x = y = rootAlign;
426 geom_flags |= WidthValue|HeightValue|XValue|YValue;
427 }
375# undef CHECK_GEOM_OPS 428# undef CHECK_GEOM_OPS
429
376 while (*ops != ':' && *ops != '\0') ++ops; 430 while (*ops != ':' && *ops != '\0') ++ops;
377 } /* done parsing ops */ 431 } /* done parsing ops */
378 } 432 }
379 433
380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 434 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
381 ++changed;
382 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 435 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
383 ++changed;
384 if (check_set_align_value (geom_flags, XValue, h_align, x)) 436 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
385 ++changed;
386 if (check_set_align_value (geom_flags, YValue, v_align, y)) 437 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
387 ++changed;
388 } 438 }
389 439
390 if (new_flags != flags) 440 if (new_flags != flags)
391 { 441 {
392 flags = new_flags; 442 flags = new_flags;
393 changed++; 443 changed++;
394 } 444 }
445
395//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
396// flags, h_scale, v_scale, h_align, v_align); 447// flags, h_scale, v_scale, h_align, v_align);
397 return (changed > 0); 448 return (changed > 0);
398} 449}
399 450
400# ifdef HAVE_AFTERIMAGE 451# ifdef HAVE_AFTERIMAGE
… …
402bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
403{ 454{
404 if (target == NULL) 455 if (target == NULL)
405 return false; 456 return false;
406 457
458 target->init_asv ();
459
460 ASImage *result = 0;
461
407 int target_width = (int)target->szHint.width; 462 int target_width = target->szHint.width;
408 int target_height = (int)target->szHint.height; 463 int target_height = target->szHint.height;
409 int new_pmap_width = target_width, new_pmap_height = target_height; 464 int new_pmap_width = target_width;
410 ASImage *result = NULL; 465 int new_pmap_height = target_height;
411 466
412 int x = 0; 467 int x = 0;
413 int y = 0; 468 int y = 0;
414 int w = h_scale * target_width / 100; 469 int w = h_scale * target_width / 100;
415 int h = v_scale * target_height / 100; 470 int h = v_scale * target_height / 100;
416 471
417 TIMING_TEST_START (asim); 472 TIMING_TEST_START (asim);
418 473
419 if (original_asim) 474 if (original_asim)
420 { 475 {
476 if (h_align == rootAlign || v_align == rootAlign)
477 {
478 target->get_window_origin(x, y);
479 x = -x;
480 y = -y;
481 }
482
483 if (h_align != rootAlign)
421 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 484 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
486 if (v_align != rootAlign)
422 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 487 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
423 } 488 }
424 489
425 if (original_asim == NULL 490 if (!original_asim
426 || x >= target_width 491 || x >= target_width
427 || y >= target_height 492 || y >= target_height
428 || (w > 0 && x + w <= 0) 493 || (w > 0 && x + w <= 0)
429 || (h > 0 && y + h <= 0)) 494 || (h > 0 && y + h <= 0))
430 { 495 {
431 if (background) 496 if (background)
432 { 497 {
433 new_pmap_width = background->width; 498 new_pmap_width = background->width;
434 new_pmap_height = background->height; 499 new_pmap_height = background->height;
435 result = background; 500 result = background;
501
436 if (background_tint != TINT_LEAVE_SAME) 502 if (background_tint != TINT_LEAVE_SAME)
437 { 503 {
438 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 504 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
439 target_width, target_height, background_tint, 505 target_width, target_height, background_tint,
440 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 506 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
441 if (tmp) 507 if (tmp)
442 result = tmp; 508 result = tmp;
443 } 509 }
… …
446 new_pmap_width = new_pmap_height = 0; 512 new_pmap_width = new_pmap_height = 0;
447 } 513 }
448 else 514 else
449 { 515 {
450 result = original_asim; 516 result = original_asim;
517
451 if ((w > 0 && w != original_asim->width) 518 if ((w > 0 && w != original_asim->width)
452 || (h > 0 && h != original_asim->height)) 519 || (h > 0 && h != original_asim->height))
453 { 520 {
454 result = scale_asimage (target->asv, original_asim, 521 result = scale_asimage (target->asv, original_asim,
455 w > 0 ? w : original_asim->width, 522 w > 0 ? w : original_asim->width,
456 h > 0 ? h : original_asim->height, 523 h > 0 ? h : original_asim->height,
457 background ? ASA_ASImage : ASA_XImage, 524 background ? ASA_ASImage : ASA_XImage,
458 100, ASIMAGE_QUALITY_DEFAULT); 525 100, ASIMAGE_QUALITY_DEFAULT);
459 } 526 }
527
460 if (background == NULL) 528 if (background == NULL)
529 {
461 {/* if tiling - pixmap has to be sized exactly as the image */ 530 /* if tiling - pixmap has to be sized exactly as the image,
531 but there is no need to make it bigger than the window! */
462 if (h_scale == 0) 532 if (h_scale == 0)
463 new_pmap_width = result->width; 533 new_pmap_width = min (result->width, target_width);
464 if (v_scale == 0) 534 if (v_scale == 0)
465 new_pmap_height = result->height; 535 new_pmap_height = min (result->height, target_height);
466 /* we also need to tile our image in one or both directions */ 536 /* we also need to tile our image in one or both directions */
467 if (h_scale == 0 || v_scale == 0) 537 if (h_scale == 0 || v_scale == 0)
468 { 538 {
469 ASImage *tmp = tile_asimage (target->asv, result, 539 ASImage *tmp = tile_asimage (target->asv, result,
470 (h_scale > 0) ? 0 : (int)result->width - x, 540 (h_scale > 0) ? 0 : (int)result->width - x,
471 (v_scale > 0) ? 0 : (int)result->height - y, 541 (v_scale > 0) ? 0 : (int)result->height - y,
542 new_pmap_width,
472 result->width, result->height, 543 new_pmap_height,
473 TINT_LEAVE_SAME, ASA_XImage, 544 TINT_LEAVE_SAME, ASA_XImage,
474 100, ASIMAGE_QUALITY_DEFAULT); 545 100, ASIMAGE_QUALITY_DEFAULT);
475 if (tmp) 546 if (tmp)
476 { 547 {
477 if (result != original_asim) 548 if (result != original_asim)
478 destroy_asimage (&result); 549 destroy_asimage (&result);
550
479 result = tmp; 551 result = tmp;
480 } 552 }
481 } 553 }
482 } 554 }
483 else 555 else
556 {
484 {/* if blending background and image - pixmap has to be sized same as target window */ 557 /* if blending background and image - pixmap has to be sized same as target window */
485 ASImageLayer *layers = create_image_layers (2); 558 ASImageLayer *layers = create_image_layers (2);
486 ASImage *merged_im = NULL; 559 ASImage *merged_im = NULL;
487 560
488 layers[0].im = background; 561 layers[0].im = background;
489 layers[0].clip_width = target_width; 562 layers[0].clip_width = target_width;
490 layers[0].clip_height = target_height; 563 layers[0].clip_height = target_height;
491 layers[0].tint = background_tint; 564 layers[0].tint = background_tint;
492 layers[1].im = result; 565 layers[1].im = result;
566
493 if (w <= 0) 567 if (w <= 0)
568 {
494 {/* tile horizontally */ 569 /* tile horizontally */
495 while (x > 0) x -= (int)result->width; 570 while (x > 0) x -= (int)result->width;
496 layers[1].dst_x = x; 571 layers[1].dst_x = x;
497 layers[1].clip_width = result->width+target_width; 572 layers[1].clip_width = result->width+target_width;
498 } 573 }
499 else 574 else
575 {
500 {/* clip horizontally */ 576 /* clip horizontally */
501 layers[1].dst_x = x; 577 layers[1].dst_x = x;
502 layers[1].clip_width = result->width; 578 layers[1].clip_width = result->width;
503 } 579 }
580
504 if (h <= 0) 581 if (h <= 0)
505 { 582 {
506 while (y > 0) y -= (int)result->height; 583 while (y > 0) y -= (int)result->height;
507 layers[1].dst_y = y; 584 layers[1].dst_y = y;
508 layers[1].clip_height = result->height + target_height; 585 layers[1].clip_height = result->height + target_height;
… …
510 else 587 else
511 { 588 {
512 layers[1].dst_y = y; 589 layers[1].dst_y = y;
513 layers[1].clip_height = result->height; 590 layers[1].clip_height = result->height;
514 } 591 }
592
515 if (target->rs[Rs_blendtype]) 593 if (target->rs[Rs_blendtype])
516 { 594 {
517 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 595 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
518 if (layers[1].merge_scanlines == NULL) 596 if (layers[1].merge_scanlines == NULL)
519 layers[1].merge_scanlines = alphablend_scanlines; 597 layers[1].merge_scanlines = alphablend_scanlines;
520 } 598 }
599
521 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 600 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
522 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 601 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
602
523 if (tmp) 603 if (tmp)
524 { 604 {
525 if (result != original_asim) 605 if (result != original_asim)
526 destroy_asimage (&result); 606 destroy_asimage (&result);
607
527 result = tmp; 608 result = tmp;
528 } 609 }
610
529 free (layers); 611 free (layers);
530 } 612 }
531 } 613 }
532 TIMING_TEST_PRINT_RESULT (asim); 614 TIMING_TEST_PRINT_RESULT (asim);
533 615
… …
562 644
563 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 645 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
564 int dst_width = result->width, dst_height = result->height; 646 int dst_width = result->width, dst_height = result->height;
565 if (background == NULL) 647 if (background == NULL)
566 { 648 {
567 if (h_scale > 0)
568 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 649 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
569 if (v_scale > 0)
570 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 650 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
571 651
572 if (dst_x > 0 || dst_y > 0 652 if (dst_x > 0 || dst_y > 0
573 || dst_x + dst_width < new_pmap_width 653 || dst_x + dst_width < new_pmap_width
574 || dst_y + dst_height < new_pmap_height) 654 || dst_y + dst_height < new_pmap_height)
575 {
576 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 655 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
577 }
578 } 656 }
579 657
580 /* put result on pixmap */ 658 /* put result on pixmap */
581 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 659 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
582 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 660 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
583 661
584 if (result != background && result != original_asim) 662 if (result != background && result != original_asim)
585 destroy_asimage (&result); 663 destroy_asimage (&result);
586 664
587 XFreeGC (target->dpy, gc); 665 XFreeGC (target->dpy, gc);
588 TIMING_TEST_PRINT_RESULT (asim); 666 TIMING_TEST_PRINT_RESULT (asim);
… …
593# endif /* HAVE_AFTERIMAGE */ 671# endif /* HAVE_AFTERIMAGE */
594 672
595bool 673bool
596bgPixmap_t::set_file (const char *file) 674bgPixmap_t::set_file (const char *file)
597{ 675{
598 char *f;
599
600 assert (file != NULL); 676 assert (file);
601 677
602 if (*file != '\0') 678 if (*file)
603 { 679 {
604# ifdef HAVE_AFTERIMAGE 680# ifdef HAVE_AFTERIMAGE
605 if (target->asimman == NULL) 681 if (!target->asimman)
606 target->asimman = create_generic_imageman (target->rs[Rs_path]); 682 target->asimman = create_generic_imageman (target->rs[Rs_path]);
607 if ((f = strchr (file, ';')) == NULL) 683
608 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 684 if (const char *p = strchr (file, ';'))
609 else
610 { 685 {
611 size_t len = f - file; 686 size_t len = p - file;
612 f = (char *)malloc (len + 1); 687 char *f = (char *)malloc (len + 1);
613 strncpy (f, file, len); 688 memcpy (f, file, len);
614 f[len] = '\0'; 689 f[len] = '\0';
615 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 690 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
616 free (f); 691 free (f);
617 } 692 }
693 else
694 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
695
618 return (original_asim != NULL); 696 return original_asim;
619# endif 697# endif
620 } 698 }
699
621 return false; 700 return false;
622} 701}
623 702
624# endif /* BG_IMAGE_FROM_FILE */ 703# endif /* BG_IMAGE_FROM_FILE */
625 704
626# ifdef ENABLE_TRANSPARENCY 705# ifdef ENABLE_TRANSPARENCY
627bool 706bool
628bgPixmap_t::set_transparent () 707bgPixmap_t::set_transparent ()
629{ 708{
630 if (!(flags & isTransparent)) 709 if (!(flags & isTransparent))
631 { 710 {
632 flags |= isTransparent; 711 flags |= isTransparent;
633 return true; 712 return true;
634 } 713 }
714
635 return false; 715 return false;
636} 716}
637 717
638bool 718bool
639bgPixmap_t::set_blur_radius (const char *geom) 719bgPixmap_t::set_blur_radius (const char *geom)
… …
657 if (v_blurRadius != vr) 737 if (v_blurRadius != vr)
658 { 738 {
659 ++changed; 739 ++changed;
660 v_blurRadius = vr; 740 v_blurRadius = vr;
661 } 741 }
662 742
663 if (v_blurRadius == 0 && h_blurRadius == 0) 743 if (v_blurRadius == 0 && h_blurRadius == 0)
664 flags &= ~blurNeeded; 744 flags &= ~blurNeeded;
665 else 745 else
666 flags |= blurNeeded; 746 flags |= blurNeeded;
667 747
… …
694 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 774 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
695 { 775 {
696 flags |= bgPixmap_t::tintNeeded; 776 flags |= bgPixmap_t::tintNeeded;
697 } 777 }
698 } 778 }
699 779
700 if (flags & bgPixmap_t::tintNeeded) 780 if (flags & bgPixmap_t::tintNeeded)
701 { 781 {
702 if (flags & bgPixmap_t::tintWholesome) 782 if (flags & bgPixmap_t::tintWholesome)
703 flags |= bgPixmap_t::tintServerSide; 783 flags |= bgPixmap_t::tintServerSide;
704 else 784 else
… …
720 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 800 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
721 tint = new_tint; 801 tint = new_tint;
722 flags = (flags & ~tintFlags) | new_flags | tintSet; 802 flags = (flags & ~tintFlags) | new_flags | tintSet;
723 return true; 803 return true;
724 } 804 }
805
725 return false; 806 return false;
726} 807}
727 808
728bool 809bool
729bgPixmap_t::unset_tint () 810bgPixmap_t::unset_tint ()
… …
733 if (new_flags != (flags & tintFlags)) 814 if (new_flags != (flags & tintFlags))
734 { 815 {
735 flags = (flags&~tintFlags)|new_flags; 816 flags = (flags&~tintFlags)|new_flags;
736 return true; 817 return true;
737 } 818 }
819
738 return false; 820 return false;
739} 821}
740 822
741bool 823bool
742bgPixmap_t::set_shade (const char *shade_str) 824bgPixmap_t::set_shade (const char *shade_str)
743{ 825{
744 int new_shade = (shade_str) ? atoi (shade_str) : 0; 826 int new_shade = (shade_str) ? atoi (shade_str) : 0;
745 827
746 if (new_shade < 0 && new_shade > -100) 828 if (new_shade < 0 && new_shade > -100)
747 new_shade = 200 - (100 + new_shade); 829 new_shade = 200 - (100 + new_shade);
748 else if (new_shade == 100) 830 else if (new_shade == 100)
749 new_shade = 0; 831 new_shade = 0;
750 832
751 if (new_shade != shade) 833 if (new_shade != shade)
752 { 834 {
753 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 835 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
754 shade = new_shade; 836 shade = new_shade;
755 flags = (flags & (~tintFlags | tintSet)) | new_flags; 837 flags = (flags & (~tintFlags | tintSet)) | new_flags;
756 return true; 838 return true;
757 } 839 }
840
758 return false; 841 return false;
759} 842}
760 843
761/* make_transparency_pixmap() 844/* make_transparency_pixmap()
762 * Builds a pixmap sized the same as terminal window, with depth same as the root window 845 * Builds a pixmap sized the same as terminal window, with depth same as the root window
763 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 846 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
764 * our window. 847 * our window.
765 */ 848 */
766unsigned long 849unsigned long
767bgPixmap_t::make_transparency_pixmap () 850bgPixmap_t::make_transparency_pixmap ()
768{ 851{
769 unsigned long result = 0; 852 unsigned long result = 0;
770 853
771 if (target == NULL) 854 if (target == NULL)
772 return 0; 855 return 0;
773 856
774 /* root dimentions may change from call to call - but Display structure should 857 /* root dimensions may change from call to call - but Display structure should
775 * be always up-to-date, so let's use it : 858 * be always up-to-date, so let's use it :
776 */ 859 */
777 Window root = target->display->root; 860 Window root = target->display->root;
778 int screen = target->display->screen; 861 int screen = target->display->screen;
779 Display *dpy = target->dpy; 862 Display *dpy = target->dpy;
… …
792 if (sx + window_width <= 0 || sy + window_height <= 0 875 if (sx + window_width <= 0 || sy + window_height <= 0
793 || sx >= root_width || sy >= root_height) 876 || sx >= root_width || sy >= root_height)
794 return 0; 877 return 0;
795 878
796 if (root_pixmap != None) 879 if (root_pixmap != None)
880 {
797 {/* we want to validate the pixmap and get it's size at the same time : */ 881 /* we want to validate the pixmap and get it's size at the same time : */
798 int junk; 882 int junk;
799 unsigned int ujunk; 883 unsigned int ujunk;
800 /* root pixmap may be bad - allow a error */ 884 /* root pixmap may be bad - allow a error */
801 target->allowedxerror = -1; 885 target->allowedxerror = -1;
802 886
… …
811 895
812 if (tiled_root_pmap == None) /* something really bad happened - abort */ 896 if (tiled_root_pmap == None) /* something really bad happened - abort */
813 return 0; 897 return 0;
814 898
815 if (root_pixmap == None) 899 if (root_pixmap == None)
900 {
816 { /* use tricks to obtain the root background image :*/ 901 /* use tricks to obtain the root background image :*/
817 /* we want to create Overrideredirect window overlapping out window 902 /* we want to create Overrideredirect window overlapping out window
818 with background type of Parent Relative and then grab it */ 903 with background type of Parent Relative and then grab it */
819 XSetWindowAttributes attr; 904 XSetWindowAttributes attr;
820 Window src; 905 Window src;
821 bool success = false; 906 bool success = false;
… …
836 XGrabServer (dpy); 921 XGrabServer (dpy);
837 XMapRaised (dpy, src); 922 XMapRaised (dpy, src);
838 XSync (dpy, False); 923 XSync (dpy, False);
839 924
840 /* XSync should get window where it's properly exposed, 925 /* XSync should get window where it's properly exposed,
841 * but to be on the safe side - let's check for the actuall event to arrive : */ 926 * but to be on the safe side - let's check for the actual event to arrive : */
842 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 927 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
843 ++ev_count; 928 ++ev_count;
844 929
845 if (ev_count > 0); 930 if (ev_count > 0);
931 {
846 { /* hooray! - we can grab the image! */ 932 /* hooray! - we can grab the image! */
847 gc = XCreateGC (dpy, root, 0, NULL); 933 gc = XCreateGC (dpy, root, 0, NULL);
848 if (gc) 934 if (gc)
849 { 935 {
850 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 936 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
851 success = true; 937 success = true;
852 } 938 }
853 } 939 }
940
854 XDestroyWindow (dpy, src); 941 XDestroyWindow (dpy, src);
855 XUngrabServer (dpy); 942 XUngrabServer (dpy);
856 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 943 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
857 } 944 }
858 945
… …
863 } 950 }
864 else 951 else
865 result |= transpPmapTiled; 952 result |= transpPmapTiled;
866 } 953 }
867 else 954 else
955 {
868 {/* strightforward pixmap copy */ 956 /* straightforward pixmap copy */
869 gcv.tile = root_pixmap; 957 gcv.tile = root_pixmap;
870 gcv.fill_style = FillTiled; 958 gcv.fill_style = FillTiled;
871 959
872 while (sx < 0) sx += (int)root_width; 960 while (sx < 0) sx += (int)root_width;
873 while (sy < 0) sy += (int)root_height; 961 while (sy < 0) sy += (int)root_height;
… …
884 } 972 }
885 TIMING_TEST_PRINT_RESULT (tp); 973 TIMING_TEST_PRINT_RESULT (tp);
886 974
887 if (tiled_root_pmap != None) 975 if (tiled_root_pmap != None)
888 { 976 {
889 if (!need_client_side_rendering ()) 977 if (!need_client_side_rendering ())
890 { 978 {
891 if ((flags & tintNeeded)) 979 if ((flags & tintNeeded))
892 { 980 {
893 if (flags & tintWholesome) 981 if (flags & tintWholesome)
894 { 982 {
895 /* In this case we can tint image server-side getting significant 983 /* In this case we can tint image server-side getting significant
896 * performance improvements, as we eliminate XImage transfer 984 * performance improvements, as we eliminate XImage transfer
… …
921 { 1009 {
922 c.r = (c.r * shade) / 100; 1010 c.r = (c.r * shade) / 100;
923 c.g = (c.g * shade) / 100; 1011 c.g = (c.g * shade) / 100;
924 c.b = (c.b * shade) / 100; 1012 c.b = (c.b * shade) / 100;
925 } 1013 }
926 else if( shade > 100 && shade < 200) 1014 else if (shade > 100 && shade < 200)
927 { 1015 {
928 c.r = (c.r * (200 - shade)) / 100; 1016 c.r = (c.r * (200 - shade)) / 100;
929 c.g = (c.g * (200 - shade)) / 100; 1017 c.g = (c.g * (200 - shade)) / 100;
930 c.b = (c.b * (200 - shade)) / 100; 1018 c.b = (c.b * (200 - shade)) / 100;
931 } 1019 }
… …
956 1044
957 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1045 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
958 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1046 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
959 XFreePixmap (dpy, overlay_pmap); 1047 XFreePixmap (dpy, overlay_pmap);
960 1048
961 pa.component_alpha = True; 1049 pa.component_alpha = True;
962 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1050 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
963 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1051 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
964 XFreePixmap (dpy, mask_pmap); 1052 XFreePixmap (dpy, mask_pmap);
965 1053
966 if (mask_pic && overlay_pic && back_pic) 1054 if (mask_pic && overlay_pic && back_pic)
… …
977 mask_c.blue = 0xffff - c.b; 1065 mask_c.blue = 0xffff - c.b;
978 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1066 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
979 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1067 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
980 result |= transpPmapTinted; 1068 result |= transpPmapTinted;
981 } 1069 }
1070
982 XRenderFreePicture (dpy, mask_pic); 1071 XRenderFreePicture (dpy, mask_pic);
983 XRenderFreePicture (dpy, overlay_pic); 1072 XRenderFreePicture (dpy, overlay_pic);
984 XRenderFreePicture (dpy, back_pic); 1073 XRenderFreePicture (dpy, back_pic);
985# if DO_TIMING_TEST 1074# if DO_TIMING_TEST
986 XSync (dpy, False); 1075 XSync (dpy, False);
987# endif 1076# endif
988# endif 1077# endif
989 } 1078 }
990 } 1079 }
991 } /* server side rendering completed */ 1080 } /* server side rendering completed */
992 1081
… …
996 pixmap = tiled_root_pmap; 1085 pixmap = tiled_root_pmap;
997 pmap_width = window_width; 1086 pmap_width = window_width;
998 pmap_height = window_height; 1087 pmap_height = window_height;
999 pmap_depth = root_depth; 1088 pmap_depth = root_depth;
1000 } 1089 }
1001 1090
1002 if (gc) 1091 if (gc)
1003 XFreeGC (dpy, gc); 1092 XFreeGC (dpy, gc);
1004 1093
1005 TIMING_TEST_PRINT_RESULT (tp); 1094 TIMING_TEST_PRINT_RESULT (tp);
1006 1095
1007 return result; 1096 return result;
1008} 1097}
1009 1098
1010bool 1099bool
1011bgPixmap_t::set_root_pixmap () 1100bgPixmap_t::set_root_pixmap ()
1012{ 1101{
1013 Pixmap new_root_pixmap = None;
1014
1015 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1102 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1016 if (new_root_pixmap == None) 1103 if (new_root_pixmap == None)
1017 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1104 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1018 1105
1019 if (new_root_pixmap != root_pixmap) 1106 if (new_root_pixmap != root_pixmap)
1020 { 1107 {
1021 root_pixmap = new_root_pixmap; 1108 root_pixmap = new_root_pixmap;
1022 return true; 1109 return true;
1023 } 1110 }
1111
1024 return false; 1112 return false;
1025} 1113}
1026# endif /* ENABLE_TRANSPARENCY */ 1114# endif /* ENABLE_TRANSPARENCY */
1027 1115
1028# ifndef HAVE_AFTERIMAGE 1116# ifndef HAVE_AFTERIMAGE
1029static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1117static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1030# endif 1118# endif
1031
1032 1119
1033bool 1120bool
1034bgPixmap_t::render () 1121bgPixmap_t::render ()
1035{ 1122{
1036 unsigned long background_flags = 0; 1123 unsigned long background_flags = 0;
… …
1038 if (target == NULL) 1125 if (target == NULL)
1039 return false; 1126 return false;
1040 1127
1041 TIMING_TEST_START (tp); 1128 TIMING_TEST_START (tp);
1042 1129
1043 invalidate(); 1130 invalidate ();
1044# ifdef ENABLE_TRANSPARENCY 1131# ifdef ENABLE_TRANSPARENCY
1045 if (flags & isTransparent) 1132 if (flags & isTransparent)
1046 { 1133 {
1047 /* we need to re-generate transparency pixmap in that case ! */ 1134 /* we need to re-generate transparency pixmap in that case ! */
1048 background_flags = make_transparency_pixmap (); 1135 background_flags = make_transparency_pixmap ();
… …
1057 XImage *result = NULL; 1144 XImage *result = NULL;
1058# ifdef HAVE_AFTERIMAGE 1145# ifdef HAVE_AFTERIMAGE
1059 if (original_asim 1146 if (original_asim
1060 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1147 || (background_flags & transpTransformations) != (flags & transpTransformations))
1061 { 1148 {
1149 target->init_asv ();
1150
1062 ASImage *background = NULL; 1151 ASImage *background = NULL;
1063 ARGB32 as_tint = TINT_LEAVE_SAME; 1152 ARGB32 as_tint = TINT_LEAVE_SAME;
1064 if (background_flags) 1153 if (background_flags)
1065 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1154 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1066 1155
1067# ifdef ENABLE_TRANSPARENCY 1156# ifdef ENABLE_TRANSPARENCY
1068 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1157 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1069 { 1158 {
1070 ShadingInfo as_shade; 1159 ShadingInfo as_shade;
… …
1077 as_shade.tintColor.green = c.g; 1166 as_shade.tintColor.green = c.g;
1078 as_shade.tintColor.blue = c.b; 1167 as_shade.tintColor.blue = c.b;
1079 1168
1080 as_tint = shading2tint32 (&as_shade); 1169 as_tint = shading2tint32 (&as_shade);
1081 } 1170 }
1171
1082 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1172 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1083 { 1173 {
1084 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1174 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1085 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1175 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1086 100, ASIMAGE_QUALITY_DEFAULT); 1176 100, ASIMAGE_QUALITY_DEFAULT);
1087 if (tmp) 1177 if (tmp)
1088 { 1178 {
1089 destroy_asimage (&background); 1179 destroy_asimage (&background);
… …
1093# endif 1183# endif
1094 1184
1095 if (render_asim (background, as_tint)) 1185 if (render_asim (background, as_tint))
1096 flags = flags & ~isInvalid; 1186 flags = flags & ~isInvalid;
1097 if (background) 1187 if (background)
1098 destroy_asimage (&background); 1188 destroy_asimage (&background);
1099 } 1189 }
1100 else if (background_flags && pmap_depth != target->depth) 1190 else if (background_flags && pmap_depth != target->depth)
1191 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1192
1193# elif !XFT /* our own client-side tinting */
1194
1195 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197
1198 if (background_flags && (flags & isInvalid))
1101 { 1199 {
1102 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1200 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1103 }
1104 1201
1105# elif !XFT /* our own client-side tinting */
1106
1107 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1108 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1109
1110 if (background_flags && (flags & isInvalid))
1111 {
1112 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1113 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1202 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1114 { 1203 {
1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1204 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1116 if (flags & tintSet) 1205 if (flags & tintSet)
1117 tint.get (c); 1206 tint.get (c);
1118 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1207 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1119 } 1208 }
1120 } 1209 }
1121# endif /* HAVE_AFTERIMAGE */ 1210# endif /* HAVE_AFTERIMAGE */
1122 1211
1123 if (result != NULL) 1212 if (result)
1124 { 1213 {
1125 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1214 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1215
1126 if (gc) 1216 if (gc)
1127 { 1217 {
1128 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1218 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1129 { 1219 {
1130 XFreePixmap (target->dpy, pixmap); 1220 XFreePixmap (target->dpy, pixmap);
1131 pixmap = None; 1221 pixmap = None;
1132 } 1222 }
1223
1133 if (pixmap == None) 1224 if (pixmap == None)
1134 { 1225 {
1135 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1226 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1136 pmap_width = result->width; 1227 pmap_width = result->width;
1137 pmap_height = result->height; 1228 pmap_height = result->height;
1138 pmap_depth = target->depth; 1229 pmap_depth = target->depth;
1139 } 1230 }
1231
1140 if (pmap_depth != result->depth) 1232 if (pmap_depth != result->depth)
1233 {
1141 { /* Bad Match error will ensue ! stupid X !!!! */ 1234 /* Bad Match error will ensue ! stupid X !!!! */
1142 if( result->depth == 24 && pmap_depth == 32) 1235 if (result->depth == 24 && pmap_depth == 32)
1143 result->depth = 32; 1236 result->depth = 32;
1144 else if( result->depth == 32 && pmap_depth == 24) 1237 else if (result->depth == 32 && pmap_depth == 24)
1145 result->depth = 24; 1238 result->depth = 24;
1146 else 1239 else
1147 { 1240 {
1148 /* TODO: implement image recoding */ 1241 /* TODO: implement image recoding */
1149 } 1242 }
1150 } 1243 }
1244
1151 if (pmap_depth == result->depth) 1245 if (pmap_depth == result->depth)
1152 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1246 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1247
1153 XFreeGC (target->dpy, gc); 1248 XFreeGC (target->dpy, gc);
1154 flags = flags & ~isInvalid; 1249 flags = flags & ~isInvalid;
1155 } 1250 }
1251
1156 XDestroyImage (result); 1252 XDestroyImage (result);
1157 } 1253 }
1158 1254
1159 if (flags & isInvalid) 1255 if (flags & isInvalid)
1160 { 1256 {
… …
1165 } 1261 }
1166 } 1262 }
1167 1263
1168 apply (); 1264 apply ();
1169 1265
1266 XSync (target->dpy, False);
1267 valid_since = ev::now ();
1268
1170 TIMING_TEST_PRINT_RESULT (tp); 1269 TIMING_TEST_PRINT_RESULT (tp);
1171 1270
1172 return true; 1271 return true;
1173} 1272}
1174 1273
1175bool 1274bool
1176bgPixmap_t::set_target (rxvt_term *new_target) 1275bgPixmap_t::set_target (rxvt_term *new_target)
1177{ 1276{
1178 if (new_target) 1277 if (new_target)
1179 if (target != new_target) 1278 if (target != new_target)
1180 { 1279 {
… …
1182# ifdef ENABLE_TRANSPARENCY 1281# ifdef ENABLE_TRANSPARENCY
1183 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1282 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1184# endif 1283# endif
1185 return true; 1284 return true;
1186 } 1285 }
1286
1187 return false; 1287 return false;
1188} 1288}
1189 1289
1190void 1290void
1191bgPixmap_t::apply() 1291bgPixmap_t::apply ()
1192{ 1292{
1193 if (target) 1293 if (target)
1194 { 1294 {
1195 flags &= ~isVtOrigin; 1295 flags &= ~isVtOrigin;
1296
1196 if (pixmap != None) 1297 if (pixmap != None)
1298 {
1197 { /* set target's background to pixmap */ 1299 /* set target's background to pixmap */
1198# ifdef ENABLE_TRANSPARENCY 1300# ifdef ENABLE_TRANSPARENCY
1199 if (flags & isTransparent) 1301 if (flags & isTransparent)
1200 { 1302 {
1201 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1303 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1202 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1304 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1203# if HAVE_SCROLLBARS 1305
1204 if (target->scrollBar.win) 1306 if (target->scrollBar.win)
1205 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1307 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1206# endif
1207 } 1308 }
1208 else 1309 else
1209# endif 1310# endif
1210 { 1311 {
1211 flags |= isVtOrigin; 1312 flags |= isVtOrigin;
1212 /* force old pixmap dereference in case it was transparent before :*/ 1313 /* force old pixmap dereference in case it was transparent before :*/
1213 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1314 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1214 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1315 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1215 /* do we also need to set scrollbar's background here ? */ 1316 /* do we also need to set scrollbar's background here ? */
1216# if HAVE_SCROLLBARS 1317
1217 if (target->scrollBar.win) 1318 if (target->scrollBar.win)
1218 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1319 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1219# endif
1220 } 1320 }
1221 } 1321 }
1222 else 1322 else
1323 {
1223 { /* set target background to a pixel */ 1324 /* set target background to a pixel */
1224 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1225 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1326 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1226 /* do we also need to set scrollbar's background here ? */ 1327 /* do we also need to set scrollbar's background here ? */
1227# if HAVE_SCROLLBARS
1228 if (target->scrollBar.win) 1328 if (target->scrollBar.win)
1229 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1329 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1230# endif
1231 } 1330 }
1331
1232 /* don't want Expose on the parent or vt. It is better to use 1332 /* don't want Expose on the parent or vt. It is better to use
1233 scr_touch or we get a great deal of flicker otherwise: */ 1333 scr_touch or we get a great deal of flicker otherwise: */
1234 XClearWindow (target->dpy, target->parent[0]); 1334 XClearWindow (target->dpy, target->parent[0]);
1235 1335
1236# if HAVE_SCROLLBARS 1336 if (target->scrollBar.state && target->scrollBar.win)
1237 if (target->scrollBar.win)
1238 { 1337 {
1239 target->scrollBar.setIdle (); 1338 target->scrollBar.state = STATE_IDLE;
1240 target->scrollbar_show (0); 1339 target->scrollBar.show (0);
1241 } 1340 }
1242# endif
1243 1341
1244 target->want_refresh = 1; 1342 target->want_refresh = 1;
1245 flags |= hasChanged; 1343 flags |= hasChanged;
1246 } 1344 }
1247} 1345}
1248 1346
1249#endif /* HAVE_BG_PIXMAP */ 1347#endif /* HAVE_BG_PIXMAP */
1250 1348
1251#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1349#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1252/* taken from aterm-0.4.2 */ 1350/* taken from aterm-0.4.2 */
1253 1351
1254typedef uint32_t RUINT32T; 1352typedef uint32_t RUINT32T;
1255 1353
1256static void 1354static void
1257ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1355ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1258{ 1356{
1259 int sh_r, sh_g, sh_b; 1357 int sh_r, sh_g, sh_b;
1260 RUINT32T mask_r, mask_g, mask_b; 1358 RUINT32T mask_r, mask_g, mask_b;
1261 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1359 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1262 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1360 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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