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.63 by sf-exg, Sun Oct 3 21:44:39 2010 UTC vs.
Revision 1.158 by sf-exg, Wed Aug 10 07:28:36 2011 UTC

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

Diff Legend

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