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

Diff Legend

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