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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.3 by sasha, Wed Sep 12 22:12:54 2007 UTC vs.
Revision 1.73 by sf-exg, Sat Oct 9 14:58:15 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xmp.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
38 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
40 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
41 43
42#else 44#else
43#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
44#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
45#endif 47#endif
46 48
47/* 49/*
48 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
49 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
50 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
51 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
52 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
53 * affects on the background image : 55 * effects on the background image :
54 * 56 *
55 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
56 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
57 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
58 * the image in the window. 60 * the image in the window.
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 (!w) w = image_width;
464 if (!h) h = image_height;
465
466 if (flags & rootAlign)
467 {
468 target->get_window_origin (x, y);
469 x = -x;
470 y = -y;
471 }
472 else
473 {
474 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || w > target_width || h > target_height)
482 flags |= sizeSensitive;
395} 483}
396 484
397# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
398bool 486bool
399bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 487bgPixmap_t::render_image (unsigned long background_flags)
400{ 488{
401 if (target == NULL) 489 if (target == NULL)
402 return false; 490 return false;
403 491
492 target->init_asv ();
493
494 ASImage *background = NULL;
495 ARGB32 background_tint = TINT_LEAVE_SAME;
496
497# ifdef ENABLE_TRANSPARENCY
498 if (background_flags)
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 {
503 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade;
505
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet)
508 tint.get (c);
509 as_shade.tintColor.red = c.r;
510 as_shade.tintColor.green = c.g;
511 as_shade.tintColor.blue = c.b;
512
513 background_tint = shading2tint32 (&as_shade);
514 }
515
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
517 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp)
522 {
523 destroy_asimage (&background);
524 background = tmp;
525 }
526 }
527# endif
528
529 ASImage *result = 0;
530
404 int target_width = (int)target->szHint.width; 531 int target_width = target->szHint.width;
405 int target_height = (int)target->szHint.height; 532 int target_height = target->szHint.height;
406 int new_pmap_width = target_width, new_pmap_height = target_height; 533 int new_pmap_width = target_width;
407 ASImage *result = NULL; 534 int new_pmap_height = target_height;
408 535
409 int x = 0; 536 int x = 0;
410 int y = 0; 537 int y = 0;
411 int w = h_scale * target_width / 100; 538 int w = 0;
412 int h = v_scale * target_height / 100; 539 int h = 0;
413 540
414 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
415 542
416 if (original_asim) 543 if (original_asim)
417 { 544 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 545
422 if (original_asim == NULL 546 if (!original_asim
547 || (!(flags & rootAlign)
423 || x >= target_width 548 && (x >= target_width
424 || y >= target_height 549 || y >= target_height
425 || (w > 0 && x + w <= 0) 550 || (x + w <= 0)
426 || (h > 0 && y + h <= 0)) 551 || (y + h <= 0))))
427 { 552 {
428 if (background) 553 if (background)
429 { 554 {
430 new_pmap_width = background->width; 555 new_pmap_width = background->width;
431 new_pmap_height = background->height; 556 new_pmap_height = background->height;
432 result = background; 557 result = background;
558
433 if (background_tint != TINT_LEAVE_SAME) 559 if (background_tint != TINT_LEAVE_SAME)
434 { 560 {
435 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 561 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
436 target_width, target_height, background_tint, 562 target_width, target_height, background_tint,
437 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 563 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
438 if (tmp) 564 if (tmp)
439 result = tmp; 565 result = tmp;
440 } 566 }
… …
443 new_pmap_width = new_pmap_height = 0; 569 new_pmap_width = new_pmap_height = 0;
444 } 570 }
445 else 571 else
446 { 572 {
447 result = original_asim; 573 result = original_asim;
574
448 if ((w > 0 && w != original_asim->width) 575 if ((w != original_asim->width)
449 || (h > 0 && h != original_asim->height)) 576 || (h != original_asim->height))
450 { 577 {
451 result = scale_asimage (target->asv, original_asim, 578 result = scale_asimage (target->asv, original_asim,
452 w > 0 ? w : original_asim->width, 579 w, h,
453 h > 0 ? h : original_asim->height,
454 background ? ASA_ASImage : ASA_XImage, 580 background ? ASA_ASImage : ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
456 } 582 }
583
457 if (background == NULL) 584 if (background == NULL)
458 {/* if tiling - pixmap has to be sized exactly as the image */ 585 {
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) 586 if (h_scale == 0 || v_scale == 0)
465 { 587 {
588 /* if tiling - pixmap has to be sized exactly as the image,
589 but there is no need to make it bigger than the window! */
590 new_pmap_width = min (result->width, target_width);
591 new_pmap_height = min (result->height, target_height);
592
593 /* we also need to tile our image in both directions */
466 ASImage *tmp = tile_asimage (target->asv, result, 594 ASImage *tmp = tile_asimage (target->asv, result,
467 (h_scale > 0) ? 0 : (int)result->width - x, 595 (int)result->width - x,
468 (v_scale > 0) ? 0 : (int)result->height - y, 596 (int)result->height - y,
597 new_pmap_width,
469 result->width, result->height, 598 new_pmap_height,
470 TINT_LEAVE_SAME, ASA_XImage, 599 TINT_LEAVE_SAME, ASA_XImage,
471 100, ASIMAGE_QUALITY_DEFAULT); 600 100, ASIMAGE_QUALITY_DEFAULT);
472 if (tmp) 601 if (tmp)
473 { 602 {
474 if (result != original_asim) 603 if (result != original_asim)
475 destroy_asimage (&result); 604 destroy_asimage (&result);
605
476 result = tmp; 606 result = tmp;
477 } 607 }
478 } 608 }
479 } 609 }
480 else 610 else
611 {
481 {/* if blending background and image - pixmap has to be sized same as target window */ 612 /* if blending background and image - pixmap has to be sized same as target window */
482 ASImageLayer *layers = create_image_layers (2); 613 ASImageLayer *layers = create_image_layers (2);
483 ASImage *merged_im = NULL;
484 614
485 layers[0].im = background; 615 layers[0].im = background;
486 layers[0].clip_width = target_width; 616 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 617 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 618 layers[0].tint = background_tint;
489 layers[1].im = result; 619 layers[1].im = result;
490 if (w <= 0) 620
621 if (h_scale == 0 || v_scale == 0)
622 {
491 {/* tile horizontally */ 623 /* tile horizontally */
492 while (x > 0) x -= (int)result->width; 624 while (x > 0) x -= (int)result->width;
493 layers[1].dst_x = x; 625 layers[1].dst_x = x;
494 layers[1].clip_width = result->width+target_width; 626 layers[1].clip_width = result->width+target_width;
495 } 627 }
496 else 628 else
629 {
497 {/* clip horizontally */ 630 /* clip horizontally */
498 layers[1].dst_x = x; 631 layers[1].dst_x = x;
499 layers[1].clip_width = result->width; 632 layers[1].clip_width = result->width;
500 } 633 }
501 if (h <= 0) 634
635 if (h_scale == 0 || v_scale == 0)
502 { 636 {
503 while (y > 0) y -= (int)result->height; 637 while (y > 0) y -= (int)result->height;
504 layers[1].dst_y = y; 638 layers[1].dst_y = y;
505 layers[1].clip_height = result->height + target_height; 639 layers[1].clip_height = result->height + target_height;
506 } 640 }
507 else 641 else
508 { 642 {
509 layers[1].dst_y = y; 643 layers[1].dst_y = y;
510 layers[1].clip_height = result->height; 644 layers[1].clip_height = result->height;
511 } 645 }
646
512 if (target->rs[Rs_blendtype]) 647 if (target->rs[Rs_blendtype])
513 { 648 {
514 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 649 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
515 if (layers[1].merge_scanlines == NULL) 650 if (layers[1].merge_scanlines == NULL)
516 layers[1].merge_scanlines = alphablend_scanlines; 651 layers[1].merge_scanlines = alphablend_scanlines;
517 } 652 }
653
518 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 654 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
519 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 655 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
656
520 if (tmp) 657 if (tmp)
521 { 658 {
522 if (result != original_asim) 659 if (result != original_asim)
523 destroy_asimage (&result); 660 destroy_asimage (&result);
661
524 result = tmp; 662 result = tmp;
525 } 663 }
664
526 free (layers); 665 free (layers);
527 } 666 }
528 } 667 }
529 TIMING_TEST_PRINT_RESULT (asim); 668 TIMING_TEST_PRINT_RESULT (asim);
530 669
531 if (pixmap) 670 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 671
543 if (result) 672 if (result)
544 { 673 {
545 XGCValues gcv; 674 XGCValues gcv;
546 GC gc; 675 GC gc;
676
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
547 687
548 /* create Pixmap */ 688 /* create Pixmap */
549 if (pixmap == None) 689 if (pixmap == None)
550 { 690 {
551 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
552 pmap_width = new_pmap_width; 692 pmap_width = new_pmap_width;
553 pmap_height = new_pmap_height; 693 pmap_height = new_pmap_height;
554 pmap_depth = target->depth; 694 pmap_depth = target->depth;
555 } 695 }
556 /* fill with background color ( if result's not completely overlapping it)*/ 696 /* fill with background color (if result's not completely overlapping it) */
557 gcv.foreground = target->pix_colors[Color_bg]; 697 gcv.foreground = target->pix_colors[Color_bg];
558 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 698 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
559 699
560 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 700 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
561 int dst_width = result->width, dst_height = result->height; 701 int dst_width = result->width, dst_height = result->height;
562 if (background == NULL) 702 if (background == NULL)
563 { 703 {
564 if (h_scale > 0) 704 if (!(h_scale == 0 || v_scale == 0))
705 {
565 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 706 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); 707 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
708 }
568 709
569 if (dst_x > 0 || dst_y > 0 710 if (dst_x > 0 || dst_y > 0
570 || dst_x + dst_width < new_pmap_width 711 || dst_x + dst_width < new_pmap_width
571 || dst_y + dst_height < new_pmap_height) 712 || dst_y + dst_height < new_pmap_height)
572 {
573 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 713 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
574 }
575 } 714 }
576 715
577 /* put result on pixmap */ 716 /* put result on pixmap */
578 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 717 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); 718 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
580 719
581 if (result != background && result != original_asim) 720 if (result != background && result != original_asim)
582 destroy_asimage (&result); 721 destroy_asimage (&result);
583 722
584 XFreeGC (target->dpy, gc); 723 XFreeGC (target->dpy, gc);
585 TIMING_TEST_PRINT_RESULT (asim); 724 TIMING_TEST_PRINT_RESULT (asim);
586 }
587 725
726 ret = true;
727 }
728
729 if (background)
730 destroy_asimage (&background);
731
588 return true; 732 return ret;
589} 733}
590# endif /* HAVE_AFTERIMAGE */ 734# endif /* HAVE_AFTERIMAGE */
735
736# ifdef HAVE_PIXBUF
737bool
738bgPixmap_t::render_image (unsigned long background_flags)
739{
740 if (target == NULL)
741 return false;
742
743 if (!pixbuf)
744 return false;
745
746 // TODO: add alpha blending
747 if (background_flags)
748 return false;
749
750 GdkPixbuf *result;
751
752 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf);
754
755 int target_width = target->szHint.width;
756 int target_height = target->szHint.height;
757 int new_pmap_width = target_width;
758 int new_pmap_height = target_height;
759
760 int x = 0;
761 int y = 0;
762 int w = 0;
763 int h = 0;
764
765 get_image_geometry (image_width, image_height, w, h, x, y);
766
767 if (!(flags & rootAlign)
768 && (x >= target_width
769 || y >= target_height
770 || (x + w <= 0)
771 || (y + h <= 0)))
772 return false;
773
774 result = pixbuf;
775
776 if ((w != image_width)
777 || (h != image_height))
778 {
779 result = gdk_pixbuf_scale_simple (pixbuf,
780 w, h,
781 GDK_INTERP_BILINEAR);
782 }
783
784 bool ret = false;
785
786 if (result)
787 {
788 XGCValues gcv;
789 GC gc;
790
791 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result);
793
794 if (h_scale == 0 || v_scale == 0)
795 {
796 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863 if (result != pixbuf)
864 g_object_unref (result);
865
866 XFreeGC (target->dpy, gc);
867
868 ret = true;
869 }
870
871 return ret;
872}
873# endif /* HAVE_PIXBUF */
591 874
592bool 875bool
593bgPixmap_t::set_file (const char *file) 876bgPixmap_t::set_file (const char *file)
594{ 877{
595 char *f;
596
597 assert (file != NULL); 878 assert (file);
598 879
599 if (*file != '\0') 880 if (*file)
600 { 881 {
882 if (const char *p = strchr (file, ';'))
883 {
884 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len);
887 f[len] = '\0';
888 file = f;
889 }
890
601# ifdef HAVE_AFTERIMAGE 891# ifdef HAVE_AFTERIMAGE
602 if (target->asimman == NULL) 892 if (!target->asimman)
603 target->asimman = create_generic_imageman (target->rs[Rs_path]); 893 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); 894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
606 else 895 if (original_asim)
607 { 896 have_image = true;
608 size_t len = f - file; 897 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 898# endif
899
900# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
902 if (pixbuf)
903 have_image = true;
904 return have_image;
905# endif
617 } 906 }
907
618 return false; 908 return false;
619} 909}
620 910
621# endif /* BG_IMAGE_FROM_FILE */ 911# endif /* BG_IMAGE_FROM_FILE */
622 912
623# ifdef ENABLE_TRANSPARENCY 913# ifdef ENABLE_TRANSPARENCY
624bool 914bool
625bgPixmap_t::set_transparent () 915bgPixmap_t::set_transparent ()
626{ 916{
627 if (!(flags & isTransparent)) 917 if (!(flags & isTransparent))
628 { 918 {
629 flags |= isTransparent; 919 flags |= isTransparent;
630 return true; 920 return true;
631 } 921 }
922
632 return false; 923 return false;
633} 924}
634 925
635bool 926bool
636bgPixmap_t::set_blur_radius (const char *geom) 927bgPixmap_t::set_blur_radius (const char *geom)
… …
638 int changed = 0; 929 int changed = 0;
639 unsigned int hr, vr; 930 unsigned int hr, vr;
640 int junk; 931 int junk;
641 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
642 933
643 if (!(geom_flags&WidthValue)) 934 if (!(geom_flags & WidthValue))
644 hr = 1; 935 hr = 1;
645 if (!(geom_flags&HeightValue)) 936 if (!(geom_flags & HeightValue))
646 vr = hr; 937 vr = hr;
647 938
648 if (h_blurRadius != hr) 939 if (h_blurRadius != hr)
649 { 940 {
650 ++changed; 941 ++changed;
… …
654 if (v_blurRadius != vr) 945 if (v_blurRadius != vr)
655 { 946 {
656 ++changed; 947 ++changed;
657 v_blurRadius = vr; 948 v_blurRadius = vr;
658 } 949 }
659 950
660 if (v_blurRadius == 0 && h_blurRadius == 0) 951 if (v_blurRadius == 0 && h_blurRadius == 0)
661 flags &= ~blurNeeded; 952 flags &= ~blurNeeded;
662 else 953 else
663 flags |= blurNeeded; 954 flags |= blurNeeded;
664 955
665 return (changed>0); 956 return (changed > 0);
666} 957}
667 958
668static inline unsigned long 959static inline unsigned long
669compute_tint_shade_flags (rxvt_color *tint, int shade) 960compute_tint_shade_flags (rxvt_color *tint, int shade)
670{ 961{
… …
687 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
688 else if (tint) 979 else if (tint)
689 { 980 {
690 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 981 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
691 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 982 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
692 { 983 {
693 flags |= bgPixmap_t::tintNeeded; 984 flags |= bgPixmap_t::tintNeeded;
694 } 985 }
695 }
696 986 }
987
697 if (flags & bgPixmap_t::tintNeeded) 988 if (flags & bgPixmap_t::tintNeeded)
698 { 989 {
699 if (flags & bgPixmap_t::tintWholesome) 990 if (flags & bgPixmap_t::tintWholesome)
700 flags |= bgPixmap_t::tintServerSide; 991 flags |= bgPixmap_t::tintServerSide;
701 else 992 else
… …
710} 1001}
711 1002
712bool 1003bool
713bgPixmap_t::set_tint (rxvt_color &new_tint) 1004bgPixmap_t::set_tint (rxvt_color &new_tint)
714{ 1005{
715 if (tint != new_tint) 1006 if (!(flags & tintSet) || tint != new_tint)
716 { 1007 {
717 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
718 tint = new_tint; 1009 tint = new_tint;
719 flags = (flags & ~tintFlags) | new_flags | tintSet; 1010 flags = (flags & ~tintFlags) | new_flags | tintSet;
720 return true; 1011 return true;
721 } 1012 }
1013
722 return false; 1014 return false;
723} 1015}
724 1016
725bool 1017bool
726bgPixmap_t::unset_tint () 1018bgPixmap_t::unset_tint ()
727{ 1019{
728 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1020 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
729 1021
730 if (new_flags != (flags & tintFlags)) 1022 if (new_flags != (flags & tintFlags))
731 { 1023 {
732 flags = (flags&~tintFlags)|new_flags; 1024 flags = (flags & ~tintFlags) | new_flags;
733 return true; 1025 return true;
734 } 1026 }
1027
735 return false; 1028 return false;
736} 1029}
737 1030
738bool 1031bool
739bgPixmap_t::set_shade (const char *shade_str) 1032bgPixmap_t::set_shade (const char *shade_str)
740{ 1033{
741 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1034 int new_shade = (shade_str) ? atoi (shade_str) : 0;
742 1035
1036 if (new_shade < 0 && new_shade > -100)
1037 new_shade = 200 - (100 + new_shade);
743 if (new_shade == 100) 1038 else if (new_shade == 100)
744 new_shade = 0; 1039 new_shade = 0;
745 1040
746 if (new_shade != shade) 1041 if (new_shade != shade)
747 { 1042 {
748 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
749 shade = new_shade; 1044 shade = new_shade;
750 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1045 flags = (flags & (~tintFlags | tintSet)) | new_flags;
751 return true; 1046 return true;
752 } 1047 }
1048
753 return false; 1049 return false;
754} 1050}
755 1051
1052bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height)
1054{
1055 Display *dpy = target->dpy;
1056 bool ret = false;
1057
1058 if (flags & tintWholesome)
1059 {
1060 XGCValues gcv;
1061 GC gc;
1062
1063 /* In this case we can tint image server-side getting significant
1064 * performance improvements, as we eliminate XImage transfer
1065 */
1066 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand;
1068 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc)
1071 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true;
1074 XFreeGC (dpy, gc);
1075 }
1076 }
1077 else
1078 {
1079# if XFT
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081
1082 if (flags & tintSet)
1083 tint.get (c);
1084
1085 if (shade > 0 && shade < 100)
1086 {
1087 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100;
1090 }
1091 else if (shade > 100 && shade < 200)
1092 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 }
1097
1098 XRenderPictFormat pf;
1099 pf.type = PictTypeDirect;
1100 pf.depth = 32;
1101 pf.direct.redMask = 0xff;
1102 pf.direct.greenMask = 0xff;
1103 pf.direct.blueMask = 0xff;
1104 pf.direct.alphaMask = 0xff;
1105
1106 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1107 (PictFormatType|
1108 PictFormatDepth|
1109 PictFormatRedMask|
1110 PictFormatGreenMask|
1111 PictFormatBlueMask|
1112 PictFormatAlphaMask),
1113 &pf,
1114 0);
1115 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1116 XRenderPictureAttributes pa;
1117
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1119
1120 pa.repeat = True;
1121
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap);
1125
1126 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap);
1130
1131 if (mask_pic && overlay_pic && back_pic)
1132 {
1133 XRenderColor mask_c;
1134
1135 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1136 mask_c.alpha = 0xffff;
1137 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1138
1139 mask_c.alpha = 0;
1140 mask_c.red = 0xffff - c.r;
1141 mask_c.green = 0xffff - c.g;
1142 mask_c.blue = 0xffff - c.b;
1143 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1144 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1145 ret = true;
1146 }
1147
1148 XRenderFreePicture (dpy, mask_pic);
1149 XRenderFreePicture (dpy, overlay_pic);
1150 XRenderFreePicture (dpy, back_pic);
1151# if DO_TIMING_TEST
1152 XSync (dpy, False);
1153# endif
1154# endif
1155 }
1156
1157 return ret;
1158}
1159
756/* make_transparency_pixmap() 1160/* make_transparency_pixmap()
757 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1161 * 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 1162 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
759 * our window. 1163 * our window.
760 */ 1164 */
761unsigned long 1165unsigned long
762bgPixmap_t::make_transparency_pixmap () 1166bgPixmap_t::make_transparency_pixmap ()
763{ 1167{
764 unsigned long result = 0; 1168 unsigned long result = 0;
765 1169
766 if (target == NULL) 1170 if (target == NULL)
767 return 0; 1171 return 0;
768 1172
769 /* root dimentions may change from call to call - but Display structure should 1173 /* root dimensions may change from call to call - but Display structure should
770 * be always up-to-date, so let's use it : 1174 * be always up-to-date, so let's use it :
771 */ 1175 */
772 Window root = target->display->root; 1176 Window root = target->display->root;
773 int screen = target->display->screen; 1177 int screen = target->display->screen;
774 Display *dpy = target->dpy; 1178 Display *dpy = target->dpy;
… …
787 if (sx + window_width <= 0 || sy + window_height <= 0 1191 if (sx + window_width <= 0 || sy + window_height <= 0
788 || sx >= root_width || sy >= root_height) 1192 || sx >= root_width || sy >= root_height)
789 return 0; 1193 return 0;
790 1194
791 if (root_pixmap != None) 1195 if (root_pixmap != None)
1196 {
792 {/* we want to validate the pixmap and get it's size at the same time : */ 1197 /* we want to validate the pixmap and get it's size at the same time : */
793 int junk; 1198 int junk;
794 unsigned int ujunk; 1199 unsigned int ujunk;
795 /* root pixmap may be bad - allow a error */ 1200 /* root pixmap may be bad - allow a error */
796 target->allowedxerror = -1; 1201 target->allowedxerror = -1;
797 1202
… …
806 1211
807 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1212 if (tiled_root_pmap == None) /* something really bad happened - abort */
808 return 0; 1213 return 0;
809 1214
810 if (root_pixmap == None) 1215 if (root_pixmap == None)
1216 {
811 { /* use tricks to obtain the root background image :*/ 1217 /* use tricks to obtain the root background image :*/
812 /* we want to create Overrideredirect window overlapping out window 1218 /* we want to create Overrideredirect window overlapping out window
813 with background type of Parent Relative and then grab it */ 1219 with background type of Parent Relative and then grab it */
814 XSetWindowAttributes attr; 1220 XSetWindowAttributes attr;
815 Window src; 1221 Window src;
816 bool success = false; 1222 bool success = false;
817 1223
818 attr.background_pixmap = ParentRelative; 1224 attr.background_pixmap = ParentRelative;
819 attr.backing_store = Always; 1225 attr.backing_store = Always;
820 attr.event_mask = ExposureMask; 1226 attr.event_mask = ExposureMask;
821 attr.override_redirect = True; 1227 attr.override_redirect = True;
822 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1228 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
823 CopyFromParent, CopyFromParent, CopyFromParent, 1229 CopyFromParent, CopyFromParent, CopyFromParent,
824 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1230 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
825 &attr); 1231 &attr);
826 1232
827 if (src != None) 1233 if (src != None)
… …
831 XGrabServer (dpy); 1237 XGrabServer (dpy);
832 XMapRaised (dpy, src); 1238 XMapRaised (dpy, src);
833 XSync (dpy, False); 1239 XSync (dpy, False);
834 1240
835 /* XSync should get window where it's properly exposed, 1241 /* 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 : */ 1242 * but to be on the safe side - let's check for the actual event to arrive : */
837 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1243 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
838 ++ev_count; 1244 ++ev_count;
839 1245
840 if (ev_count > 0); 1246 if (ev_count > 0);
1247 {
841 { /* hooray! - we can grab the image! */ 1248 /* hooray! - we can grab the image! */
842 gc = XCreateGC (dpy, root, 0, NULL); 1249 gc = XCreateGC (dpy, root, 0, NULL);
843 if (gc) 1250 if (gc)
844 { 1251 {
845 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1252 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
846 success = true; 1253 success = true;
847 } 1254 }
848 } 1255 }
1256
849 XDestroyWindow (dpy, src); 1257 XDestroyWindow (dpy, src);
850 XUngrabServer (dpy); 1258 XUngrabServer (dpy);
851 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1259 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
852 } 1260 }
853 1261
854 if (!success) 1262 if (!success)
855 { 1263 {
856 XFreePixmap (dpy, tiled_root_pmap); 1264 XFreePixmap (dpy, tiled_root_pmap);
857 tiled_root_pmap = None; 1265 tiled_root_pmap = None;
858 } 1266 }
859 else 1267 else
860 result |= transpPmapTiled; 1268 result |= transpPmapTiled;
861 } 1269 }
862 else 1270 else
1271 {
863 {/* strightforward pixmap copy */ 1272 /* straightforward pixmap copy */
864 gcv.tile = root_pixmap; 1273 gcv.tile = root_pixmap;
865 gcv.fill_style = FillTiled; 1274 gcv.fill_style = FillTiled;
866 1275
867 while (sx < 0) sx += (int)window_width; 1276 while (sx < 0) sx += (int)root_width;
868 while (sy < 0) sy += (int)window_height; 1277 while (sy < 0) sy += (int)root_height;
869 1278
870 gcv.ts_x_origin = -sx; 1279 gcv.ts_x_origin = -sx;
871 gcv.ts_y_origin = -sy; 1280 gcv.ts_y_origin = -sy;
872 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1281 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
873 1282
… …
879 } 1288 }
880 TIMING_TEST_PRINT_RESULT (tp); 1289 TIMING_TEST_PRINT_RESULT (tp);
881 1290
882 if (tiled_root_pmap != None) 1291 if (tiled_root_pmap != None)
883 { 1292 {
884 if (!need_client_side_rendering ()) 1293 if (!need_client_side_rendering ())
885 { 1294 {
886 if ((flags & tintNeeded)) 1295 if ((flags & tintNeeded))
887 {
888 if (flags & tintWholesome)
889 { 1296 {
890 /* In this case we can tint image server-side getting significant 1297 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height))
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; 1298 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 } 1299 }
986 } /* server side rendering completed */ 1300 } /* server side rendering completed */
987 1301
988 if (pixmap) 1302 if (pixmap)
989 XFreePixmap (dpy, pixmap); 1303 XFreePixmap (dpy, pixmap);
990 1304
991 pixmap = tiled_root_pmap; 1305 pixmap = tiled_root_pmap;
992 pmap_width = window_width; 1306 pmap_width = window_width;
993 pmap_height = window_height; 1307 pmap_height = window_height;
994 pmap_depth = root_depth; 1308 pmap_depth = root_depth;
995 } 1309 }
996 1310
997 if (gc) 1311 if (gc)
998 XFreeGC (dpy, gc); 1312 XFreeGC (dpy, gc);
999 1313
1000 TIMING_TEST_PRINT_RESULT (tp); 1314 TIMING_TEST_PRINT_RESULT (tp);
1001 1315
1002 return result; 1316 return result;
1003} 1317}
1004 1318
1005bool 1319bool
1006bgPixmap_t::set_root_pixmap () 1320bgPixmap_t::set_root_pixmap ()
1007{ 1321{
1008 Pixmap new_root_pixmap = None;
1009
1010 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1322 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1011 if (new_root_pixmap == None) 1323 if (new_root_pixmap == None)
1012 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1324 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1013 1325
1014 if (new_root_pixmap != root_pixmap) 1326 if (new_root_pixmap != root_pixmap)
1015 { 1327 {
1016 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1017 return true; 1329 return true;
1018 } 1330 }
1331
1019 return false; 1332 return false;
1020} 1333}
1021# endif /* ENABLE_TRANSPARENCY */ 1334# endif /* ENABLE_TRANSPARENCY */
1022 1335
1023# ifndef HAVE_AFTERIMAGE 1336# ifndef HAVE_AFTERIMAGE
1024static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1337static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1025# endif 1338# endif
1026
1027 1339
1028bool 1340bool
1029bgPixmap_t::render () 1341bgPixmap_t::render ()
1030{ 1342{
1031 unsigned long background_flags = 0; 1343 unsigned long background_flags = 0;
… …
1033 if (target == NULL) 1345 if (target == NULL)
1034 return false; 1346 return false;
1035 1347
1036 TIMING_TEST_START (tp); 1348 TIMING_TEST_START (tp);
1037 1349
1038 invalidate(); 1350 invalidate ();
1039# ifdef ENABLE_TRANSPARENCY 1351# ifdef ENABLE_TRANSPARENCY
1040 if (flags & isTransparent) 1352 if (flags & isTransparent)
1041 { 1353 {
1042 /* we need to re-generate transparency pixmap in that case ! */ 1354 /* we need to re-generate transparency pixmap in that case ! */
1043 background_flags = make_transparency_pixmap (); 1355 background_flags = make_transparency_pixmap ();
1044 if (background_flags == 0) 1356 if (background_flags == 0)
1045 return false; 1357 return false;
1046 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1358 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1047 && pmap_depth == target->depth) 1359 && pmap_depth == target->depth)
1048 flags = flags & ~isInvalid; 1360 flags = flags & ~isInvalid;
1049 } 1361 }
1050# endif 1362# endif
1051 1363
1364# ifdef BG_IMAGE_FROM_FILE
1365 if (have_image
1366 || (background_flags & transpTransformations) != (flags & transpTransformations))
1367 {
1368 if (render_image (background_flags))
1369 flags = flags & ~isInvalid;
1370 }
1371# endif
1372
1052 XImage *result = NULL; 1373 XImage *result = NULL;
1053# ifdef HAVE_AFTERIMAGE 1374
1054 if (original_asim 1375 if (background_flags && (flags & isInvalid))
1055 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1376 {
1377 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1056 { 1378 }
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 1379
1062# ifdef ENABLE_TRANSPARENCY 1380 if (result)
1381 {
1382# if !defined(HAVE_AFTERIMAGE) && !XFT
1383 /* our own client-side tinting */
1384 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1385 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1063 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1386 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 { 1387 {
1105 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1388 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1106 if (flags & tintSet) 1389 if (flags & tintSet)
1107 tint.get (c); 1390 tint.get (c);
1108 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1391 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1109 } 1392 }
1110 } 1393# endif
1111# endif /* HAVE_AFTERIMAGE */
1112 1394
1113 if (result != NULL)
1114 {
1115 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1395 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1396
1116 if (gc) 1397 if (gc)
1117 { 1398 {
1118 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1399 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1119 { 1400 {
1120 XFreePixmap (target->dpy, pixmap); 1401 XFreePixmap (target->dpy, pixmap);
1121 pixmap = None; 1402 pixmap = None;
1122 } 1403 }
1404
1123 if (pixmap == None) 1405 if (pixmap == None)
1124 { 1406 {
1125 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1407 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1126 pmap_width = result->width; 1408 pmap_width = result->width;
1127 pmap_height = result->height; 1409 pmap_height = result->height;
1128 pmap_depth = target->depth; 1410 pmap_depth = target->depth;
1129 } 1411 }
1412
1130 if (pmap_depth != result->depth) 1413 if (pmap_depth != result->depth)
1414 {
1131 { /* Bad Match error will ensue ! stupid X !!!! */ 1415 /* Bad Match error will ensue ! stupid X !!!! */
1132 if( result->depth == 24 && pmap_depth == 32) 1416 if (result->depth == 24 && pmap_depth == 32)
1133 result->depth = 32; 1417 result->depth = 32;
1134 else if( result->depth == 32 && pmap_depth == 24) 1418 else if (result->depth == 32 && pmap_depth == 24)
1135 result->depth = 24; 1419 result->depth = 24;
1136 else 1420 else
1137 { 1421 {
1138 /* TODO: implement image recoding */ 1422 /* TODO: implement image recoding */
1139 } 1423 }
1140 } 1424 }
1425
1141 if (pmap_depth == result->depth) 1426 if (pmap_depth == result->depth)
1142 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1427 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1428
1143 XFreeGC (target->dpy, gc); 1429 XFreeGC (target->dpy, gc);
1144 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1145 } 1431 }
1432
1146 XDestroyImage (result); 1433 XDestroyImage (result);
1147 } 1434 }
1148 1435
1149 if (flags & isInvalid) 1436 if (flags & isInvalid)
1150 { 1437 {
1151 if (pixmap != None) 1438 if (pixmap != None)
… …
1155 } 1442 }
1156 } 1443 }
1157 1444
1158 apply (); 1445 apply ();
1159 1446
1447 XSync (target->dpy, False);
1448 valid_since = ev::now ();
1449
1160 TIMING_TEST_PRINT_RESULT (tp); 1450 TIMING_TEST_PRINT_RESULT (tp);
1161 1451
1162 return true; 1452 return true;
1163} 1453}
1164 1454
1165bool 1455bool
1166bgPixmap_t::set_target (rxvt_term *new_target) 1456bgPixmap_t::set_target (rxvt_term *new_target)
1167{ 1457{
1168 if (new_target) 1458 if (new_target)
1169 if (target != new_target) 1459 if (target != new_target)
1170 { 1460 {
… …
1172# ifdef ENABLE_TRANSPARENCY 1462# ifdef ENABLE_TRANSPARENCY
1173 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1463 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1174# endif 1464# endif
1175 return true; 1465 return true;
1176 } 1466 }
1467
1177 return false; 1468 return false;
1178} 1469}
1179 1470
1180void 1471void
1181bgPixmap_t::apply() 1472bgPixmap_t::apply ()
1182{ 1473{
1183 if (target) 1474 if (target)
1184 { 1475 {
1185 flags &= ~isVtOrigin; 1476 flags &= ~isVtOrigin;
1477
1186 if (pixmap != None) 1478 if (pixmap != None)
1479 {
1187 { /* set target's background to pixmap */ 1480 /* set target's background to pixmap */
1188# ifdef ENABLE_TRANSPARENCY 1481# ifdef ENABLE_TRANSPARENCY
1189 if (flags & isTransparent) 1482 if (flags & isTransparent)
1190 { 1483 {
1191 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1484 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1192 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1485 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1193# if HAVE_SCROLLBARS 1486
1194 if (target->scrollBar.win) 1487 if (target->scrollBar.win)
1195 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1488 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1196# endif
1197 } 1489 }
1198 else 1490 else
1199# endif 1491# endif
1200 { 1492 {
1201 flags |= isVtOrigin; 1493 flags |= isVtOrigin;
1202 /* force old pixmap dereference in case it was transparent before :*/ 1494 /* force old pixmap dereference in case it was transparent before :*/
1203 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1495 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1204 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1496 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1205 /* do we also need to set scrollbar's background here ? */ 1497 /* do we also need to set scrollbar's background here ? */
1206# if HAVE_SCROLLBARS 1498
1207 if (target->scrollBar.win) 1499 if (target->scrollBar.win)
1208 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1500 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1209# endif
1210 } 1501 }
1211 } 1502 }
1212 else 1503 else
1504 {
1213 { /* set target background to a pixel */ 1505 /* set target background to a pixel */
1214 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1506 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1215 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1507 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1216 /* do we also need to set scrollbar's background here ? */ 1508 /* do we also need to set scrollbar's background here ? */
1217# if HAVE_SCROLLBARS
1218 if (target->scrollBar.win) 1509 if (target->scrollBar.win)
1219 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1510 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1220# endif
1221 }
1222
1223 /* don't want Expose on the parent */
1224 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
1225 /* do want Expose on the vt, so we get refreshed properly */
1226 XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1227
1228# if HAVE_SCROLLBARS
1229 if (target->scrollBar.win)
1230 { 1511 }
1231 target->scrollBar.setIdle (); 1512
1513 /* don't want Expose on the parent or vt. It is better to use
1514 scr_touch or we get a great deal of flicker otherwise: */
1515 XClearWindow (target->dpy, target->parent[0]);
1516
1517 if (target->scrollBar.state && target->scrollBar.win)
1518 {
1519 target->scrollBar.state = STATE_IDLE;
1232 target->scrollbar_show (0); 1520 target->scrollBar.show (0);
1233 } 1521 }
1234# endif
1235 }
1236}
1237 1522
1523 target->want_refresh = 1;
1524 flags |= hasChanged;
1525 }
1526}
1527
1238#endif /* HAVE_BG_PIXMAP */ 1528#endif /* HAVE_BG_PIXMAP */
1239 1529
1240#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1530#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1241/* taken from aterm-0.4.2 */ 1531/* taken from aterm-0.4.2 */
1242 1532
1243typedef uint32_t RUINT32T; 1533typedef uint32_t RUINT32T;
1244 1534
1245static void 1535static void
1246ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1536ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1247{ 1537{
1248 int sh_r, sh_g, sh_b; 1538 int sh_r, sh_g, sh_b;
1249 RUINT32T mask_r, mask_g, mask_b; 1539 RUINT32T mask_r, mask_g, mask_b;
1250 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1540 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1251 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1541 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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