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.82 by sf-exg, Thu Oct 14 16:01:28 2010 UTC vs.
Revision 1.157 by sf-exg, Tue Aug 9 21:48:00 2011 UTC

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

Diff Legend

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