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