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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines