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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines