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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines