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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines