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.5 by sasha, Tue Sep 18 22:01:36 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 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
135 if (((flags & blurNeeded) && !(flags & blurServerSide)) 180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
136 || ((flags & tintNeeded) && !(flags & tintServerSide))) 183 if ((flags & tintNeeded) && !(flags & tintServerSide))
137 return true; 184 return true;
138 } 185 }
139# endif 186# endif
140 return false; 187 return false;
141} 188}
142 189
… …
177 224
178static inline int 225static inline int
179make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
180{ 227{
181 int diff = window_size - image_size; 228 int diff = window_size - image_size;
182 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
183 230
184 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
185 return diff * align / 100; 232 return diff * align / 100;
186 else if (align > 50 && align <= 100)
187 return window_size - image_size - diff * (100 - align) / 100;
188 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
189 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
190 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
191 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
192 return 0; 237 return 0;
193} 238}
194 239
195static inline int 240static inline int
196make_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)
197{ 242{
198 int src_pos = 0; 243 int src_pos = 0;
199 dst_pos = 0; 244 dst_pos = pos;
200 dst_size = size; 245 dst_size = size;
201 if (pos < 0 && size > target_size) 246 if (pos < 0)
202 { 247 {
203 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
204 dst_size += pos; 250 dst_size += pos;
205 } 251 }
206 else if (pos > 0)
207 dst_pos = pos;
208 252
209 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
210 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
211 return src_pos; 255 return src_pos;
212} 256}
… …
217 int geom_flags = 0, changed = 0; 261 int geom_flags = 0, changed = 0;
218 int x = 0, y = 0; 262 int x = 0, y = 0;
219 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
220 unsigned int n; 264 unsigned int n;
221 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
222 char *p; 266 const char *p;
223# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
224 268
225 if (geom == NULL) 269 if (geom == NULL)
226 return false; 270 return false;
227 271
228 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
… …
235 if (n < MAXLEN_GEOM) 279 if (n < MAXLEN_GEOM)
236 { 280 {
237 char *ops; 281 char *ops;
238 new_flags |= geometrySet; 282 new_flags |= geometrySet;
239 283
240 strncpy (str, geom, n); 284 memcpy (str, geom, n);
241 str[n] = '\0'; 285 str[n] = '\0';
242 if (str[0] == ':') 286 if (str[0] == ':')
243 ops = &str[0]; 287 ops = &str[0];
244 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 288 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
245 ops = &str[0]; 289 ops = &str[0];
… …
265 y = x; 309 y = x;
266 geom_flags |= YValue; 310 geom_flags |= YValue;
267 } 311 }
268 312
269 if (flags & geometrySet) 313 if (flags & geometrySet)
314 {
270 {/* new geometry is an adjustment to the old one ! */ 315 /* new geometry is an adjustment to the old one ! */
271 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 316 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
272 { 317 {
273 if (w == 0 && h != 0) 318 if (w == 0 && h != 0)
274 { 319 {
275 w = h_scale; 320 w = h_scale;
… …
291 } 336 }
292 } 337 }
293 else /* setting up geometry from scratch */ 338 else /* setting up geometry from scratch */
294 { 339 {
295 if (!(geom_flags & XValue)) 340 if (!(geom_flags & XValue))
341 {
296 {/* use default geometry - centered */ 342 /* use default geometry - centered */
297 x = y = defaultAlign; 343 x = y = defaultAlign;
298 } 344 }
299 else if (!(geom_flags & YValue)) 345 else if (!(geom_flags & YValue))
300 y = x; 346 y = x;
301 347
302 if ((geom_flags & (WidthValue|HeightValue)) == 0) 348 if ((geom_flags & (WidthValue|HeightValue)) == 0)
349 {
303 {/* use default geometry - scaled */ 350 /* use default geometry - scaled */
304 w = h = defaultScale; 351 w = h = defaultScale;
305 } 352 }
306 else if (geom_flags & WidthValue) 353 else if (geom_flags & WidthValue)
307 { 354 {
308 if (!(geom_flags & HeightValue)) 355 if (!(geom_flags & HeightValue))
… …
311 else 358 else
312 w = h; 359 w = h;
313 } 360 }
314 } /* done parsing geometry string */ 361 } /* done parsing geometry string */
315 else if (!(flags & geometrySet)) 362 else if (!(flags & geometrySet))
363 {
316 { /* default geometry - scaled and centered */ 364 /* default geometry - scaled and centered */
317 x = y = defaultAlign; 365 x = y = defaultAlign;
318 w = h = defaultScale; 366 w = h = defaultScale;
319 } 367 }
320 368
321 if (!(flags & geometrySet)) 369 if (!(flags & geometrySet))
322 geom_flags |= WidthValue|HeightValue|XValue|YValue; 370 geom_flags |= WidthValue|HeightValue|XValue|YValue;
323 371
324 if (ops) 372 if (ops)
325 { 373 {
326 while (*ops) 374 while (*ops)
327 { 375 {
328 while (*ops == ':' || isspace(*ops)) ++ops; 376 while (*ops == ':' || isspace(*ops)) ++ops;
377
329# 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)
330 if (CHECK_GEOM_OPS("tile")) 379 if (CHECK_GEOM_OPS ("tile"))
331 { 380 {
332 w = h = 0; 381 w = h = noScale;
333 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
334 } 383 }
335 else if (CHECK_GEOM_OPS("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
336 { 385 {
337 if (w == 0 && h == 0)
338 {
339 w = 100;
340 geom_flags |= WidthValue;
341 }
342 new_flags |= propScale; 386 new_flags |= propScale;
343 } 387 }
344 else if (CHECK_GEOM_OPS("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
345 { 389 {
346 if (w == 0) 390 if (w == 0) w = windowScale;
347 w = 100; 391
348 h = 0; 392 h = noScale;
349 geom_flags |= WidthValue|HeightValue; 393 geom_flags |= WidthValue|HeightValue;
350 } 394 }
351 else if (CHECK_GEOM_OPS("vscale")) 395 else if (CHECK_GEOM_OPS ("vscale"))
352 { 396 {
353 if (h == 0) 397 if (h == 0) h = windowScale;
354 h = 100; 398
355 w = 0; 399 w = noScale;
356 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
357 } 401 }
358 else if (CHECK_GEOM_OPS("scale")) 402 else if (CHECK_GEOM_OPS ("scale"))
359 { 403 {
360 if (h == 0) 404 if (h == 0) h = windowScale;
361 h = 100;
362 if (w == 0) 405 if (w == 0) w = windowScale;
363 w = 100; 406
364 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
365 } 408 }
366 else if (CHECK_GEOM_OPS("auto")) 409 else if (CHECK_GEOM_OPS ("auto"))
367 { 410 {
368 w = h = 100; 411 w = h = windowScale;
369 x = y = 50; 412 x = y = centerAlign;
370 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
371 } 414 }
415 else if (CHECK_GEOM_OPS ("root"))
416 {
417 new_flags |= rootAlign;
418 w = h = noScale;
419 geom_flags |= WidthValue|HeightValue;
420 }
372# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
422
373 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
374 } /* done parsing ops */ 424 } /* done parsing ops */
375 } 425 }
376 426
377 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 427 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)) 428 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)) 429 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)) 430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
384 ++changed;
385 } 431 }
386 432
387 if (new_flags != flags) 433 if (new_flags != flags)
388 { 434 {
389 flags = new_flags; 435 flags = new_flags;
390 changed++; 436 changed++;
391 } 437 }
438
392//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
393// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
394 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;
395} 480}
396 481
397# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
398bool 483bool
399bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 484bgPixmap_t::render_image (unsigned long background_flags)
400{ 485{
401 if (target == NULL) 486 if (target == NULL)
402 return false; 487 return false;
403 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
404 int target_width = (int)target->szHint.width; 528 int target_width = target->szHint.width;
405 int target_height = (int)target->szHint.height; 529 int target_height = target->szHint.height;
406 int new_pmap_width = target_width, new_pmap_height = target_height; 530 int new_pmap_width = target_width;
407 ASImage *result = NULL; 531 int new_pmap_height = target_height;
408 532
409 int x = 0; 533 int x = 0;
410 int y = 0; 534 int y = 0;
411 int w = h_scale * target_width / 100; 535 int w = 0;
412 int h = v_scale * target_height / 100; 536 int h = 0;
413 537
414 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
415 539
416 if (original_asim) 540 if (original_asim)
417 { 541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
418 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
419 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
420 }
421 542
422 if (original_asim == NULL 543 if (!original_asim
544 || (!(flags & rootAlign)
423 || x >= target_width 545 && (x >= target_width
424 || y >= target_height 546 || y >= target_height
425 || (w > 0 && x + w <= 0) 547 || (w > 0 && x + w <= 0)
426 || (h > 0 && y + h <= 0)) 548 || (h > 0 && y + h <= 0))))
427 { 549 {
428 if (background) 550 if (background)
429 { 551 {
430 new_pmap_width = background->width; 552 new_pmap_width = background->width;
431 new_pmap_height = background->height; 553 new_pmap_height = background->height;
432 result = background; 554 result = background;
555
433 if (background_tint != TINT_LEAVE_SAME) 556 if (background_tint != TINT_LEAVE_SAME)
434 { 557 {
435 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 558 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
436 target_width, target_height, background_tint, 559 target_width, target_height, background_tint,
437 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 560 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
438 if (tmp) 561 if (tmp)
439 result = tmp; 562 result = tmp;
440 } 563 }
… …
443 new_pmap_width = new_pmap_height = 0; 566 new_pmap_width = new_pmap_height = 0;
444 } 567 }
445 else 568 else
446 { 569 {
447 result = original_asim; 570 result = original_asim;
571
448 if ((w > 0 && w != original_asim->width) 572 if ((w > 0 && w != original_asim->width)
449 || (h > 0 && h != original_asim->height)) 573 || (h > 0 && h != original_asim->height))
450 { 574 {
451 result = scale_asimage (target->asv, original_asim, 575 result = scale_asimage (target->asv, original_asim,
452 w > 0 ? w : original_asim->width, 576 w > 0 ? w : original_asim->width,
453 h > 0 ? h : original_asim->height, 577 h > 0 ? h : original_asim->height,
454 background ? ASA_ASImage : ASA_XImage, 578 background ? ASA_ASImage : ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 579 100, ASIMAGE_QUALITY_DEFAULT);
456 } 580 }
581
457 if (background == NULL) 582 if (background == NULL)
458 {/* if tiling - pixmap has to be sized exactly as the image */ 583 {
459 if (h_scale == 0)
460 new_pmap_width = result->width;
461 if (v_scale == 0)
462 new_pmap_height = result->height;
463 /* we also need to tile our image in one or both directions */
464 if (h_scale == 0 || v_scale == 0) 584 if (h_scale == 0 || v_scale == 0)
465 { 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 */
466 ASImage *tmp = tile_asimage (target->asv, result, 592 ASImage *tmp = tile_asimage (target->asv, result,
467 (h_scale > 0) ? 0 : (int)result->width - x, 593 (int)result->width - x,
468 (v_scale > 0) ? 0 : (int)result->height - y, 594 (int)result->height - y,
595 new_pmap_width,
469 result->width, result->height, 596 new_pmap_height,
470 TINT_LEAVE_SAME, ASA_XImage, 597 TINT_LEAVE_SAME, ASA_XImage,
471 100, ASIMAGE_QUALITY_DEFAULT); 598 100, ASIMAGE_QUALITY_DEFAULT);
472 if (tmp) 599 if (tmp)
473 { 600 {
474 if (result != original_asim) 601 if (result != original_asim)
475 destroy_asimage (&result); 602 destroy_asimage (&result);
603
476 result = tmp; 604 result = tmp;
477 } 605 }
478 } 606 }
479 } 607 }
480 else 608 else
609 {
481 {/* 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 */
482 ASImageLayer *layers = create_image_layers (2); 611 ASImageLayer *layers = create_image_layers (2);
483 ASImage *merged_im = NULL;
484 612
485 layers[0].im = background; 613 layers[0].im = background;
486 layers[0].clip_width = target_width; 614 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 615 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 616 layers[0].tint = background_tint;
489 layers[1].im = result; 617 layers[1].im = result;
618
490 if (w <= 0) 619 if (w <= 0)
620 {
491 {/* tile horizontally */ 621 /* tile horizontally */
492 while (x > 0) x -= (int)result->width; 622 while (x > 0) x -= (int)result->width;
493 layers[1].dst_x = x; 623 layers[1].dst_x = x;
494 layers[1].clip_width = result->width+target_width; 624 layers[1].clip_width = result->width+target_width;
495 } 625 }
496 else 626 else
627 {
497 {/* clip horizontally */ 628 /* clip horizontally */
498 layers[1].dst_x = x; 629 layers[1].dst_x = x;
499 layers[1].clip_width = result->width; 630 layers[1].clip_width = result->width;
500 } 631 }
632
501 if (h <= 0) 633 if (h <= 0)
502 { 634 {
503 while (y > 0) y -= (int)result->height; 635 while (y > 0) y -= (int)result->height;
504 layers[1].dst_y = y; 636 layers[1].dst_y = y;
505 layers[1].clip_height = result->height + target_height; 637 layers[1].clip_height = result->height + target_height;
… …
507 else 639 else
508 { 640 {
509 layers[1].dst_y = y; 641 layers[1].dst_y = y;
510 layers[1].clip_height = result->height; 642 layers[1].clip_height = result->height;
511 } 643 }
644
512 if (target->rs[Rs_blendtype]) 645 if (target->rs[Rs_blendtype])
513 { 646 {
514 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 647 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
515 if (layers[1].merge_scanlines == NULL) 648 if (layers[1].merge_scanlines == NULL)
516 layers[1].merge_scanlines = alphablend_scanlines; 649 layers[1].merge_scanlines = alphablend_scanlines;
517 } 650 }
651
518 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,
519 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 653 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
654
520 if (tmp) 655 if (tmp)
521 { 656 {
522 if (result != original_asim) 657 if (result != original_asim)
523 destroy_asimage (&result); 658 destroy_asimage (&result);
659
524 result = tmp; 660 result = tmp;
525 } 661 }
662
526 free (layers); 663 free (layers);
527 } 664 }
528 } 665 }
529 TIMING_TEST_PRINT_RESULT (asim); 666 TIMING_TEST_PRINT_RESULT (asim);
530 667
531 if (pixmap) 668 bool ret = false;
532 {
533 if (result == NULL
534 || pmap_width != new_pmap_width
535 || pmap_height != new_pmap_height
536 || pmap_depth != target->depth)
537 {
538 XFreePixmap (target->dpy, pixmap);
539 pixmap = None;
540 }
541 }
542 669
543 if (result) 670 if (result)
544 { 671 {
545 XGCValues gcv; 672 XGCValues gcv;
546 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 }
547 685
548 /* create Pixmap */ 686 /* create Pixmap */
549 if (pixmap == None) 687 if (pixmap == None)
550 { 688 {
551 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);
552 pmap_width = new_pmap_width; 690 pmap_width = new_pmap_width;
553 pmap_height = new_pmap_height; 691 pmap_height = new_pmap_height;
554 pmap_depth = target->depth; 692 pmap_depth = target->depth;
555 } 693 }
556 /* fill with background color ( if result's not completely overlapping it)*/ 694 /* fill with background color (if result's not completely overlapping it) */
557 gcv.foreground = target->pix_colors[Color_bg]; 695 gcv.foreground = target->pix_colors[Color_bg];
558 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 696 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
559 697
560 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;
561 int dst_width = result->width, dst_height = result->height; 699 int dst_width = result->width, dst_height = result->height;
562 if (background == NULL) 700 if (background == NULL)
563 { 701 {
564 if (h_scale > 0) 702 if (!(h_scale == 0 || v_scale == 0))
703 {
565 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 );
566 if (v_scale > 0)
567 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 }
568 707
569 if (dst_x > 0 || dst_y > 0 708 if (dst_x > 0 || dst_y > 0
570 || dst_x + dst_width < new_pmap_width 709 || dst_x + dst_width < new_pmap_width
571 || dst_y + dst_height < new_pmap_height) 710 || dst_y + dst_height < new_pmap_height)
572 {
573 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);
574 }
575 } 712 }
576 713
577 /* put result on pixmap */ 714 /* put result on pixmap */
578 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 715 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); 716 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
580 717
581 if (result != background && result != original_asim) 718 if (result != background && result != original_asim)
582 destroy_asimage (&result); 719 destroy_asimage (&result);
583 720
584 XFreeGC (target->dpy, gc); 721 XFreeGC (target->dpy, gc);
585 TIMING_TEST_PRINT_RESULT (asim); 722 TIMING_TEST_PRINT_RESULT (asim);
586 }
587 723
724 ret = true;
725 }
726
727 if (background)
728 destroy_asimage (&background);
729
588 return true; 730 return ret;
589} 731}
590# 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 */
591 873
592bool 874bool
593bgPixmap_t::set_file (const char *file) 875bgPixmap_t::set_file (const char *file)
594{ 876{
595 char *f;
596
597 assert (file != NULL); 877 assert (file);
598 878
599 if (*file != '\0') 879 if (*file)
600 { 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
601# ifdef HAVE_AFTERIMAGE 890# ifdef HAVE_AFTERIMAGE
602 if (target->asimman == NULL) 891 if (!target->asimman)
603 target->asimman = create_generic_imageman (target->rs[Rs_path]); 892 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); 893 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
606 else 894 if (original_asim)
607 { 895 have_image = true;
608 size_t len = f - file; 896 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 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
617 } 905 }
906
618 return false; 907 return false;
619} 908}
620 909
621# endif /* BG_IMAGE_FROM_FILE */ 910# endif /* BG_IMAGE_FROM_FILE */
622 911
623# ifdef ENABLE_TRANSPARENCY 912# ifdef ENABLE_TRANSPARENCY
624bool 913bool
625bgPixmap_t::set_transparent () 914bgPixmap_t::set_transparent ()
626{ 915{
627 if (!(flags & isTransparent)) 916 if (!(flags & isTransparent))
628 { 917 {
629 flags |= isTransparent; 918 flags |= isTransparent;
630 return true; 919 return true;
631 } 920 }
921
632 return false; 922 return false;
633} 923}
634 924
635bool 925bool
636bgPixmap_t::set_blur_radius (const char *geom) 926bgPixmap_t::set_blur_radius (const char *geom)
… …
638 int changed = 0; 928 int changed = 0;
639 unsigned int hr, vr; 929 unsigned int hr, vr;
640 int junk; 930 int junk;
641 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 931 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
642 932
643 if (!(geom_flags&WidthValue)) 933 if (!(geom_flags & WidthValue))
644 hr = 1; 934 hr = 1;
645 if (!(geom_flags&HeightValue)) 935 if (!(geom_flags & HeightValue))
646 vr = hr; 936 vr = hr;
647 937
648 if (h_blurRadius != hr) 938 if (h_blurRadius != hr)
649 { 939 {
650 ++changed; 940 ++changed;
… …
654 if (v_blurRadius != vr) 944 if (v_blurRadius != vr)
655 { 945 {
656 ++changed; 946 ++changed;
657 v_blurRadius = vr; 947 v_blurRadius = vr;
658 } 948 }
659 949
660 if (v_blurRadius == 0 && h_blurRadius == 0) 950 if (v_blurRadius == 0 && h_blurRadius == 0)
661 flags &= ~blurNeeded; 951 flags &= ~blurNeeded;
662 else 952 else
663 flags |= blurNeeded; 953 flags |= blurNeeded;
664 954
665 return (changed>0); 955 return (changed > 0);
666} 956}
667 957
668static inline unsigned long 958static inline unsigned long
669compute_tint_shade_flags (rxvt_color *tint, int shade) 959compute_tint_shade_flags (rxvt_color *tint, int shade)
670{ 960{
… …
687 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
688 else if (tint) 978 else if (tint)
689 { 979 {
690 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 980 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
691 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 981 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
692 { 982 {
693 flags |= bgPixmap_t::tintNeeded; 983 flags |= bgPixmap_t::tintNeeded;
694 } 984 }
695 }
696 985 }
986
697 if (flags & bgPixmap_t::tintNeeded) 987 if (flags & bgPixmap_t::tintNeeded)
698 { 988 {
699 if (flags & bgPixmap_t::tintWholesome) 989 if (flags & bgPixmap_t::tintWholesome)
700 flags |= bgPixmap_t::tintServerSide; 990 flags |= bgPixmap_t::tintServerSide;
701 else 991 else
… …
717 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1007 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
718 tint = new_tint; 1008 tint = new_tint;
719 flags = (flags & ~tintFlags) | new_flags | tintSet; 1009 flags = (flags & ~tintFlags) | new_flags | tintSet;
720 return true; 1010 return true;
721 } 1011 }
1012
722 return false; 1013 return false;
723} 1014}
724 1015
725bool 1016bool
726bgPixmap_t::unset_tint () 1017bgPixmap_t::unset_tint ()
727{ 1018{
728 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1019 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
729 1020
730 if (new_flags != (flags & tintFlags)) 1021 if (new_flags != (flags & tintFlags))
731 { 1022 {
732 flags = (flags&~tintFlags)|new_flags; 1023 flags = (flags & ~tintFlags) | new_flags;
733 return true; 1024 return true;
734 } 1025 }
1026
735 return false; 1027 return false;
736} 1028}
737 1029
738bool 1030bool
739bgPixmap_t::set_shade (const char *shade_str) 1031bgPixmap_t::set_shade (const char *shade_str)
740{ 1032{
741 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1033 int new_shade = (shade_str) ? atoi (shade_str) : 0;
742 1034
1035 if (new_shade < 0 && new_shade > -100)
1036 new_shade = 200 - (100 + new_shade);
743 if (new_shade == 100) 1037 else if (new_shade == 100)
744 new_shade = 0; 1038 new_shade = 0;
745 1039
746 if (new_shade != shade) 1040 if (new_shade != shade)
747 { 1041 {
748 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);
749 shade = new_shade; 1043 shade = new_shade;
750 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1044 flags = (flags & (~tintFlags | tintSet)) | new_flags;
751 return true; 1045 return true;
752 } 1046 }
1047
753 return false; 1048 return false;
754} 1049}
755 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
756/* make_transparency_pixmap() 1162/* make_transparency_pixmap()
757 * 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
758 * 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
759 * our window. 1165 * our window.
760 */ 1166 */
761unsigned long 1167unsigned long
762bgPixmap_t::make_transparency_pixmap () 1168bgPixmap_t::make_transparency_pixmap ()
763{ 1169{
764 unsigned long result = 0; 1170 unsigned long result = 0;
765 1171
766 if (target == NULL) 1172 if (target == NULL)
767 return 0; 1173 return 0;
768 1174
769 /* 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
770 * be always up-to-date, so let's use it : 1176 * be always up-to-date, so let's use it :
771 */ 1177 */
772 Window root = target->display->root; 1178 Window root = target->display->root;
773 int screen = target->display->screen; 1179 int screen = target->display->screen;
774 Display *dpy = target->dpy; 1180 Display *dpy = target->dpy;
… …
787 if (sx + window_width <= 0 || sy + window_height <= 0 1193 if (sx + window_width <= 0 || sy + window_height <= 0
788 || sx >= root_width || sy >= root_height) 1194 || sx >= root_width || sy >= root_height)
789 return 0; 1195 return 0;
790 1196
791 if (root_pixmap != None) 1197 if (root_pixmap != None)
1198 {
792 {/* 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 : */
793 int junk; 1200 int junk;
794 unsigned int ujunk; 1201 unsigned int ujunk;
795 /* root pixmap may be bad - allow a error */ 1202 /* root pixmap may be bad - allow a error */
796 target->allowedxerror = -1; 1203 target->allowedxerror = -1;
797 1204
… …
806 1213
807 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1214 if (tiled_root_pmap == None) /* something really bad happened - abort */
808 return 0; 1215 return 0;
809 1216
810 if (root_pixmap == None) 1217 if (root_pixmap == None)
1218 {
811 { /* use tricks to obtain the root background image :*/ 1219 /* use tricks to obtain the root background image :*/
812 /* we want to create Overrideredirect window overlapping out window 1220 /* we want to create Overrideredirect window overlapping out window
813 with background type of Parent Relative and then grab it */ 1221 with background type of Parent Relative and then grab it */
814 XSetWindowAttributes attr; 1222 XSetWindowAttributes attr;
815 Window src; 1223 Window src;
816 bool success = false; 1224 bool success = false;
817 1225
818 attr.background_pixmap = ParentRelative; 1226 attr.background_pixmap = ParentRelative;
819 attr.backing_store = Always; 1227 attr.backing_store = Always;
820 attr.event_mask = ExposureMask; 1228 attr.event_mask = ExposureMask;
821 attr.override_redirect = True; 1229 attr.override_redirect = True;
822 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1230 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
823 CopyFromParent, CopyFromParent, CopyFromParent, 1231 CopyFromParent, CopyFromParent, CopyFromParent,
824 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1232 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
825 &attr); 1233 &attr);
826 1234
827 if (src != None) 1235 if (src != None)
… …
831 XGrabServer (dpy); 1239 XGrabServer (dpy);
832 XMapRaised (dpy, src); 1240 XMapRaised (dpy, src);
833 XSync (dpy, False); 1241 XSync (dpy, False);
834 1242
835 /* XSync should get window where it's properly exposed, 1243 /* 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 : */ 1244 * but to be on the safe side - let's check for the actual event to arrive : */
837 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1245 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
838 ++ev_count; 1246 ++ev_count;
839 1247
840 if (ev_count > 0); 1248 if (ev_count > 0);
1249 {
841 { /* hooray! - we can grab the image! */ 1250 /* hooray! - we can grab the image! */
842 gc = XCreateGC (dpy, root, 0, NULL); 1251 gc = XCreateGC (dpy, root, 0, NULL);
843 if (gc) 1252 if (gc)
844 { 1253 {
845 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);
846 success = true; 1255 success = true;
847 } 1256 }
848 } 1257 }
1258
849 XDestroyWindow (dpy, src); 1259 XDestroyWindow (dpy, src);
850 XUngrabServer (dpy); 1260 XUngrabServer (dpy);
851 //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);
852 } 1262 }
853 1263
854 if (!success) 1264 if (!success)
855 { 1265 {
856 XFreePixmap (dpy, tiled_root_pmap); 1266 XFreePixmap (dpy, tiled_root_pmap);
857 tiled_root_pmap = None; 1267 tiled_root_pmap = None;
858 } 1268 }
859 else 1269 else
860 result |= transpPmapTiled; 1270 result |= transpPmapTiled;
861 } 1271 }
862 else 1272 else
1273 {
863 {/* strightforward pixmap copy */ 1274 /* straightforward pixmap copy */
864 gcv.tile = root_pixmap; 1275 gcv.tile = root_pixmap;
865 gcv.fill_style = FillTiled; 1276 gcv.fill_style = FillTiled;
866 1277
867 while (sx < 0) sx += (int)window_width; 1278 while (sx < 0) sx += (int)root_width;
868 while (sy < 0) sy += (int)window_height; 1279 while (sy < 0) sy += (int)root_height;
869 1280
870 gcv.ts_x_origin = -sx; 1281 gcv.ts_x_origin = -sx;
871 gcv.ts_y_origin = -sy; 1282 gcv.ts_y_origin = -sy;
872 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1283 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
873 1284
… …
879 } 1290 }
880 TIMING_TEST_PRINT_RESULT (tp); 1291 TIMING_TEST_PRINT_RESULT (tp);
881 1292
882 if (tiled_root_pmap != None) 1293 if (tiled_root_pmap != None)
883 { 1294 {
884 if (!need_client_side_rendering ()) 1295 if (!need_client_side_rendering ())
885 { 1296 {
886 if ((flags & tintNeeded)) 1297 if ((flags & tintNeeded))
887 {
888 if (flags & tintWholesome)
889 { 1298 {
890 /* In this case we can tint image server-side getting significant 1299 if (tint_pixmap (tiled_root_pmap))
891 * performance improvements, as we eliminate XImage transfer
892 */
893 gcv.foreground = Pixel (tint);
894 gcv.function = GXand;
895 gcv.fill_style = FillSolid;
896 if (gc)
897 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
898 else
899 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
900 if (gc)
901 {
902 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
903 result |= transpPmapTinted; 1300 result |= transpPmapTinted;
904 }
905 }
906 else
907 {
908# if XFT
909 Picture back_pic = 0;
910 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
911
912 if (flags & tintSet)
913 tint.get (c);
914
915 if (shade > 0 && shade < 100)
916 {
917 c.r = (c.r * shade) / 100;
918 c.g = (c.g * shade) / 100;
919 c.b = (c.b * shade) / 100;
920 }
921 else if( shade > 100 && shade < 200)
922 {
923 c.r = (c.r * (200 - shade)) / 100;
924 c.g = (c.g * (200 - shade)) / 100;
925 c.b = (c.b * (200 - shade)) / 100;
926 }
927
928 XRenderPictFormat pf;
929 pf.type = PictTypeDirect;
930 pf.depth = 32;
931 pf.direct.redMask = 0xff;
932 pf.direct.greenMask = 0xff;
933 pf.direct.blueMask = 0xff;
934 pf.direct.alphaMask = 0xff;
935
936 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
937 (PictFormatType|
938 PictFormatDepth|
939 PictFormatRedMask|
940 PictFormatGreenMask|
941 PictFormatBlueMask|
942 PictFormatAlphaMask),
943 &pf,
944 0);
945 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
946 XRenderPictureAttributes pa ;
947
948 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
949
950 pa.repeat = True;
951
952 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
953 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
954 XFreePixmap (dpy, overlay_pmap);
955
956 pa.component_alpha = True;
957 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
958 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
959 XFreePixmap (dpy, mask_pmap);
960
961 if (mask_pic && overlay_pic && back_pic)
962 {
963 XRenderColor mask_c;
964
965 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
966 mask_c.alpha = 0xffff;
967 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
968
969 mask_c.alpha = 0;
970 mask_c.red = 0xffff - c.r;
971 mask_c.green = 0xffff - c.g;
972 mask_c.blue = 0xffff - c.b;
973 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);
975 result |= transpPmapTinted;
976 }
977 XRenderFreePicture (dpy, mask_pic);
978 XRenderFreePicture (dpy, overlay_pic);
979 XRenderFreePicture (dpy, back_pic);
980# if DO_TIMING_TEST
981 XSync (dpy, False);
982# endif
983# endif
984 }
985 } 1301 }
986 } /* server side rendering completed */ 1302 } /* server side rendering completed */
987 1303
988 if (pixmap) 1304 if (pixmap)
989 XFreePixmap (dpy, pixmap); 1305 XFreePixmap (dpy, pixmap);
990 1306
991 pixmap = tiled_root_pmap; 1307 pixmap = tiled_root_pmap;
992 pmap_width = window_width; 1308 pmap_width = window_width;
993 pmap_height = window_height; 1309 pmap_height = window_height;
994 pmap_depth = root_depth; 1310 pmap_depth = root_depth;
995 } 1311 }
996 1312
997 if (gc) 1313 if (gc)
998 XFreeGC (dpy, gc); 1314 XFreeGC (dpy, gc);
999 1315
1000 TIMING_TEST_PRINT_RESULT (tp); 1316 TIMING_TEST_PRINT_RESULT (tp);
1001 1317
1002 return result; 1318 return result;
1003} 1319}
1004 1320
1005bool 1321bool
1006bgPixmap_t::set_root_pixmap () 1322bgPixmap_t::set_root_pixmap ()
1007{ 1323{
1008 Pixmap new_root_pixmap = None;
1009
1010 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1324 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1011 if (new_root_pixmap == None) 1325 if (new_root_pixmap == None)
1012 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1326 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1013 1327
1014 if (new_root_pixmap != root_pixmap) 1328 if (new_root_pixmap != root_pixmap)
1015 { 1329 {
1016 root_pixmap = new_root_pixmap; 1330 root_pixmap = new_root_pixmap;
1017 return true; 1331 return true;
1018 } 1332 }
1333
1019 return false; 1334 return false;
1020} 1335}
1021# endif /* ENABLE_TRANSPARENCY */ 1336# endif /* ENABLE_TRANSPARENCY */
1022 1337
1023# ifndef HAVE_AFTERIMAGE 1338# ifndef HAVE_AFTERIMAGE
1024static 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);
1025# endif 1340# endif
1026
1027 1341
1028bool 1342bool
1029bgPixmap_t::render () 1343bgPixmap_t::render ()
1030{ 1344{
1031 unsigned long background_flags = 0; 1345 unsigned long background_flags = 0;
… …
1033 if (target == NULL) 1347 if (target == NULL)
1034 return false; 1348 return false;
1035 1349
1036 TIMING_TEST_START (tp); 1350 TIMING_TEST_START (tp);
1037 1351
1038 invalidate(); 1352 invalidate ();
1039# ifdef ENABLE_TRANSPARENCY 1353# ifdef ENABLE_TRANSPARENCY
1040 if (flags & isTransparent) 1354 if (flags & isTransparent)
1041 { 1355 {
1042 /* we need to re-generate transparency pixmap in that case ! */ 1356 /* we need to re-generate transparency pixmap in that case ! */
1043 background_flags = make_transparency_pixmap (); 1357 background_flags = make_transparency_pixmap ();
1044 if (background_flags == 0) 1358 if (background_flags == 0)
1045 return false; 1359 return false;
1046 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1360 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1047 && pmap_depth == target->depth) 1361 && pmap_depth == target->depth)
1048 flags = flags & ~isInvalid; 1362 flags = flags & ~isInvalid;
1049 } 1363 }
1050# endif 1364# endif
1051 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
1052 XImage *result = NULL; 1375 XImage *result = NULL;
1053# ifdef HAVE_AFTERIMAGE 1376
1054 if (original_asim 1377 if (background_flags && (flags & isInvalid))
1055 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1378 {
1379 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1056 { 1380 }
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 1381
1062# 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 !!! */
1063 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 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))
1091 flags = flags & ~isInvalid;
1092 if (background)
1093 destroy_asimage (&background);
1094 }
1095 else if (background_flags && pmap_depth != target->depth)
1096 {
1097 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1098 }
1099# else /* our own client-side tinting */
1100 if (background_flags && (flags & isInvalid))
1101 {
1102 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1103 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1104 { 1389 {
1105 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1106 if (flags & tintSet) 1391 if (flags & tintSet)
1107 tint.get (c); 1392 tint.get (c);
1108 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1393 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1109 } 1394 }
1110 } 1395# endif
1111# endif /* HAVE_AFTERIMAGE */
1112 1396
1113 if (result != NULL)
1114 {
1115 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1397 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1398
1116 if (gc) 1399 if (gc)
1117 { 1400 {
1118 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1401 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1119 { 1402 {
1120 XFreePixmap (target->dpy, pixmap); 1403 XFreePixmap (target->dpy, pixmap);
1121 pixmap = None; 1404 pixmap = None;
1122 } 1405 }
1406
1123 if (pixmap == None) 1407 if (pixmap == None)
1124 { 1408 {
1125 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);
1126 pmap_width = result->width; 1410 pmap_width = result->width;
1127 pmap_height = result->height; 1411 pmap_height = result->height;
1128 pmap_depth = target->depth; 1412 pmap_depth = target->depth;
1129 } 1413 }
1414
1130 if (pmap_depth != result->depth) 1415 if (pmap_depth != result->depth)
1416 {
1131 { /* Bad Match error will ensue ! stupid X !!!! */ 1417 /* Bad Match error will ensue ! stupid X !!!! */
1132 if( result->depth == 24 && pmap_depth == 32) 1418 if (result->depth == 24 && pmap_depth == 32)
1133 result->depth = 32; 1419 result->depth = 32;
1134 else if( result->depth == 32 && pmap_depth == 24) 1420 else if (result->depth == 32 && pmap_depth == 24)
1135 result->depth = 24; 1421 result->depth = 24;
1136 else 1422 else
1137 { 1423 {
1138 /* TODO: implement image recoding */ 1424 /* TODO: implement image recoding */
1139 } 1425 }
1140 } 1426 }
1427
1141 if (pmap_depth == result->depth) 1428 if (pmap_depth == result->depth)
1142 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
1143 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1144 flags = flags & ~isInvalid; 1432 flags = flags & ~isInvalid;
1145 } 1433 }
1434
1146 XDestroyImage (result); 1435 XDestroyImage (result);
1147 } 1436 }
1148 1437
1149 if (flags & isInvalid) 1438 if (flags & isInvalid)
1150 { 1439 {
1151 if (pixmap != None) 1440 if (pixmap != None)
… …
1155 } 1444 }
1156 } 1445 }
1157 1446
1158 apply (); 1447 apply ();
1159 1448
1449 XSync (target->dpy, False);
1450 valid_since = ev::now ();
1451
1160 TIMING_TEST_PRINT_RESULT (tp); 1452 TIMING_TEST_PRINT_RESULT (tp);
1161 1453
1162 return true; 1454 return true;
1163} 1455}
1164 1456
1165bool 1457bool
1166bgPixmap_t::set_target (rxvt_term *new_target) 1458bgPixmap_t::set_target (rxvt_term *new_target)
1167{ 1459{
1168 if (new_target) 1460 if (new_target)
1169 if (target != new_target) 1461 if (target != new_target)
1170 { 1462 {
… …
1172# ifdef ENABLE_TRANSPARENCY 1464# ifdef ENABLE_TRANSPARENCY
1173 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1465 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1174# endif 1466# endif
1175 return true; 1467 return true;
1176 } 1468 }
1469
1177 return false; 1470 return false;
1178} 1471}
1179 1472
1180void 1473void
1181bgPixmap_t::apply() 1474bgPixmap_t::apply ()
1182{ 1475{
1183 if (target) 1476 if (target)
1184 { 1477 {
1185 flags &= ~isVtOrigin; 1478 flags &= ~isVtOrigin;
1479
1186 if (pixmap != None) 1480 if (pixmap != None)
1481 {
1187 { /* set target's background to pixmap */ 1482 /* set target's background to pixmap */
1188# ifdef ENABLE_TRANSPARENCY 1483# ifdef ENABLE_TRANSPARENCY
1189 if (flags & isTransparent) 1484 if (flags & isTransparent)
1190 { 1485 {
1191 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1486 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1192 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1193# if HAVE_SCROLLBARS 1488
1194 if (target->scrollBar.win) 1489 if (target->scrollBar.win)
1195 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1490 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1196# endif
1197 } 1491 }
1198 else 1492 else
1199# endif 1493# endif
1200 { 1494 {
1201 flags |= isVtOrigin; 1495 flags |= isVtOrigin;
1202 /* force old pixmap dereference in case it was transparent before :*/ 1496 /* force old pixmap dereference in case it was transparent before :*/
1203 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1204 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1498 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1205 /* do we also need to set scrollbar's background here ? */ 1499 /* do we also need to set scrollbar's background here ? */
1206# if HAVE_SCROLLBARS 1500
1207 if (target->scrollBar.win) 1501 if (target->scrollBar.win)
1208 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1502 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1209# endif
1210 } 1503 }
1211 } 1504 }
1212 else 1505 else
1506 {
1213 { /* set target background to a pixel */ 1507 /* set target background to a pixel */
1214 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1508 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1215 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1509 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1216 /* do we also need to set scrollbar's background here ? */ 1510 /* do we also need to set scrollbar's background here ? */
1217# if HAVE_SCROLLBARS
1218 if (target->scrollBar.win) 1511 if (target->scrollBar.win)
1219 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1512 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1220# endif
1221 } 1513 }
1514
1222 /* 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
1223 scr_touch or we get a great deal of flicker otherwise: */ 1516 scr_touch or we get a great deal of flicker otherwise: */
1224 XClearWindow (target->dpy, target->parent[0]); 1517 XClearWindow (target->dpy, target->parent[0]);
1225 1518
1226# if HAVE_SCROLLBARS 1519 if (target->scrollBar.state && target->scrollBar.win)
1227 if (target->scrollBar.win)
1228 { 1520 {
1229 target->scrollBar.setIdle (); 1521 target->scrollBar.state = STATE_IDLE;
1230 target->scrollbar_show (0); 1522 target->scrollBar.show (0);
1231 } 1523 }
1232# endif
1233 1524
1234 target->want_refresh = 1; 1525 target->want_refresh = 1;
1235 flags |= hasChanged; 1526 flags |= hasChanged;
1236 } 1527 }
1237} 1528}
1238 1529
1239#endif /* HAVE_BG_PIXMAP */ 1530#endif /* HAVE_BG_PIXMAP */
1240 1531
1241#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1532#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1242/* taken from aterm-0.4.2 */ 1533/* taken from aterm-0.4.2 */
1243 1534
1244typedef uint32_t RUINT32T; 1535typedef uint32_t RUINT32T;
1245 1536
1246static void 1537static void
1247ShadeXImage(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)
1248{ 1539{
1249 int sh_r, sh_g, sh_b; 1540 int sh_r, sh_g, sh_b;
1250 RUINT32T mask_r, mask_g, mask_b; 1541 RUINT32T mask_r, mask_g, mask_b;
1251 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1542 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1252 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