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

Diff Legend

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