ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.9 by sasha, Mon Oct 29 13:39:43 2007 UTC vs.
Revision 1.67 by sf-exg, Mon Oct 4 21:56:42 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
38 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
40 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
41 43
42#else 44#else
43#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
44#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
45#endif 47#endif
46 48
47/* 49/*
48 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
49 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
50 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
51 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
52 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
53 * affects on the background image : 55 * effects on the background image :
54 * 56 *
55 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
56 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
57 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
58 * the image in the window. 60 * the image in the window.
59 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
60 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
61 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
62 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
63 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
64 * 66 *
65 * Adjusting position only : 67 * Adjusting position only :
66 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
67 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
68 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
69 * from current position (relative). 71 * from current position (relative).
70 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
71 * from current position. 73 * from current position.
72 * 74 *
73 * Adjusting scale only : 75 * Adjusting scale only :
74 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
75 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
76 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
77 * 79 *
78 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
79 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
80 * the tile size and origin. 82 * the tile size and origin.
81 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
82 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
83 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
84 * current background color. 86 * current background color.
85 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
86 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
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
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
111 valid_since = invalid_since = 0;
112 target = 0;
103} 113}
104 114
115void
116bgPixmap_t::destroy ()
117{
118#ifdef HAVE_AFTERIMAGE
119 if (original_asim)
120 safe_asimage_destroy (original_asim);
121#endif
122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
128 if (pixmap && target)
129 XFreePixmap (target->dpy, pixmap);
130}
105 131
106bool 132bool
107bgPixmap_t::window_size_sensitive () 133bgPixmap_t::window_size_sensitive ()
108{ 134{
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 135# ifdef ENABLE_TRANSPARENCY
120 if (flags & isTransparent) 136 if (flags & isTransparent)
121 return true; 137 return true;
122# endif 138# endif
139
140# ifdef BG_IMAGE_FROM_FILE
141 if (have_image)
142 {
143 if (flags & sizeSensitive)
144 return true;
145 }
146# endif
147
123 return false; 148 return false;
124} 149}
125 150
151bool
152bgPixmap_t::window_position_sensitive ()
153{
154# ifdef ENABLE_TRANSPARENCY
155 if (flags & isTransparent)
156 return true;
157# endif
158
159# ifdef BG_IMAGE_FROM_FILE
160 if (have_image)
161 {
162 if (flags & rootAlign)
163 return true;
164 }
165# endif
166
167 return false;
168};
169
126bool bgPixmap_t::need_client_side_rendering () 170bool bgPixmap_t::need_client_side_rendering ()
127{ 171{
128# ifdef HAVE_AFTERIMAGE 172# ifdef HAVE_AFTERIMAGE
129 if (original_asim != NULL) 173 if (original_asim)
130 return true; 174 return true;
131# endif 175# endif
132# ifdef ENABLE_TRANSPARENCY 176# ifdef ENABLE_TRANSPARENCY
133 if (flags & isTransparent) 177 if (flags & isTransparent)
134 { 178 {
… …
180 224
181static inline int 225static inline int
182make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
183{ 227{
184 int diff = window_size - image_size; 228 int diff = window_size - image_size;
185 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
186 230
187 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
188 return diff * align / 100; 232 return diff * align / 100;
189 else if (align > 50 && align <= 100)
190 return window_size - image_size - diff * (100 - align) / 100;
191 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
192 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
193 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
194 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
195 return 0; 237 return 0;
196} 238}
197 239
198static inline int 240static inline int
199make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 241make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
200{ 242{
201 int src_pos = 0; 243 int src_pos = 0;
202 dst_pos = 0; 244 dst_pos = pos;
203 dst_size = size; 245 dst_size = size;
204 if (pos < 0 && size > target_size) 246 if (pos < 0)
205 { 247 {
206 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
207 dst_size += pos; 250 dst_size += pos;
208 } 251 }
209 else if (pos > 0)
210 dst_pos = pos;
211 252
212 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
213 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
214 return src_pos; 255 return src_pos;
215} 256}
… …
220 int geom_flags = 0, changed = 0; 261 int geom_flags = 0, changed = 0;
221 int x = 0, y = 0; 262 int x = 0, y = 0;
222 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
223 unsigned int n; 264 unsigned int n;
224 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
225 char *p; 266 const char *p;
226# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
227 268
228 if (geom == NULL) 269 if (geom == NULL)
229 return false; 270 return false;
230 271
231 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
… …
238 if (n < MAXLEN_GEOM) 279 if (n < MAXLEN_GEOM)
239 { 280 {
240 char *ops; 281 char *ops;
241 new_flags |= geometrySet; 282 new_flags |= geometrySet;
242 283
243 strncpy (str, geom, n); 284 memcpy (str, geom, n);
244 str[n] = '\0'; 285 str[n] = '\0';
245 if (str[0] == ':') 286 if (str[0] == ':')
246 ops = &str[0]; 287 ops = &str[0];
247 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 288 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
248 ops = &str[0]; 289 ops = &str[0];
… …
268 y = x; 309 y = x;
269 geom_flags |= YValue; 310 geom_flags |= YValue;
270 } 311 }
271 312
272 if (flags & geometrySet) 313 if (flags & geometrySet)
314 {
273 {/* new geometry is an adjustment to the old one ! */ 315 /* new geometry is an adjustment to the old one ! */
274 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 316 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
275 { 317 {
276 if (w == 0 && h != 0) 318 if (w == 0 && h != 0)
277 { 319 {
278 w = h_scale; 320 w = h_scale;
… …
294 } 336 }
295 } 337 }
296 else /* setting up geometry from scratch */ 338 else /* setting up geometry from scratch */
297 { 339 {
298 if (!(geom_flags & XValue)) 340 if (!(geom_flags & XValue))
341 {
299 {/* use default geometry - centered */ 342 /* use default geometry - centered */
300 x = y = defaultAlign; 343 x = y = defaultAlign;
301 } 344 }
302 else if (!(geom_flags & YValue)) 345 else if (!(geom_flags & YValue))
303 y = x; 346 y = x;
304 347
305 if ((geom_flags & (WidthValue|HeightValue)) == 0) 348 if ((geom_flags & (WidthValue|HeightValue)) == 0)
349 {
306 {/* use default geometry - scaled */ 350 /* use default geometry - scaled */
307 w = h = defaultScale; 351 w = h = defaultScale;
308 } 352 }
309 else if (geom_flags & WidthValue) 353 else if (geom_flags & WidthValue)
310 { 354 {
311 if (!(geom_flags & HeightValue)) 355 if (!(geom_flags & HeightValue))
… …
314 else 358 else
315 w = h; 359 w = h;
316 } 360 }
317 } /* done parsing geometry string */ 361 } /* done parsing geometry string */
318 else if (!(flags & geometrySet)) 362 else if (!(flags & geometrySet))
363 {
319 { /* default geometry - scaled and centered */ 364 /* default geometry - scaled and centered */
320 x = y = defaultAlign; 365 x = y = defaultAlign;
321 w = h = defaultScale; 366 w = h = defaultScale;
322 } 367 }
323 368
324 if (!(flags & geometrySet)) 369 if (!(flags & geometrySet))
325 geom_flags |= WidthValue|HeightValue|XValue|YValue; 370 geom_flags |= WidthValue|HeightValue|XValue|YValue;
326 371
327 if (ops) 372 if (ops)
328 { 373 {
329 while (*ops) 374 while (*ops)
330 { 375 {
331 while (*ops == ':' || isspace(*ops)) ++ops; 376 while (*ops == ':' || isspace(*ops)) ++ops;
377
332# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 378# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
333 if (CHECK_GEOM_OPS("tile")) 379 if (CHECK_GEOM_OPS ("tile"))
334 { 380 {
335 w = h = 0; 381 w = h = noScale;
336 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
337 } 383 }
338 else if (CHECK_GEOM_OPS("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
339 { 385 {
340 if (w == 0 && h == 0)
341 {
342 w = 100;
343 geom_flags |= WidthValue;
344 }
345 new_flags |= propScale; 386 new_flags |= propScale;
346 } 387 }
347 else if (CHECK_GEOM_OPS("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
348 { 389 {
349 if (w == 0) 390 if (w == 0) w = windowScale;
350 w = 100; 391
351 h = 0; 392 h = noScale;
352 geom_flags |= WidthValue|HeightValue; 393 geom_flags |= WidthValue|HeightValue;
353 } 394 }
354 else if (CHECK_GEOM_OPS("vscale")) 395 else if (CHECK_GEOM_OPS ("vscale"))
355 { 396 {
356 if (h == 0) 397 if (h == 0) h = windowScale;
357 h = 100; 398
358 w = 0; 399 w = noScale;
359 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
360 } 401 }
361 else if (CHECK_GEOM_OPS("scale")) 402 else if (CHECK_GEOM_OPS ("scale"))
362 { 403 {
363 if (h == 0) 404 if (h == 0) h = windowScale;
364 h = 100;
365 if (w == 0) 405 if (w == 0) w = windowScale;
366 w = 100; 406
367 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
368 } 408 }
369 else if (CHECK_GEOM_OPS("auto")) 409 else if (CHECK_GEOM_OPS ("auto"))
370 { 410 {
371 w = h = 100; 411 w = h = windowScale;
372 x = y = 50; 412 x = y = centerAlign;
373 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
374 } 414 }
415 else if (CHECK_GEOM_OPS ("root"))
416 {
417 new_flags |= rootAlign;
418 w = h = noScale;
419 geom_flags |= WidthValue|HeightValue;
420 }
375# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
422
376 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
377 } /* done parsing ops */ 424 } /* done parsing ops */
378 } 425 }
379 426
380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
381 ++changed;
382 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
383 ++changed;
384 if (check_set_align_value (geom_flags, XValue, h_align, x)) 429 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
385 ++changed;
386 if (check_set_align_value (geom_flags, YValue, v_align, y)) 430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
387 ++changed;
388 } 431 }
389 432
390 if (new_flags != flags) 433 if (new_flags != flags)
391 { 434 {
392 flags = new_flags; 435 flags = new_flags;
393 changed++; 436 changed++;
394 } 437 }
438
395//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
396// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
397 return (changed > 0); 441 return (changed > 0);
442}
443
444void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{
447 int target_width = target->szHint.width;
448 int target_height = target->szHint.height;
449
450 if (flags & propScale)
451 {
452 float scale = (float)target_width / image_width;
453 min_it (scale, (float)target_height / image_height);
454 w = image_width * scale + 0.5;
455 h = image_height * scale + 0.5;
456 }
457 else
458 {
459 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100;
461 }
462
463 if (flags & rootAlign)
464 {
465 target->get_window_origin (x, y);
466 x = -x;
467 y = -y;
468 }
469 else
470 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
473 }
474
475 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0
477 || h_align != 0 || v_align != 0
478 || image_width > target_width || image_height > target_height)
479 flags |= sizeSensitive;
398} 480}
399 481
400# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
401bool 483bool
402bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 484bgPixmap_t::render_image (unsigned long background_flags)
403{ 485{
404 if (target == NULL) 486 if (target == NULL)
405 return false; 487 return false;
406 488
489 target->init_asv ();
490
491 ASImage *background = NULL;
492 ARGB32 background_tint = TINT_LEAVE_SAME;
493
494# ifdef ENABLE_TRANSPARENCY
495 if (background_flags)
496 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
497
498 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
499 {
500 ShadingInfo as_shade;
501 as_shade.shading = (shade == 0) ? 100 : shade;
502
503 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
504 if (flags & tintSet)
505 tint.get (c);
506 as_shade.tintColor.red = c.r;
507 as_shade.tintColor.green = c.g;
508 as_shade.tintColor.blue = c.b;
509
510 background_tint = shading2tint32 (&as_shade);
511 }
512
513 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
514 {
515 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
517 100, ASIMAGE_QUALITY_DEFAULT);
518 if (tmp)
519 {
520 destroy_asimage (&background);
521 background = tmp;
522 }
523 }
524# endif
525
526 ASImage *result = 0;
527
407 int target_width = (int)target->szHint.width; 528 int target_width = target->szHint.width;
408 int target_height = (int)target->szHint.height; 529 int target_height = target->szHint.height;
409 int new_pmap_width = target_width, new_pmap_height = target_height; 530 int new_pmap_width = target_width;
410 ASImage *result = NULL; 531 int new_pmap_height = target_height;
411 532
412 int x = 0; 533 int x = 0;
413 int y = 0; 534 int y = 0;
414 int w = h_scale * target_width / 100; 535 int w = 0;
415 int h = v_scale * target_height / 100; 536 int h = 0;
416 537
417 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
418 539
419 if (original_asim) 540 if (original_asim)
420 { 541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
421 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
422 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
423 }
424 542
425 if (original_asim == NULL 543 if (!original_asim
544 || (!(flags & rootAlign)
426 || x >= target_width 545 && (x >= target_width
427 || y >= target_height 546 || y >= target_height
428 || (w > 0 && x + w <= 0) 547 || (w > 0 && x + w <= 0)
429 || (h > 0 && y + h <= 0)) 548 || (h > 0 && y + h <= 0))))
430 { 549 {
431 if (background) 550 if (background)
432 { 551 {
433 new_pmap_width = background->width; 552 new_pmap_width = background->width;
434 new_pmap_height = background->height; 553 new_pmap_height = background->height;
435 result = background; 554 result = background;
555
436 if (background_tint != TINT_LEAVE_SAME) 556 if (background_tint != TINT_LEAVE_SAME)
437 { 557 {
438 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 558 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
439 target_width, target_height, background_tint, 559 target_width, target_height, background_tint,
440 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 560 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
441 if (tmp) 561 if (tmp)
442 result = tmp; 562 result = tmp;
443 } 563 }
… …
446 new_pmap_width = new_pmap_height = 0; 566 new_pmap_width = new_pmap_height = 0;
447 } 567 }
448 else 568 else
449 { 569 {
450 result = original_asim; 570 result = original_asim;
571
451 if ((w > 0 && w != original_asim->width) 572 if ((w > 0 && w != original_asim->width)
452 || (h > 0 && h != original_asim->height)) 573 || (h > 0 && h != original_asim->height))
453 { 574 {
454 result = scale_asimage (target->asv, original_asim, 575 result = scale_asimage (target->asv, original_asim,
455 w > 0 ? w : original_asim->width, 576 w > 0 ? w : original_asim->width,
456 h > 0 ? h : original_asim->height, 577 h > 0 ? h : original_asim->height,
457 background ? ASA_ASImage : ASA_XImage, 578 background ? ASA_ASImage : ASA_XImage,
458 100, ASIMAGE_QUALITY_DEFAULT); 579 100, ASIMAGE_QUALITY_DEFAULT);
459 } 580 }
581
460 if (background == NULL) 582 if (background == NULL)
461 {/* if tiling - pixmap has to be sized exactly as the image */ 583 {
462 if (h_scale == 0)
463 new_pmap_width = result->width;
464 if (v_scale == 0)
465 new_pmap_height = result->height;
466 /* we also need to tile our image in one or both directions */
467 if (h_scale == 0 || v_scale == 0) 584 if (h_scale == 0 || v_scale == 0)
468 { 585 {
586 /* if tiling - pixmap has to be sized exactly as the image,
587 but there is no need to make it bigger than the window! */
588 new_pmap_width = min (result->width, target_width);
589 new_pmap_height = min (result->height, target_height);
590
591 /* we also need to tile our image in both directions */
469 ASImage *tmp = tile_asimage (target->asv, result, 592 ASImage *tmp = tile_asimage (target->asv, result,
470 (h_scale > 0) ? 0 : (int)result->width - x, 593 (int)result->width - x,
471 (v_scale > 0) ? 0 : (int)result->height - y, 594 (int)result->height - y,
595 new_pmap_width,
472 result->width, result->height, 596 new_pmap_height,
473 TINT_LEAVE_SAME, ASA_XImage, 597 TINT_LEAVE_SAME, ASA_XImage,
474 100, ASIMAGE_QUALITY_DEFAULT); 598 100, ASIMAGE_QUALITY_DEFAULT);
475 if (tmp) 599 if (tmp)
476 { 600 {
477 if (result != original_asim) 601 if (result != original_asim)
478 destroy_asimage (&result); 602 destroy_asimage (&result);
603
479 result = tmp; 604 result = tmp;
480 } 605 }
481 } 606 }
482 } 607 }
483 else 608 else
609 {
484 {/* if blending background and image - pixmap has to be sized same as target window */ 610 /* if blending background and image - pixmap has to be sized same as target window */
485 ASImageLayer *layers = create_image_layers (2); 611 ASImageLayer *layers = create_image_layers (2);
486 ASImage *merged_im = NULL;
487 612
488 layers[0].im = background; 613 layers[0].im = background;
489 layers[0].clip_width = target_width; 614 layers[0].clip_width = target_width;
490 layers[0].clip_height = target_height; 615 layers[0].clip_height = target_height;
491 layers[0].tint = background_tint; 616 layers[0].tint = background_tint;
492 layers[1].im = result; 617 layers[1].im = result;
618
493 if (w <= 0) 619 if (w <= 0)
620 {
494 {/* tile horizontally */ 621 /* tile horizontally */
495 while (x > 0) x -= (int)result->width; 622 while (x > 0) x -= (int)result->width;
496 layers[1].dst_x = x; 623 layers[1].dst_x = x;
497 layers[1].clip_width = result->width+target_width; 624 layers[1].clip_width = result->width+target_width;
498 } 625 }
499 else 626 else
627 {
500 {/* clip horizontally */ 628 /* clip horizontally */
501 layers[1].dst_x = x; 629 layers[1].dst_x = x;
502 layers[1].clip_width = result->width; 630 layers[1].clip_width = result->width;
503 } 631 }
632
504 if (h <= 0) 633 if (h <= 0)
505 { 634 {
506 while (y > 0) y -= (int)result->height; 635 while (y > 0) y -= (int)result->height;
507 layers[1].dst_y = y; 636 layers[1].dst_y = y;
508 layers[1].clip_height = result->height + target_height; 637 layers[1].clip_height = result->height + target_height;
… …
510 else 639 else
511 { 640 {
512 layers[1].dst_y = y; 641 layers[1].dst_y = y;
513 layers[1].clip_height = result->height; 642 layers[1].clip_height = result->height;
514 } 643 }
644
515 if (target->rs[Rs_blendtype]) 645 if (target->rs[Rs_blendtype])
516 { 646 {
517 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 647 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
518 if (layers[1].merge_scanlines == NULL) 648 if (layers[1].merge_scanlines == NULL)
519 layers[1].merge_scanlines = alphablend_scanlines; 649 layers[1].merge_scanlines = alphablend_scanlines;
520 } 650 }
651
521 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 652 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
522 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 653 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
654
523 if (tmp) 655 if (tmp)
524 { 656 {
525 if (result != original_asim) 657 if (result != original_asim)
526 destroy_asimage (&result); 658 destroy_asimage (&result);
659
527 result = tmp; 660 result = tmp;
528 } 661 }
662
529 free (layers); 663 free (layers);
530 } 664 }
531 } 665 }
532 TIMING_TEST_PRINT_RESULT (asim); 666 TIMING_TEST_PRINT_RESULT (asim);
533 667
534 if (pixmap) 668 bool ret = false;
535 {
536 if (result == NULL
537 || pmap_width != new_pmap_width
538 || pmap_height != new_pmap_height
539 || pmap_depth != target->depth)
540 {
541 XFreePixmap (target->dpy, pixmap);
542 pixmap = None;
543 }
544 }
545 669
546 if (result) 670 if (result)
547 { 671 {
548 XGCValues gcv; 672 XGCValues gcv;
549 GC gc; 673 GC gc;
674
675 if (pixmap)
676 {
677 if (pmap_width != new_pmap_width
678 || pmap_height != new_pmap_height
679 || pmap_depth != target->depth)
680 {
681 XFreePixmap (target->dpy, pixmap);
682 pixmap = None;
683 }
684 }
550 685
551 /* create Pixmap */ 686 /* create Pixmap */
552 if (pixmap == None) 687 if (pixmap == None)
553 { 688 {
554 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 689 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
555 pmap_width = new_pmap_width; 690 pmap_width = new_pmap_width;
556 pmap_height = new_pmap_height; 691 pmap_height = new_pmap_height;
557 pmap_depth = target->depth; 692 pmap_depth = target->depth;
558 } 693 }
559 /* fill with background color ( if result's not completely overlapping it)*/ 694 /* fill with background color (if result's not completely overlapping it) */
560 gcv.foreground = target->pix_colors[Color_bg]; 695 gcv.foreground = target->pix_colors[Color_bg];
561 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 696 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
562 697
563 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 698 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
564 int dst_width = result->width, dst_height = result->height; 699 int dst_width = result->width, dst_height = result->height;
565 if (background == NULL) 700 if (background == NULL)
566 { 701 {
567 if (h_scale > 0) 702 if (!(h_scale == 0 || v_scale == 0))
703 {
568 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 704 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
569 if (v_scale > 0)
570 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 705 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
706 }
571 707
572 if (dst_x > 0 || dst_y > 0 708 if (dst_x > 0 || dst_y > 0
573 || dst_x + dst_width < new_pmap_width 709 || dst_x + dst_width < new_pmap_width
574 || dst_y + dst_height < new_pmap_height) 710 || dst_y + dst_height < new_pmap_height)
575 {
576 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 711 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
577 }
578 } 712 }
579 713
580 /* put result on pixmap */ 714 /* put result on pixmap */
581 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 715 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
582 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 716 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
583 717
584 if (result != background && result != original_asim) 718 if (result != background && result != original_asim)
585 destroy_asimage (&result); 719 destroy_asimage (&result);
586 720
587 XFreeGC (target->dpy, gc); 721 XFreeGC (target->dpy, gc);
588 TIMING_TEST_PRINT_RESULT (asim); 722 TIMING_TEST_PRINT_RESULT (asim);
589 }
590 723
724 ret = true;
725 }
726
727 if (background)
728 destroy_asimage (&background);
729
591 return true; 730 return ret;
592} 731}
593# endif /* HAVE_AFTERIMAGE */ 732# endif /* HAVE_AFTERIMAGE */
733
734# ifdef HAVE_PIXBUF
735bool
736bgPixmap_t::render_image (unsigned long background_flags)
737{
738 if (target == NULL)
739 return false;
740
741 if (!pixbuf)
742 return false;
743
744 // TODO: add alpha blending
745 if (background_flags)
746 return false;
747
748 GdkPixbuf *result;
749
750 int image_width = gdk_pixbuf_get_width (pixbuf);
751 int image_height = gdk_pixbuf_get_height (pixbuf);
752
753 int target_width = target->szHint.width;
754 int target_height = target->szHint.height;
755 int new_pmap_width = target_width;
756 int new_pmap_height = target_height;
757
758 int x = 0;
759 int y = 0;
760 int w = 0;
761 int h = 0;
762
763 get_image_geometry (image_width, image_height, w, h, x, y);
764
765 if (!(flags & rootAlign)
766 && (x >= target_width
767 || y >= target_height
768 || (w > 0 && x + w <= 0)
769 || (h > 0 && y + h <= 0)))
770 return false;
771
772 result = pixbuf;
773
774 if ((w > 0 && w != image_width)
775 || (h > 0 && h != image_height))
776 {
777 result = gdk_pixbuf_scale_simple (pixbuf,
778 w > 0 ? w : image_width,
779 h > 0 ? h : image_height,
780 GDK_INTERP_BILINEAR);
781 }
782
783 bool ret = false;
784
785 if (result)
786 {
787 XGCValues gcv;
788 GC gc;
789
790 image_width = gdk_pixbuf_get_width (result);
791 image_height = gdk_pixbuf_get_height (result);
792
793 if (h_scale == 0 || v_scale == 0)
794 {
795 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height);
797 }
798
799 if (pixmap)
800 {
801 if (pmap_width != new_pmap_width
802 || pmap_height != new_pmap_height
803 || pmap_depth != target->depth)
804 {
805 XFreePixmap (target->dpy, pixmap);
806 pixmap = None;
807 }
808 }
809
810 if (pixmap == None)
811 {
812 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
813 pmap_width = new_pmap_width;
814 pmap_height = new_pmap_height;
815 pmap_depth = target->depth;
816 }
817
818 gcv.foreground = target->pix_colors[Color_bg];
819 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
820
821 if (h_scale == 0 || v_scale == 0)
822 {
823 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
824 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
825 0, 0,
826 0, 0,
827 image_width, image_height,
828 XLIB_RGB_DITHER_NONE,
829 0, 0);
830
831 gcv.tile = tile;
832 gcv.fill_style = FillTiled;
833 gcv.ts_x_origin = x;
834 gcv.ts_y_origin = y;
835 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
836
837 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
838 XFreePixmap (target->dpy, tile);
839 }
840 else
841 {
842 int src_x, src_y, dst_x, dst_y;
843 int dst_width, dst_height;
844
845 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
846 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
847
848 if (dst_x > 0 || dst_y > 0
849 || dst_x + dst_width < new_pmap_width
850 || dst_y + dst_height < new_pmap_height)
851 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
852
853 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
854 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
855 src_x, src_y,
856 dst_x, dst_y,
857 dst_width, dst_height,
858 XLIB_RGB_DITHER_NONE,
859 0, 0);
860 }
861
862 if (result != pixbuf)
863 g_object_unref (result);
864
865 XFreeGC (target->dpy, gc);
866
867 ret = true;
868 }
869
870 return ret;
871}
872# endif /* HAVE_PIXBUF */
594 873
595bool 874bool
596bgPixmap_t::set_file (const char *file) 875bgPixmap_t::set_file (const char *file)
597{ 876{
598 char *f;
599
600 assert (file != NULL); 877 assert (file);
601 878
602 if (*file != '\0') 879 if (*file)
603 { 880 {
881 if (const char *p = strchr (file, ';'))
882 {
883 size_t len = p - file;
884 char *f = rxvt_temp_buf<char> (len + 1);
885 memcpy (f, file, len);
886 f[len] = '\0';
887 file = f;
888 }
889
604# ifdef HAVE_AFTERIMAGE 890# ifdef HAVE_AFTERIMAGE
605 if (target->asimman == NULL) 891 if (!target->asimman)
606 target->asimman = create_generic_imageman (target->rs[Rs_path]); 892 target->asimman = create_generic_imageman (target->rs[Rs_path]);
607 if ((f = strchr (file, ';')) == NULL)
608 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 893 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
609 else 894 if (original_asim)
610 { 895 have_image = true;
611 size_t len = f - file; 896 return have_image;
612 f = (char *)malloc (len + 1);
613 strncpy (f, file, len);
614 f[len] = '\0';
615 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
616 free (f);
617 }
618 return (original_asim != NULL);
619# endif 897# endif
898
899# ifdef HAVE_PIXBUF
900 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
901 if (pixbuf)
902 have_image = true;
903 return have_image;
904# endif
620 } 905 }
906
621 return false; 907 return false;
622} 908}
623 909
624# endif /* BG_IMAGE_FROM_FILE */ 910# endif /* BG_IMAGE_FROM_FILE */
625 911
626# ifdef ENABLE_TRANSPARENCY 912# ifdef ENABLE_TRANSPARENCY
627bool 913bool
628bgPixmap_t::set_transparent () 914bgPixmap_t::set_transparent ()
629{ 915{
630 if (!(flags & isTransparent)) 916 if (!(flags & isTransparent))
631 { 917 {
632 flags |= isTransparent; 918 flags |= isTransparent;
633 return true; 919 return true;
634 } 920 }
921
635 return false; 922 return false;
636} 923}
637 924
638bool 925bool
639bgPixmap_t::set_blur_radius (const char *geom) 926bgPixmap_t::set_blur_radius (const char *geom)
… …
641 int changed = 0; 928 int changed = 0;
642 unsigned int hr, vr; 929 unsigned int hr, vr;
643 int junk; 930 int junk;
644 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 931 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
645 932
646 if (!(geom_flags&WidthValue)) 933 if (!(geom_flags & WidthValue))
647 hr = 1; 934 hr = 1;
648 if (!(geom_flags&HeightValue)) 935 if (!(geom_flags & HeightValue))
649 vr = hr; 936 vr = hr;
650 937
651 if (h_blurRadius != hr) 938 if (h_blurRadius != hr)
652 { 939 {
653 ++changed; 940 ++changed;
… …
657 if (v_blurRadius != vr) 944 if (v_blurRadius != vr)
658 { 945 {
659 ++changed; 946 ++changed;
660 v_blurRadius = vr; 947 v_blurRadius = vr;
661 } 948 }
662 949
663 if (v_blurRadius == 0 && h_blurRadius == 0) 950 if (v_blurRadius == 0 && h_blurRadius == 0)
664 flags &= ~blurNeeded; 951 flags &= ~blurNeeded;
665 else 952 else
666 flags |= blurNeeded; 953 flags |= blurNeeded;
667 954
668 return (changed>0); 955 return (changed > 0);
669} 956}
670 957
671static inline unsigned long 958static inline unsigned long
672compute_tint_shade_flags (rxvt_color *tint, int shade) 959compute_tint_shade_flags (rxvt_color *tint, int shade)
673{ 960{
… …
690 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
691 else if (tint) 978 else if (tint)
692 { 979 {
693 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 980 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
694 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 981 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
695 { 982 {
696 flags |= bgPixmap_t::tintNeeded; 983 flags |= bgPixmap_t::tintNeeded;
697 } 984 }
698 }
699 985 }
986
700 if (flags & bgPixmap_t::tintNeeded) 987 if (flags & bgPixmap_t::tintNeeded)
701 { 988 {
702 if (flags & bgPixmap_t::tintWholesome) 989 if (flags & bgPixmap_t::tintWholesome)
703 flags |= bgPixmap_t::tintServerSide; 990 flags |= bgPixmap_t::tintServerSide;
704 else 991 else
… …
720 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1007 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
721 tint = new_tint; 1008 tint = new_tint;
722 flags = (flags & ~tintFlags) | new_flags | tintSet; 1009 flags = (flags & ~tintFlags) | new_flags | tintSet;
723 return true; 1010 return true;
724 } 1011 }
1012
725 return false; 1013 return false;
726} 1014}
727 1015
728bool 1016bool
729bgPixmap_t::unset_tint () 1017bgPixmap_t::unset_tint ()
730{ 1018{
731 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1019 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
732 1020
733 if (new_flags != (flags & tintFlags)) 1021 if (new_flags != (flags & tintFlags))
734 { 1022 {
735 flags = (flags&~tintFlags)|new_flags; 1023 flags = (flags & ~tintFlags) | new_flags;
736 return true; 1024 return true;
737 } 1025 }
1026
738 return false; 1027 return false;
739} 1028}
740 1029
741bool 1030bool
742bgPixmap_t::set_shade (const char *shade_str) 1031bgPixmap_t::set_shade (const char *shade_str)
743{ 1032{
744 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1033 int new_shade = (shade_str) ? atoi (shade_str) : 0;
745 1034
746 if (new_shade < 0 && new_shade > -100) 1035 if (new_shade < 0 && new_shade > -100)
747 new_shade = 200 - (100 + new_shade); 1036 new_shade = 200 - (100 + new_shade);
748 else if (new_shade == 100) 1037 else if (new_shade == 100)
749 new_shade = 0; 1038 new_shade = 0;
750 1039
751 if (new_shade != shade) 1040 if (new_shade != shade)
752 { 1041 {
753 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1042 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
754 shade = new_shade; 1043 shade = new_shade;
755 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1044 flags = (flags & (~tintFlags | tintSet)) | new_flags;
756 return true; 1045 return true;
757 } 1046 }
1047
758 return false; 1048 return false;
759} 1049}
760 1050
1051bool
1052bgPixmap_t::tint_pixmap (Pixmap pixmap)
1053{
1054 Window root = target->display->root;
1055 Display *dpy = target->dpy;
1056 int window_width = target->szHint.width;
1057 int window_height = target->szHint.height;
1058 bool ret = false;
1059
1060 if (flags & tintWholesome)
1061 {
1062 XGCValues gcv;
1063 GC gc;
1064
1065 /* In this case we can tint image server-side getting significant
1066 * performance improvements, as we eliminate XImage transfer
1067 */
1068 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand;
1070 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc)
1073 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1075 ret = true;
1076 XFreeGC (dpy, gc);
1077 }
1078 }
1079 else
1080 {
1081# if XFT
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083
1084 if (flags & tintSet)
1085 tint.get (c);
1086
1087 if (shade > 0 && shade < 100)
1088 {
1089 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100;
1092 }
1093 else if (shade > 100 && shade < 200)
1094 {
1095 c.r = (c.r * (200 - shade)) / 100;
1096 c.g = (c.g * (200 - shade)) / 100;
1097 c.b = (c.b * (200 - shade)) / 100;
1098 }
1099
1100 XRenderPictFormat pf;
1101 pf.type = PictTypeDirect;
1102 pf.depth = 32;
1103 pf.direct.redMask = 0xff;
1104 pf.direct.greenMask = 0xff;
1105 pf.direct.blueMask = 0xff;
1106 pf.direct.alphaMask = 0xff;
1107
1108 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1109 (PictFormatType|
1110 PictFormatDepth|
1111 PictFormatRedMask|
1112 PictFormatGreenMask|
1113 PictFormatBlueMask|
1114 PictFormatAlphaMask),
1115 &pf,
1116 0);
1117 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1118 XRenderPictureAttributes pa;
1119
1120 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1121
1122 pa.repeat = True;
1123
1124 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1125 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1126 XFreePixmap (dpy, overlay_pmap);
1127
1128 pa.component_alpha = True;
1129 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1130 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1131 XFreePixmap (dpy, mask_pmap);
1132
1133 if (mask_pic && overlay_pic && back_pic)
1134 {
1135 XRenderColor mask_c;
1136
1137 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1138 mask_c.alpha = 0xffff;
1139 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1140
1141 mask_c.alpha = 0;
1142 mask_c.red = 0xffff - c.r;
1143 mask_c.green = 0xffff - c.g;
1144 mask_c.blue = 0xffff - c.b;
1145 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1146 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1147 ret = true;
1148 }
1149
1150 XRenderFreePicture (dpy, mask_pic);
1151 XRenderFreePicture (dpy, overlay_pic);
1152 XRenderFreePicture (dpy, back_pic);
1153# if DO_TIMING_TEST
1154 XSync (dpy, False);
1155# endif
1156# endif
1157 }
1158
1159 return ret;
1160}
1161
761/* make_transparency_pixmap() 1162/* make_transparency_pixmap()
762 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1163 * Builds a pixmap sized the same as terminal window, with depth same as the root window
763 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1164 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
764 * our window. 1165 * our window.
765 */ 1166 */
766unsigned long 1167unsigned long
767bgPixmap_t::make_transparency_pixmap () 1168bgPixmap_t::make_transparency_pixmap ()
768{ 1169{
769 unsigned long result = 0; 1170 unsigned long result = 0;
770 1171
771 if (target == NULL) 1172 if (target == NULL)
772 return 0; 1173 return 0;
773 1174
774 /* root dimentions may change from call to call - but Display structure should 1175 /* root dimensions may change from call to call - but Display structure should
775 * be always up-to-date, so let's use it : 1176 * be always up-to-date, so let's use it :
776 */ 1177 */
777 Window root = target->display->root; 1178 Window root = target->display->root;
778 int screen = target->display->screen; 1179 int screen = target->display->screen;
779 Display *dpy = target->dpy; 1180 Display *dpy = target->dpy;
… …
792 if (sx + window_width <= 0 || sy + window_height <= 0 1193 if (sx + window_width <= 0 || sy + window_height <= 0
793 || sx >= root_width || sy >= root_height) 1194 || sx >= root_width || sy >= root_height)
794 return 0; 1195 return 0;
795 1196
796 if (root_pixmap != None) 1197 if (root_pixmap != None)
1198 {
797 {/* we want to validate the pixmap and get it's size at the same time : */ 1199 /* we want to validate the pixmap and get it's size at the same time : */
798 int junk; 1200 int junk;
799 unsigned int ujunk; 1201 unsigned int ujunk;
800 /* root pixmap may be bad - allow a error */ 1202 /* root pixmap may be bad - allow a error */
801 target->allowedxerror = -1; 1203 target->allowedxerror = -1;
802 1204
… …
811 1213
812 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1214 if (tiled_root_pmap == None) /* something really bad happened - abort */
813 return 0; 1215 return 0;
814 1216
815 if (root_pixmap == None) 1217 if (root_pixmap == None)
1218 {
816 { /* use tricks to obtain the root background image :*/ 1219 /* use tricks to obtain the root background image :*/
817 /* we want to create Overrideredirect window overlapping out window 1220 /* we want to create Overrideredirect window overlapping out window
818 with background type of Parent Relative and then grab it */ 1221 with background type of Parent Relative and then grab it */
819 XSetWindowAttributes attr; 1222 XSetWindowAttributes attr;
820 Window src; 1223 Window src;
821 bool success = false; 1224 bool success = false;
822 1225
823 attr.background_pixmap = ParentRelative; 1226 attr.background_pixmap = ParentRelative;
824 attr.backing_store = Always; 1227 attr.backing_store = Always;
825 attr.event_mask = ExposureMask; 1228 attr.event_mask = ExposureMask;
826 attr.override_redirect = True; 1229 attr.override_redirect = True;
827 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1230 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
828 CopyFromParent, CopyFromParent, CopyFromParent, 1231 CopyFromParent, CopyFromParent, CopyFromParent,
829 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1232 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
830 &attr); 1233 &attr);
831 1234
832 if (src != None) 1235 if (src != None)
… …
836 XGrabServer (dpy); 1239 XGrabServer (dpy);
837 XMapRaised (dpy, src); 1240 XMapRaised (dpy, src);
838 XSync (dpy, False); 1241 XSync (dpy, False);
839 1242
840 /* XSync should get window where it's properly exposed, 1243 /* XSync should get window where it's properly exposed,
841 * but to be on the safe side - let's check for the actuall event to arrive : */ 1244 * but to be on the safe side - let's check for the actual event to arrive : */
842 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1245 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
843 ++ev_count; 1246 ++ev_count;
844 1247
845 if (ev_count > 0); 1248 if (ev_count > 0);
1249 {
846 { /* hooray! - we can grab the image! */ 1250 /* hooray! - we can grab the image! */
847 gc = XCreateGC (dpy, root, 0, NULL); 1251 gc = XCreateGC (dpy, root, 0, NULL);
848 if (gc) 1252 if (gc)
849 { 1253 {
850 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1254 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
851 success = true; 1255 success = true;
852 } 1256 }
853 } 1257 }
1258
854 XDestroyWindow (dpy, src); 1259 XDestroyWindow (dpy, src);
855 XUngrabServer (dpy); 1260 XUngrabServer (dpy);
856 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1261 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
857 } 1262 }
858 1263
859 if (!success) 1264 if (!success)
860 { 1265 {
861 XFreePixmap (dpy, tiled_root_pmap); 1266 XFreePixmap (dpy, tiled_root_pmap);
862 tiled_root_pmap = None; 1267 tiled_root_pmap = None;
863 } 1268 }
864 else 1269 else
865 result |= transpPmapTiled; 1270 result |= transpPmapTiled;
866 } 1271 }
867 else 1272 else
1273 {
868 {/* strightforward pixmap copy */ 1274 /* straightforward pixmap copy */
869 gcv.tile = root_pixmap; 1275 gcv.tile = root_pixmap;
870 gcv.fill_style = FillTiled; 1276 gcv.fill_style = FillTiled;
871 1277
872 while (sx < 0) sx += (int)root_width; 1278 while (sx < 0) sx += (int)root_width;
873 while (sy < 0) sy += (int)root_height; 1279 while (sy < 0) sy += (int)root_height;
… …
884 } 1290 }
885 TIMING_TEST_PRINT_RESULT (tp); 1291 TIMING_TEST_PRINT_RESULT (tp);
886 1292
887 if (tiled_root_pmap != None) 1293 if (tiled_root_pmap != None)
888 { 1294 {
889 if (!need_client_side_rendering ()) 1295 if (!need_client_side_rendering ())
890 { 1296 {
891 if ((flags & tintNeeded)) 1297 if ((flags & tintNeeded))
892 {
893 if (flags & tintWholesome)
894 { 1298 {
895 /* In this case we can tint image server-side getting significant 1299 if (tint_pixmap (tiled_root_pmap))
896 * performance improvements, as we eliminate XImage transfer
897 */
898 gcv.foreground = Pixel (tint);
899 gcv.function = GXand;
900 gcv.fill_style = FillSolid;
901 if (gc)
902 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
903 else
904 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
905 if (gc)
906 {
907 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
908 result |= transpPmapTinted; 1300 result |= transpPmapTinted;
909 }
910 }
911 else
912 {
913# if XFT
914 Picture back_pic = 0;
915 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
916
917 if (flags & tintSet)
918 tint.get (c);
919
920 if (shade > 0 && shade < 100)
921 {
922 c.r = (c.r * shade) / 100;
923 c.g = (c.g * shade) / 100;
924 c.b = (c.b * shade) / 100;
925 }
926 else if( shade > 100 && shade < 200)
927 {
928 c.r = (c.r * (200 - shade)) / 100;
929 c.g = (c.g * (200 - shade)) / 100;
930 c.b = (c.b * (200 - shade)) / 100;
931 }
932
933 XRenderPictFormat pf;
934 pf.type = PictTypeDirect;
935 pf.depth = 32;
936 pf.direct.redMask = 0xff;
937 pf.direct.greenMask = 0xff;
938 pf.direct.blueMask = 0xff;
939 pf.direct.alphaMask = 0xff;
940
941 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
942 (PictFormatType|
943 PictFormatDepth|
944 PictFormatRedMask|
945 PictFormatGreenMask|
946 PictFormatBlueMask|
947 PictFormatAlphaMask),
948 &pf,
949 0);
950 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
951 XRenderPictureAttributes pa ;
952
953 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
954
955 pa.repeat = True;
956
957 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
958 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
959 XFreePixmap (dpy, overlay_pmap);
960
961 pa.component_alpha = True;
962 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
963 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
964 XFreePixmap (dpy, mask_pmap);
965
966 if (mask_pic && overlay_pic && back_pic)
967 {
968 XRenderColor mask_c;
969
970 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
971 mask_c.alpha = 0xffff;
972 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
973
974 mask_c.alpha = 0;
975 mask_c.red = 0xffff - c.r;
976 mask_c.green = 0xffff - c.g;
977 mask_c.blue = 0xffff - c.b;
978 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
979 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
980 result |= transpPmapTinted;
981 }
982 XRenderFreePicture (dpy, mask_pic);
983 XRenderFreePicture (dpy, overlay_pic);
984 XRenderFreePicture (dpy, back_pic);
985# if DO_TIMING_TEST
986 XSync (dpy, False);
987# endif
988# endif
989 }
990 } 1301 }
991 } /* server side rendering completed */ 1302 } /* server side rendering completed */
992 1303
993 if (pixmap) 1304 if (pixmap)
994 XFreePixmap (dpy, pixmap); 1305 XFreePixmap (dpy, pixmap);
995 1306
996 pixmap = tiled_root_pmap; 1307 pixmap = tiled_root_pmap;
997 pmap_width = window_width; 1308 pmap_width = window_width;
998 pmap_height = window_height; 1309 pmap_height = window_height;
999 pmap_depth = root_depth; 1310 pmap_depth = root_depth;
1000 } 1311 }
1001 1312
1002 if (gc) 1313 if (gc)
1003 XFreeGC (dpy, gc); 1314 XFreeGC (dpy, gc);
1004 1315
1005 TIMING_TEST_PRINT_RESULT (tp); 1316 TIMING_TEST_PRINT_RESULT (tp);
1006 1317
1007 return result; 1318 return result;
1008} 1319}
1009 1320
1010bool 1321bool
1011bgPixmap_t::set_root_pixmap () 1322bgPixmap_t::set_root_pixmap ()
1012{ 1323{
1013 Pixmap new_root_pixmap = None;
1014
1015 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1324 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1016 if (new_root_pixmap == None) 1325 if (new_root_pixmap == None)
1017 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1326 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1018 1327
1019 if (new_root_pixmap != root_pixmap) 1328 if (new_root_pixmap != root_pixmap)
1020 { 1329 {
1021 root_pixmap = new_root_pixmap; 1330 root_pixmap = new_root_pixmap;
1022 return true; 1331 return true;
1023 } 1332 }
1333
1024 return false; 1334 return false;
1025} 1335}
1026# endif /* ENABLE_TRANSPARENCY */ 1336# endif /* ENABLE_TRANSPARENCY */
1027 1337
1028# ifndef HAVE_AFTERIMAGE 1338# ifndef HAVE_AFTERIMAGE
1029static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1339static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1030# endif 1340# endif
1031
1032 1341
1033bool 1342bool
1034bgPixmap_t::render () 1343bgPixmap_t::render ()
1035{ 1344{
1036 unsigned long background_flags = 0; 1345 unsigned long background_flags = 0;
… …
1038 if (target == NULL) 1347 if (target == NULL)
1039 return false; 1348 return false;
1040 1349
1041 TIMING_TEST_START (tp); 1350 TIMING_TEST_START (tp);
1042 1351
1043 invalidate(); 1352 invalidate ();
1044# ifdef ENABLE_TRANSPARENCY 1353# ifdef ENABLE_TRANSPARENCY
1045 if (flags & isTransparent) 1354 if (flags & isTransparent)
1046 { 1355 {
1047 /* we need to re-generate transparency pixmap in that case ! */ 1356 /* we need to re-generate transparency pixmap in that case ! */
1048 background_flags = make_transparency_pixmap (); 1357 background_flags = make_transparency_pixmap ();
1049 if (background_flags == 0) 1358 if (background_flags == 0)
1050 return false; 1359 return false;
1051 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1360 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1052 && pmap_depth == target->depth) 1361 && pmap_depth == target->depth)
1053 flags = flags & ~isInvalid; 1362 flags = flags & ~isInvalid;
1054 } 1363 }
1055# endif 1364# endif
1056 1365
1366# ifdef BG_IMAGE_FROM_FILE
1367 if (have_image
1368 || (background_flags & transpTransformations) != (flags & transpTransformations))
1369 {
1370 if (render_image (background_flags))
1371 flags = flags & ~isInvalid;
1372 }
1373# endif
1374
1057 XImage *result = NULL; 1375 XImage *result = NULL;
1058# ifdef HAVE_AFTERIMAGE 1376
1059 if (original_asim 1377 if (background_flags && (flags & isInvalid))
1060 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1378 {
1379 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1061 { 1380 }
1062 ASImage *background = NULL;
1063 ARGB32 as_tint = TINT_LEAVE_SAME;
1064 if (background_flags)
1065 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1066 1381
1067# ifdef ENABLE_TRANSPARENCY 1382 if (result)
1383 {
1384# if !defined(HAVE_AFTERIMAGE) && !XFT
1385 /* our own client-side tinting */
1386 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1387 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1068 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1069 {
1070 ShadingInfo as_shade;
1071 as_shade.shading = (shade == 0) ? 100 : shade;
1072
1073 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1074 if (flags & tintSet)
1075 tint.get (c);
1076 as_shade.tintColor.red = c.r;
1077 as_shade.tintColor.green = c.g;
1078 as_shade.tintColor.blue = c.b;
1079
1080 as_tint = shading2tint32 (&as_shade);
1081 }
1082 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1083 {
1084 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1085 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1086 100, ASIMAGE_QUALITY_DEFAULT);
1087 if (tmp)
1088 {
1089 destroy_asimage (&background);
1090 background = tmp;
1091 }
1092 }
1093# endif
1094
1095 if (render_asim (background, as_tint))
1096 flags = flags & ~isInvalid;
1097 if (background)
1098 destroy_asimage (&background);
1099 }
1100 else if (background_flags && pmap_depth != target->depth)
1101 {
1102 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1103 }
1104
1105# elif !XFT /* our own client-side tinting */
1106
1107 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1108 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1109
1110 if (background_flags && (flags & isInvalid))
1111 {
1112 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1113 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1114 { 1389 {
1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1116 if (flags & tintSet) 1391 if (flags & tintSet)
1117 tint.get (c); 1392 tint.get (c);
1118 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1393 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1119 } 1394 }
1120 } 1395# endif
1121# endif /* HAVE_AFTERIMAGE */
1122 1396
1123 if (result != NULL)
1124 {
1125 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1397 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1398
1126 if (gc) 1399 if (gc)
1127 { 1400 {
1128 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1401 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1129 { 1402 {
1130 XFreePixmap (target->dpy, pixmap); 1403 XFreePixmap (target->dpy, pixmap);
1131 pixmap = None; 1404 pixmap = None;
1132 } 1405 }
1406
1133 if (pixmap == None) 1407 if (pixmap == None)
1134 { 1408 {
1135 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1409 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1136 pmap_width = result->width; 1410 pmap_width = result->width;
1137 pmap_height = result->height; 1411 pmap_height = result->height;
1138 pmap_depth = target->depth; 1412 pmap_depth = target->depth;
1139 } 1413 }
1414
1140 if (pmap_depth != result->depth) 1415 if (pmap_depth != result->depth)
1416 {
1141 { /* Bad Match error will ensue ! stupid X !!!! */ 1417 /* Bad Match error will ensue ! stupid X !!!! */
1142 if( result->depth == 24 && pmap_depth == 32) 1418 if (result->depth == 24 && pmap_depth == 32)
1143 result->depth = 32; 1419 result->depth = 32;
1144 else if( result->depth == 32 && pmap_depth == 24) 1420 else if (result->depth == 32 && pmap_depth == 24)
1145 result->depth = 24; 1421 result->depth = 24;
1146 else 1422 else
1147 { 1423 {
1148 /* TODO: implement image recoding */ 1424 /* TODO: implement image recoding */
1149 } 1425 }
1150 } 1426 }
1427
1151 if (pmap_depth == result->depth) 1428 if (pmap_depth == result->depth)
1152 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1429 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1430
1153 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1154 flags = flags & ~isInvalid; 1432 flags = flags & ~isInvalid;
1155 } 1433 }
1434
1156 XDestroyImage (result); 1435 XDestroyImage (result);
1157 } 1436 }
1158 1437
1159 if (flags & isInvalid) 1438 if (flags & isInvalid)
1160 { 1439 {
1161 if (pixmap != None) 1440 if (pixmap != None)
… …
1165 } 1444 }
1166 } 1445 }
1167 1446
1168 apply (); 1447 apply ();
1169 1448
1449 XSync (target->dpy, False);
1450 valid_since = ev::now ();
1451
1170 TIMING_TEST_PRINT_RESULT (tp); 1452 TIMING_TEST_PRINT_RESULT (tp);
1171 1453
1172 return true; 1454 return true;
1173} 1455}
1174 1456
1175bool 1457bool
1176bgPixmap_t::set_target (rxvt_term *new_target) 1458bgPixmap_t::set_target (rxvt_term *new_target)
1177{ 1459{
1178 if (new_target) 1460 if (new_target)
1179 if (target != new_target) 1461 if (target != new_target)
1180 { 1462 {
… …
1182# ifdef ENABLE_TRANSPARENCY 1464# ifdef ENABLE_TRANSPARENCY
1183 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1465 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1184# endif 1466# endif
1185 return true; 1467 return true;
1186 } 1468 }
1469
1187 return false; 1470 return false;
1188} 1471}
1189 1472
1190void 1473void
1191bgPixmap_t::apply() 1474bgPixmap_t::apply ()
1192{ 1475{
1193 if (target) 1476 if (target)
1194 { 1477 {
1195 flags &= ~isVtOrigin; 1478 flags &= ~isVtOrigin;
1479
1196 if (pixmap != None) 1480 if (pixmap != None)
1481 {
1197 { /* set target's background to pixmap */ 1482 /* set target's background to pixmap */
1198# ifdef ENABLE_TRANSPARENCY 1483# ifdef ENABLE_TRANSPARENCY
1199 if (flags & isTransparent) 1484 if (flags & isTransparent)
1200 { 1485 {
1201 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1486 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1202 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1203# if HAVE_SCROLLBARS 1488
1204 if (target->scrollBar.win) 1489 if (target->scrollBar.win)
1205 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1490 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1206# endif
1207 } 1491 }
1208 else 1492 else
1209# endif 1493# endif
1210 { 1494 {
1211 flags |= isVtOrigin; 1495 flags |= isVtOrigin;
1212 /* force old pixmap dereference in case it was transparent before :*/ 1496 /* force old pixmap dereference in case it was transparent before :*/
1213 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1214 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1498 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1215 /* do we also need to set scrollbar's background here ? */ 1499 /* do we also need to set scrollbar's background here ? */
1216# if HAVE_SCROLLBARS 1500
1217 if (target->scrollBar.win) 1501 if (target->scrollBar.win)
1218 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1502 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1219# endif
1220 } 1503 }
1221 } 1504 }
1222 else 1505 else
1506 {
1223 { /* set target background to a pixel */ 1507 /* set target background to a pixel */
1224 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1508 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1225 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1509 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1226 /* do we also need to set scrollbar's background here ? */ 1510 /* do we also need to set scrollbar's background here ? */
1227# if HAVE_SCROLLBARS
1228 if (target->scrollBar.win) 1511 if (target->scrollBar.win)
1229 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1512 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1230# endif
1231 } 1513 }
1514
1232 /* don't want Expose on the parent or vt. It is better to use 1515 /* don't want Expose on the parent or vt. It is better to use
1233 scr_touch or we get a great deal of flicker otherwise: */ 1516 scr_touch or we get a great deal of flicker otherwise: */
1234 XClearWindow (target->dpy, target->parent[0]); 1517 XClearWindow (target->dpy, target->parent[0]);
1235 1518
1236# if HAVE_SCROLLBARS 1519 if (target->scrollBar.state && target->scrollBar.win)
1237 if (target->scrollBar.win)
1238 { 1520 {
1239 target->scrollBar.setIdle (); 1521 target->scrollBar.state = STATE_IDLE;
1240 target->scrollbar_show (0); 1522 target->scrollBar.show (0);
1241 } 1523 }
1242# endif
1243 1524
1244 target->want_refresh = 1; 1525 target->want_refresh = 1;
1245 flags |= hasChanged; 1526 flags |= hasChanged;
1246 } 1527 }
1247} 1528}
1248 1529
1249#endif /* HAVE_BG_PIXMAP */ 1530#endif /* HAVE_BG_PIXMAP */
1250 1531
1251#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1532#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1252/* taken from aterm-0.4.2 */ 1533/* taken from aterm-0.4.2 */
1253 1534
1254typedef uint32_t RUINT32T; 1535typedef uint32_t RUINT32T;
1255 1536
1256static void 1537static void
1257ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1538ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1258{ 1539{
1259 int sh_r, sh_g, sh_b; 1540 int sh_r, sh_g, sh_b;
1260 RUINT32T mask_r, mask_g, mask_b; 1541 RUINT32T mask_r, mask_g, mask_b;
1261 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1542 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1262 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1543 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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