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

Diff Legend

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