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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines