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.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC vs.
Revision 1.145 by sf-exg, Fri Jan 28 00:21:10 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines