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.164 by sf-exg, Sun Aug 14 22:01:25 2011 UTC vs.
Revision 1.217 by sf-exg, Sun May 20 16:34:42 2012 UTC

3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de> 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#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/* 37#ifndef RepeatPad
38 * Pixmap geometry string interpretation : 38#define RepeatPad True
39 * Each geometry string contains zero or one scale/position 39#endif
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 */
52 40
53#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
42# if XRENDER
43static Picture
44create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
45{
46 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
47
48 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
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}
58# endif
59
54void 60void
55rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
56{ 62{
57#ifdef HAVE_AFTERIMAGE
58 if (original_asim)
59 safe_asimage_destroy (original_asim);
60 if (asv)
61 destroy_asvisual (asv, 0);
62 if (asimman)
63 destroy_image_manager (asimman, 0);
64#endif
65
66#ifdef HAVE_PIXBUF
67 if (pixbuf)
68 g_object_unref (pixbuf);
69#endif
70
71 if (bg_pixmap) 63 if (bg_pixmap)
72 XFreePixmap (dpy, bg_pixmap); 64 XFreePixmap (dpy, bg_pixmap);
73} 65}
74 66
75bool 67bool
93 if (bg_flags & BG_IS_TRANSPARENT) 85 if (bg_flags & BG_IS_TRANSPARENT)
94 return true; 86 return true;
95# endif 87# endif
96 88
97# ifdef BG_IMAGE_FROM_FILE 89# ifdef BG_IMAGE_FROM_FILE
98 if (bg_flags & BG_IS_FROM_FILE) 90 if (bg_image.flags & IM_IS_SET)
99 { 91 {
100 if (bg_flags & BG_IS_SIZE_SENSITIVE) 92 if ((bg_image.flags & IM_IS_SIZE_SENSITIVE)
93 || bg_image.width () > szHint.width
94 || bg_image.height () > szHint.height)
101 return true; 95 return true;
102 } 96 }
103# endif 97# endif
104 98
105 return false; 99 return false;
112 if (bg_flags & BG_IS_TRANSPARENT) 106 if (bg_flags & BG_IS_TRANSPARENT)
113 return true; 107 return true;
114# endif 108# endif
115 109
116# ifdef BG_IMAGE_FROM_FILE 110# ifdef BG_IMAGE_FROM_FILE
117 if (bg_flags & BG_IS_FROM_FILE) 111 if (bg_image.flags & IM_IS_SET)
118 { 112 {
119 if (bg_flags & BG_ROOT_ALIGN) 113 if (bg_image.flags & IM_ROOT_ALIGN)
120 return true; 114 return true;
121 } 115 }
122# endif 116# endif
123 117
124 return false; 118 return false;
125} 119}
126 120
127# ifdef BG_IMAGE_FROM_FILE 121# ifdef BG_IMAGE_FROM_FILE
128static inline bool
129check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
130{
131 if (geom_flags & flag)
132 {
133 if (new_value > 1000)
134 new_value = 1000;
135 if (new_value != scale)
136 {
137 scale = new_value;
138 return true;
139 }
140 }
141 return false;
142}
143
144static inline bool
145check_set_align_value (int geom_flags, int flag, int &align, int new_value)
146{
147 if (geom_flags & flag)
148 {
149 if (new_value < -100)
150 new_value = -100;
151 else if (new_value > 200)
152 new_value = 200;
153 if (new_value != align)
154 {
155 align = new_value;
156 return true;
157 }
158 }
159 return false;
160}
161
162static inline int 122static inline int
163make_align_position (int align, int window_size, int image_size) 123make_align_position (int align, int window_size, int image_size)
164{ 124{
165 int diff = window_size - image_size;
166 int smaller = min (image_size, window_size);
167
168 if (align >= 0 && align <= 100) 125 if (align >= 0 && align <= 100)
169 return diff * align / 100; 126 return lerp (0, window_size - image_size, align);
170 else if (align > 100 && align <= 200) 127 else if (align > 100)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 128 return lerp (window_size - image_size, window_size, align - 100);
172 else if (align >= -100 && align < 0) 129 else
173 return ((align + 100) * smaller / 100) - image_size; 130 return lerp (-image_size, 0, align + 100);
174 return 0;
175} 131}
176 132
177static inline int 133static inline int
178make_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)
179{ 135{
185 src_pos = -pos; 141 src_pos = -pos;
186 dst_pos = 0; 142 dst_pos = 0;
187 dst_size += pos; 143 dst_size += pos;
188 } 144 }
189 145
190 if (dst_pos + dst_size > target_size)
191 dst_size = target_size - dst_pos; 146 min_it (dst_size, target_size - dst_pos);
192 return src_pos; 147 return src_pos;
193} 148}
194 149
195bool 150bool
196rxvt_term::bg_set_geometry (const char *geom, bool update) 151rxvt_image::set_geometry (const char *geom, bool update)
197{ 152{
198 bool changed = false; 153 bool changed = false;
199 int geom_flags = 0; 154 int geom_flags = 0;
200 int x = 0, y = 0; 155 int x = h_align;
156 int y = v_align;
201 unsigned int w = 0, h = 0; 157 unsigned int w = h_scale;
202 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 158 unsigned int h = v_scale;
159 unsigned long new_flags = 0;
203 160
204 if (geom == NULL) 161 if (geom == NULL)
205 return false; 162 return false;
206 163
207 if (geom[0]) 164 if (geom[0])
208 { 165 {
209 char **arr = rxvt_strsplit (':', geom); 166 char **arr = rxvt_strsplit (':', geom);
210 167
211 for (int i = 0; arr[i]; i++) 168 for (int i = 0; arr[i]; i++)
212 { 169 {
213 if (!strcasecmp (arr[i], "style=tiled")) 170 if (!strcasecmp (arr[i], "style=tiled"))
214 { 171 {
215 new_flags = BG_TILE; 172 new_flags = IM_TILE;
216 w = h = noScale; 173 w = h = noScale;
217 x = y = 0; 174 x = y = 0;
218 geom_flags = WidthValue|HeightValue|XValue|YValue; 175 geom_flags = WidthValue|HeightValue|XValue|YValue;
219 } 176 }
220 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 177 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
221 { 178 {
222 new_flags = BG_PROP_SCALE; 179 new_flags = IM_KEEP_ASPECT;
223 w = h = windowScale; 180 w = h = windowScale;
224 x = y = centerAlign; 181 x = y = centerAlign;
225 geom_flags = WidthValue|HeightValue|XValue|YValue; 182 geom_flags = WidthValue|HeightValue|XValue|YValue;
226 } 183 }
227 else if (!strcasecmp (arr[i], "style=stretched")) 184 else if (!strcasecmp (arr[i], "style=stretched"))
237 x = y = centerAlign; 194 x = y = centerAlign;
238 geom_flags = WidthValue|HeightValue|XValue|YValue; 195 geom_flags = WidthValue|HeightValue|XValue|YValue;
239 } 196 }
240 else if (!strcasecmp (arr[i], "style=root-tiled")) 197 else if (!strcasecmp (arr[i], "style=root-tiled"))
241 { 198 {
242 new_flags = BG_TILE|BG_ROOT_ALIGN; 199 new_flags = IM_TILE|IM_ROOT_ALIGN;
243 w = h = noScale; 200 w = h = noScale;
244 geom_flags = WidthValue|HeightValue; 201 geom_flags = WidthValue|HeightValue;
245 } 202 }
246 else if (!strcasecmp (arr[i], "op=tile")) 203 else if (!strcasecmp (arr[i], "op=tile"))
247 new_flags |= BG_TILE; 204 new_flags |= IM_TILE;
248 else if (!strcasecmp (arr[i], "op=pscale")) 205 else if (!strcasecmp (arr[i], "op=keep-aspect"))
249 new_flags |= BG_PROP_SCALE; 206 new_flags |= IM_KEEP_ASPECT;
250 else if (!strcasecmp (arr[i], "op=root")) 207 else if (!strcasecmp (arr[i], "op=root-align"))
251 new_flags |= BG_ROOT_ALIGN; 208 new_flags |= IM_ROOT_ALIGN;
252 209
253 // deprecated 210 // deprecated
254 else if (!strcasecmp (arr[i], "tile")) 211 else if (!strcasecmp (arr[i], "tile"))
255 { 212 {
256 new_flags |= BG_TILE; 213 new_flags |= IM_TILE;
257 w = h = noScale; 214 w = h = noScale;
258 geom_flags |= WidthValue|HeightValue; 215 geom_flags |= WidthValue|HeightValue;
259 } 216 }
260 else if (!strcasecmp (arr[i], "propscale")) 217 else if (!strcasecmp (arr[i], "propscale"))
261 { 218 {
262 new_flags |= BG_PROP_SCALE; 219 new_flags |= IM_KEEP_ASPECT;
220 w = h = windowScale;
221 geom_flags |= WidthValue|HeightValue;
263 } 222 }
264 else if (!strcasecmp (arr[i], "hscale")) 223 else if (!strcasecmp (arr[i], "hscale"))
265 { 224 {
266 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
267 w = windowScale; 226 w = windowScale;
268 h = noScale; 227 h = noScale;
269 geom_flags |= WidthValue|HeightValue; 228 geom_flags |= WidthValue|HeightValue;
270 } 229 }
271 else if (!strcasecmp (arr[i], "vscale")) 230 else if (!strcasecmp (arr[i], "vscale"))
272 { 231 {
273 new_flags |= BG_TILE; 232 new_flags |= IM_TILE;
274 h = windowScale; 233 h = windowScale;
275 w = noScale; 234 w = noScale;
276 geom_flags |= WidthValue|HeightValue; 235 geom_flags |= WidthValue|HeightValue;
277 } 236 }
278 else if (!strcasecmp (arr[i], "scale")) 237 else if (!strcasecmp (arr[i], "scale"))
286 x = y = centerAlign; 245 x = y = centerAlign;
287 geom_flags |= WidthValue|HeightValue|XValue|YValue; 246 geom_flags |= WidthValue|HeightValue|XValue|YValue;
288 } 247 }
289 else if (!strcasecmp (arr[i], "root")) 248 else if (!strcasecmp (arr[i], "root"))
290 { 249 {
291 new_flags |= BG_TILE|BG_ROOT_ALIGN; 250 new_flags |= IM_TILE|IM_ROOT_ALIGN;
292 w = h = noScale; 251 w = h = noScale;
293 geom_flags |= WidthValue|HeightValue; 252 geom_flags |= WidthValue|HeightValue;
294 } 253 }
295 254
296 else 255 else
297 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 256 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
298 } /* done parsing ops */ 257 } /* done parsing ops */
299 258
300 rxvt_free_strsplit (arr); 259 rxvt_free_strsplit (arr);
301 } 260 }
261
262 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
302 263
303 if (!update) 264 if (!update)
304 { 265 {
305 if (!(geom_flags & XValue)) 266 if (!(geom_flags & XValue))
306 x = y = defaultAlign; 267 x = y = defaultAlign;
311 w = h = defaultScale; 272 w = h = defaultScale;
312 else if (!(geom_flags & HeightValue)) 273 else if (!(geom_flags & HeightValue))
313 h = w; 274 h = w;
314 else if (!(geom_flags & WidthValue)) 275 else if (!(geom_flags & WidthValue))
315 w = h; 276 w = h;
316
317 geom_flags |= WidthValue|HeightValue|XValue|YValue;
318 }
319
320 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
321 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
322 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
323 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
324
325 if (new_flags != bg_flags)
326 { 277 }
278
279 clamp_it (x, -100, 200);
280 clamp_it (y, -100, 200);
281
282 if (flags != new_flags
283 || h_scale != w
284 || v_scale != h
285 || h_align != x
286 || v_align != y)
287 {
327 bg_flags = new_flags; 288 flags = new_flags;
289 h_scale = w;
290 v_scale = h;
291 h_align = x;
292 v_align = y;
328 changed = true; 293 changed = true;
329 } 294 }
330 295
296 if (!(flags & IM_TILE)
297 || h_scale || v_scale
298 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
299 flags |= IM_IS_SIZE_SENSITIVE;
300 else
301 flags &= ~IM_IS_SIZE_SENSITIVE;
302
331 return changed; 303 return changed;
332} 304}
333 305
334void 306void
335rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 307rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
336{ 308{
309 int image_width = image.width ();
310 int image_height = image.height ();
337 int target_width = szHint.width; 311 int target_width = szHint.width;
338 int target_height = szHint.height; 312 int target_height = szHint.height;
313 int h_scale = min (image.h_scale, 32767 * 100 / target_width);
314 int v_scale = min (image.v_scale, 32767 * 100 / target_height);
339 315
340 w = h_scale * target_width / 100; 316 w = h_scale * target_width / 100;
341 h = v_scale * target_height / 100; 317 h = v_scale * target_height / 100;
342 318
343 if (bg_flags & BG_PROP_SCALE) 319 if (image.flags & IM_KEEP_ASPECT)
344 { 320 {
345 float scale = (float)w / image_width; 321 float scale = (float)w / image_width;
346 min_it (scale, (float)h / image_height); 322 min_it (scale, (float)h / image_height);
347 w = image_width * scale + 0.5; 323 w = image_width * scale + 0.5;
348 h = image_height * scale + 0.5; 324 h = image_height * scale + 0.5;
349 } 325 }
350 326
351 if (!w) w = image_width; 327 if (!w) w = image_width;
352 if (!h) h = image_height; 328 if (!h) h = image_height;
353 329
354 if (bg_flags & BG_ROOT_ALIGN) 330 if (image.flags & IM_ROOT_ALIGN)
355 { 331 {
356 x = -target_x; 332 x = -target_x;
357 y = -target_y; 333 y = -target_y;
358 } 334 }
359 else 335 else
360 { 336 {
361 x = make_align_position (h_align, target_width, w); 337 x = make_align_position (image.h_align, target_width, w);
362 y = make_align_position (v_align, target_height, h); 338 y = make_align_position (image.v_align, target_height, h);
363 }
364
365 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
366 if (!(bg_flags & BG_TILE)
367 || h_scale || v_scale
368 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
369 || w > target_width || h > target_height)
370 bg_flags |= BG_IS_SIZE_SENSITIVE;
371}
372
373# ifdef HAVE_AFTERIMAGE
374bool
375rxvt_term::render_image (unsigned long tr_flags)
376{
377 init_asv ();
378
379 ASImage *background = NULL;
380 ARGB32 background_tint = TINT_LEAVE_SAME;
381
382# ifdef ENABLE_TRANSPARENCY
383 if (tr_flags)
384 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
385
386 if (tr_flags & BG_NEEDS_TINT)
387 { 339 }
388 ShadingInfo as_shade; 340}
389 as_shade.shading = shade;
390 341
391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 342# ifdef HAVE_PIXBUF
392 if (bg_flags & BG_TINT_SET) 343bool
393 tint.get (c); 344rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
394 as_shade.tintColor.red = c.r; 345 int src_x, int src_y, int dst_x, int dst_y,
395 as_shade.tintColor.green = c.g; 346 unsigned int width, unsigned int height)
396 as_shade.tintColor.blue = c.b; 347{
348 XImage *ximage;
349 char *line;
350 int width_r, width_g, width_b, width_a;
351 int sh_r, sh_g, sh_b, sh_a;
352 uint32_t alpha_mask;
353 int rowstride;
354 int channels;
355 unsigned char *row;
397 356
398 background_tint = shading2tint32 (&as_shade); 357 if (visual->c_class != TrueColor)
358 return false;
359
360#if XRENDER
361 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
362 if (format)
363 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
364 else
365#endif
366 alpha_mask = 0;
367
368 width_r = ecb_popcount32 (visual->red_mask);
369 width_g = ecb_popcount32 (visual->green_mask);
370 width_b = ecb_popcount32 (visual->blue_mask);
371 width_a = ecb_popcount32 (alpha_mask);
372
373 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
374 return false;
375
376 sh_r = ecb_ctz32 (visual->red_mask);
377 sh_g = ecb_ctz32 (visual->green_mask);
378 sh_b = ecb_ctz32 (visual->blue_mask);
379 sh_a = ecb_ctz32 (alpha_mask);
380
381 if (width > 32767 || height > 32767)
382 return false;
383
384 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, 0,
385 width, height, 32, 0);
386 if (!ximage)
387 return false;
388
389 if (height > INT_MAX / ximage->bytes_per_line
390 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
399 } 391 {
400 392 XDestroyImage (ximage);
401 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 393 return false;
402 { 394 }
403 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 395
404 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 396 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
405 100, ASIMAGE_QUALITY_DEFAULT); 397
406 if (tmp) 398 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
399 channels = gdk_pixbuf_get_n_channels (pixbuf);
400 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
401 line = ximage->data;
402
403 rgba c (0, 0, 0);
404
405 if (channels == 4 && alpha_mask == 0)
406 {
407 pix_colors[Color_bg].get (c);
408 c.r >>= 8;
409 c.g >>= 8;
410 c.b >>= 8;
411 }
412
413 for (int y = 0; y < height; y++)
414 {
415 for (int x = 0; x < width; x++)
416 {
417 unsigned char *pixel = row + x * channels;
418 uint32_t value;
419 unsigned char r, g, b, a;
420
421 if (channels == 4)
407 { 422 {
408 destroy_asimage (&background); 423 a = pixel[3];
409 background = tmp; 424 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
425 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
426 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
427 }
428 else
429 {
430 a = 0xff;
431 r = pixel[0];
432 g = pixel[1];
433 b = pixel[2];
434 }
435
436 value = ((r >> (8 - width_r)) << sh_r)
437 | ((g >> (8 - width_g)) << sh_g)
438 | ((b >> (8 - width_b)) << sh_b)
439 | ((a >> (8 - width_a)) << sh_a);
440
441 if (ximage->bits_per_pixel == 32)
442 ((uint32_t *)line)[x] = value;
443 else
444 XPutPixel (ximage, x, y, value);
410 } 445 }
411 }
412# endif
413 446
414 ASImage *result = 0; 447 row += rowstride;
448 line += ximage->bytes_per_line;
449 }
450
451 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
452 XDestroyImage (ximage);
453 return true;
454}
455
456bool
457rxvt_term::render_image (rxvt_image &image)
458{
459 GdkPixbuf *pixbuf = image.pixbuf;
460 if (!pixbuf)
461 return false;
462
463 bool need_blend = bg_flags & BG_IS_VALID;
464
465 if (need_blend
466 && !(bg_flags & BG_HAS_RENDER))
467 return false;
468
469 GdkPixbuf *result;
470
471 int image_width = gdk_pixbuf_get_width (pixbuf);
472 int image_height = gdk_pixbuf_get_height (pixbuf);
415 473
416 int target_width = szHint.width; 474 int target_width = szHint.width;
417 int target_height = szHint.height; 475 int target_height = szHint.height;
418 int new_pmap_width = target_width; 476 int new_pmap_width = target_width;
419 int new_pmap_height = target_height; 477 int new_pmap_height = target_height;
421 int x = 0; 479 int x = 0;
422 int y = 0; 480 int y = 0;
423 int w = 0; 481 int w = 0;
424 int h = 0; 482 int h = 0;
425 483
426 if (original_asim) 484 get_image_geometry (image, w, h, x, y);
427 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
428 485
429 if (!original_asim
430 || (!(bg_flags & BG_ROOT_ALIGN)
431 && (x >= target_width
432 || y >= target_height
433 || (x + w <= 0)
434 || (y + h <= 0))))
435 {
436 if (background)
437 {
438 new_pmap_width = background->width;
439 new_pmap_height = background->height;
440 result = background;
441
442 if (background_tint != TINT_LEAVE_SAME)
443 {
444 ASImage *tmp = tile_asimage (asv, background, 0, 0,
445 target_width, target_height, background_tint,
446 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
447 if (tmp)
448 result = tmp;
449 }
450 }
451 else
452 new_pmap_width = new_pmap_height = 0;
453 }
454 else
455 {
456 result = original_asim;
457
458 if ((w != original_asim->width)
459 || (h != original_asim->height))
460 {
461 result = scale_asimage (asv, original_asim,
462 w, h,
463 background ? ASA_ASImage : ASA_XImage,
464 100, ASIMAGE_QUALITY_DEFAULT);
465 }
466
467 if (background == NULL)
468 {
469 if (bg_flags & BG_TILE)
470 {
471 /* if tiling - pixmap has to be sized exactly as the image,
472 but there is no need to make it bigger than the window! */
473 new_pmap_width = min (result->width, target_width);
474 new_pmap_height = min (result->height, target_height);
475
476 /* we also need to tile our image in both directions */
477 ASImage *tmp = tile_asimage (asv, result,
478 (int)result->width - x,
479 (int)result->height - y,
480 new_pmap_width,
481 new_pmap_height,
482 TINT_LEAVE_SAME, ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp)
485 {
486 if (result != original_asim)
487 destroy_asimage (&result);
488
489 result = tmp;
490 }
491 }
492 }
493 else
494 {
495 /* if blending background and image - pixmap has to be sized same as target window */
496 ASImageLayer *layers = create_image_layers (2);
497
498 layers[0].im = background;
499 layers[0].clip_width = target_width;
500 layers[0].clip_height = target_height;
501 layers[0].tint = background_tint;
502 layers[1].im = result;
503
504 if (bg_flags & BG_TILE)
505 {
506 /* tile horizontally */
507 while (x > 0) x -= (int)result->width;
508 layers[1].dst_x = x;
509 layers[1].clip_width = result->width+target_width;
510 }
511 else
512 {
513 /* clip horizontally */
514 layers[1].dst_x = x;
515 layers[1].clip_width = result->width;
516 }
517
518 if (bg_flags & BG_TILE)
519 {
520 while (y > 0) y -= (int)result->height;
521 layers[1].dst_y = y;
522 layers[1].clip_height = result->height + target_height;
523 }
524 else
525 {
526 layers[1].dst_y = y;
527 layers[1].clip_height = result->height;
528 }
529
530 if (rs[Rs_blendtype])
531 {
532 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
533 if (layers[1].merge_scanlines == NULL)
534 layers[1].merge_scanlines = alphablend_scanlines;
535 }
536
537 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
538 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
539
540 if (tmp)
541 {
542 if (result != original_asim)
543 destroy_asimage (&result);
544
545 result = tmp;
546 }
547
548 free (layers);
549 }
550 }
551
552 bool ret = false;
553
554 if (result)
555 {
556 XGCValues gcv;
557 GC gc;
558
559 /* create Pixmap */
560 if (bg_pixmap == None
561 || bg_pmap_width != new_pmap_width
562 || bg_pmap_height != new_pmap_height)
563 {
564 if (bg_pixmap)
565 XFreePixmap (dpy, bg_pixmap);
566 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
567 bg_pmap_width = new_pmap_width;
568 bg_pmap_height = new_pmap_height;
569 }
570 /* fill with background color (if result's not completely overlapping it) */
571 gcv.foreground = pix_colors[Color_bg];
572 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
573
574 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
575 int dst_width = result->width, dst_height = result->height;
576 if (background == NULL)
577 {
578 if (!(bg_flags & BG_TILE))
579 {
580 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
581 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
582 }
583
584 if (dst_x > 0 || dst_y > 0
585 || dst_x + dst_width < new_pmap_width
586 || dst_y + dst_height < new_pmap_height)
587 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
588 }
589
590 /* put result on pixmap */
591 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
592 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
593
594 if (result != background && result != original_asim)
595 destroy_asimage (&result);
596
597 XFreeGC (dpy, gc);
598
599 ret = true;
600 }
601
602 if (background)
603 destroy_asimage (&background);
604
605 return ret;
606}
607# endif /* HAVE_AFTERIMAGE */
608
609# ifdef HAVE_PIXBUF
610bool
611rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
612 int src_x, int src_y, int dst_x, int dst_y,
613 unsigned int width, unsigned int height)
614{
615 XImage *ximage;
616 char *data, *line;
617 int bytes_per_pixel;
618 int width_r, width_g, width_b;
619 int sh_r, sh_g, sh_b;
620 int rowstride;
621 int channels;
622 unsigned char *row;
623
624 if (visual->c_class != TrueColor)
625 return false;
626
627 if (depth == 24 || depth == 32)
628 bytes_per_pixel = 4;
629 else if (depth == 15 || depth == 16)
630 bytes_per_pixel = 2;
631 else
632 return false;
633
634 width_r = ecb_popcount32 (visual->red_mask);
635 width_g = ecb_popcount32 (visual->green_mask);
636 width_b = ecb_popcount32 (visual->blue_mask);
637
638 if (width_r > 8 || width_g > 8 || width_b > 8)
639 return false;
640
641 sh_r = ecb_ctz32 (visual->red_mask);
642 sh_g = ecb_ctz32 (visual->green_mask);
643 sh_b = ecb_ctz32 (visual->blue_mask);
644
645 if (width > INT_MAX / height / bytes_per_pixel)
646 return false;
647
648 data = (char *)malloc (width * height * bytes_per_pixel);
649 if (!data)
650 return false;
651
652 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
653 width, height, bytes_per_pixel * 8, 0);
654 if (!ximage)
655 {
656 free (data);
657 return false;
658 }
659
660 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
661
662 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
663 channels = gdk_pixbuf_get_n_channels (pixbuf);
664 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
665 line = data;
666
667 for (int y = 0; y < height; y++)
668 {
669 for (int x = 0; x < width; x++)
670 {
671 unsigned char *pixel = row + x * channels;
672 uint32_t value;
673
674 value = ((pixel[0] >> (8 - width_r)) << sh_r)
675 | ((pixel[1] >> (8 - width_g)) << sh_g)
676 | ((pixel[2] >> (8 - width_b)) << sh_b);
677
678 if (bytes_per_pixel == 4)
679 ((uint32_t *)line)[x] = value;
680 else
681 ((uint16_t *)line)[x] = value;
682 }
683
684 row += rowstride;
685 line += ximage->bytes_per_line;
686 }
687
688 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
689 XDestroyImage (ximage);
690 return true;
691}
692
693bool
694rxvt_term::render_image (unsigned long tr_flags)
695{
696 if (!pixbuf)
697 return false;
698
699 if (tr_flags
700 && !(bg_flags & BG_HAS_RENDER))
701 return false;
702
703 GdkPixbuf *result;
704
705 int image_width = gdk_pixbuf_get_width (pixbuf);
706 int image_height = gdk_pixbuf_get_height (pixbuf);
707
708 int target_width = szHint.width;
709 int target_height = szHint.height;
710 int new_pmap_width = target_width;
711 int new_pmap_height = target_height;
712
713 int x = 0;
714 int y = 0;
715 int w = 0;
716 int h = 0;
717
718 get_image_geometry (image_width, image_height, w, h, x, y);
719
720 if (!(bg_flags & BG_ROOT_ALIGN) 486 if (!(image.flags & IM_ROOT_ALIGN)
721 && (x >= target_width 487 && (x >= target_width
722 || y >= target_height 488 || y >= target_height
723 || (x + w <= 0) 489 || x + w <= 0
724 || (y + h <= 0))) 490 || y + h <= 0))
725 return false; 491 return false;
726 492
727 result = pixbuf; 493 result = pixbuf;
728 494
729 if ((w != image_width) 495 if (w != image_width
730 || (h != image_height)) 496 || h != image_height)
731 { 497 {
732 result = gdk_pixbuf_scale_simple (pixbuf, 498 result = gdk_pixbuf_scale_simple (pixbuf,
733 w, h, 499 w, h,
734 GDK_INTERP_BILINEAR); 500 GDK_INTERP_BILINEAR);
735 } 501 }
739 505
740 bool ret = false; 506 bool ret = false;
741 507
742 XGCValues gcv; 508 XGCValues gcv;
743 GC gc; 509 GC gc;
744 Pixmap root_pmap; 510 Pixmap tmp_pixmap;
745 511
746 image_width = gdk_pixbuf_get_width (result); 512 image_width = gdk_pixbuf_get_width (result);
747 image_height = gdk_pixbuf_get_height (result); 513 image_height = gdk_pixbuf_get_height (result);
748 514
749 if (tr_flags) 515 if (need_blend)
750 { 516 {
751 root_pmap = bg_pixmap; 517 tmp_pixmap = bg_pixmap;
752 bg_pixmap = None; 518 bg_pixmap = None;
753 } 519 }
754 else 520 else
755 { 521 {
756 if (bg_flags & BG_TILE) 522 if (image.flags & IM_TILE)
757 { 523 {
758 new_pmap_width = min (image_width, target_width); 524 new_pmap_width = min (image_width, target_width);
759 new_pmap_height = min (image_height, target_height); 525 new_pmap_height = min (image_height, target_height);
760 } 526 }
761 } 527 }
774 gcv.foreground = pix_colors[Color_bg]; 540 gcv.foreground = pix_colors[Color_bg];
775 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 541 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
776 542
777 if (gc) 543 if (gc)
778 { 544 {
779 if (bg_flags & BG_TILE) 545 if (image.flags & IM_TILE)
780 { 546 {
781 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 547 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
782 pixbuf_to_pixmap (result, tile, gc, 548 pixbuf_to_pixmap (result, tile, gc,
783 0, 0, 549 0, 0,
784 0, 0, 550 0, 0,
812 dst_x, dst_y, 578 dst_x, dst_y,
813 dst_width, dst_height); 579 dst_width, dst_height);
814 } 580 }
815 581
816#if XRENDER 582#if XRENDER
817 if (tr_flags) 583 if (need_blend)
818 { 584 {
819 XRenderPictureAttributes pa;
820
821 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 585 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
586
822 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 587 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, format, 0, 0);
823 588
824 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
825 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 589 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
826 590
827 pa.repeat = True; 591 Picture mask = create_xrender_mask (dpy, vt, False, False);
828 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
829 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
830 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
831 XFreePixmap (dpy, mask_pmap);
832 592
833 XRenderColor mask_c; 593 XRenderColor mask_c;
834 594
835 mask_c.alpha = 0x8000; 595 mask_c.alpha = 0x8000;
836 mask_c.red = 0; 596 mask_c.red =
837 mask_c.green = 0; 597 mask_c.green =
838 mask_c.blue = 0; 598 mask_c.blue = 0;
839 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 599 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
600
840 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 601 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
841 602
842 XRenderFreePicture (dpy, src); 603 XRenderFreePicture (dpy, src);
843 XRenderFreePicture (dpy, dst); 604 XRenderFreePicture (dpy, dst);
844 XRenderFreePicture (dpy, mask); 605 XRenderFreePicture (dpy, mask);
851 } 612 }
852 613
853 if (result != pixbuf) 614 if (result != pixbuf)
854 g_object_unref (result); 615 g_object_unref (result);
855 616
856 if (tr_flags) 617 if (need_blend)
857 XFreePixmap (dpy, root_pmap); 618 XFreePixmap (dpy, tmp_pixmap);
858 619
859 return ret; 620 return ret;
860} 621}
861# endif /* HAVE_PIXBUF */ 622# endif /* HAVE_PIXBUF */
862 623
863bool 624bool
864rxvt_term::bg_set_file (const char *file) 625rxvt_image::set_file (const char *file)
865{ 626{
866 if (!file || !*file) 627 if (!file || !*file)
867 return false; 628 return false;
868 629
630 bool ret = false;
869 if (const char *p = strchr (file, ';')) 631 const char *p = strchr (file, ';');
632
633 if (p)
870 { 634 {
871 size_t len = p - file; 635 size_t len = p - file;
872 char *f = rxvt_temp_buf<char> (len + 1); 636 char *f = rxvt_temp_buf<char> (len + 1);
873 memcpy (f, file, len); 637 memcpy (f, file, len);
874 f[len] = '\0'; 638 f[len] = '\0';
875 file = f; 639 file = f;
876 } 640 }
877 641
878# ifdef HAVE_AFTERIMAGE
879 if (!asimman)
880 asimman = create_generic_imageman (rs[Rs_path]);
881 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
882 if (image)
883 {
884 if (original_asim)
885 safe_asimage_destroy (original_asim);
886 original_asim = image;
887 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
888 return true;
889 }
890# endif
891
892# ifdef HAVE_PIXBUF 642# ifdef HAVE_PIXBUF
893 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 643 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
894 if (image) 644 if (image)
895 { 645 {
896 if (pixbuf) 646 if (pixbuf)
897 g_object_unref (pixbuf); 647 g_object_unref (pixbuf);
898 pixbuf = image; 648 pixbuf = image;
899 bg_flags |= BG_IS_FROM_FILE;
900 return true; 649 ret = true;
901 } 650 }
902# endif 651# endif
903 652
653 if (ret)
654 {
655 flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE;
656 h_scale = v_scale = defaultScale;
657 h_align = v_align = defaultAlign;
658
659 if (p)
660 set_geometry (p + 1);
661 }
662
904 return false; 663 return ret;
905} 664}
906 665
907# endif /* BG_IMAGE_FROM_FILE */ 666# endif /* BG_IMAGE_FROM_FILE */
908 667
909# ifdef ENABLE_TRANSPARENCY 668# ifdef ENABLE_TRANSPARENCY
910bool
911rxvt_term::bg_set_transparent ()
912{
913 if (!(bg_flags & BG_IS_TRANSPARENT))
914 {
915 bg_flags |= BG_IS_TRANSPARENT;
916 return true;
917 }
918
919 return false;
920}
921
922bool 669bool
923rxvt_term::bg_set_blur (const char *geom) 670rxvt_term::bg_set_blur (const char *geom)
924{ 671{
925 bool changed = false; 672 bool changed = false;
926 unsigned int hr, vr; 673 unsigned int hr, vr;
945 { 692 {
946 changed = true; 693 changed = true;
947 v_blurRadius = vr; 694 v_blurRadius = vr;
948 } 695 }
949 696
950 if (v_blurRadius == 0 && h_blurRadius == 0)
951 bg_flags &= ~BG_NEEDS_BLUR;
952 else
953 bg_flags |= BG_NEEDS_BLUR;
954
955 return changed; 697 return changed;
956} 698}
957 699
958void 700bool
959rxvt_term::set_tint_shade_flags () 701rxvt_term::bg_set_tint (rxvt_color &new_tint)
960{ 702{
961 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 703 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
962 bool has_shade = shade != 100; 704 {
963 705 tint = new_tint;
964 bg_flags &= ~BG_TINT_FLAGS; 706 bg_flags |= BG_TINT_SET;
965 707
966 if (bg_flags & BG_TINT_SET) 708 rgba c;
967 {
968 tint.get (c); 709 tint.get (c);
969 if (!has_shade
970 && (c.r <= 0x00ff || c.r >= 0xff00) 710 if ((c.r <= 0x00ff || c.r >= 0xff00)
971 && (c.g <= 0x00ff || c.g >= 0xff00) 711 && (c.g <= 0x00ff || c.g >= 0xff00)
972 && (c.b <= 0x00ff || c.b >= 0xff00)) 712 && (c.b <= 0x00ff || c.b >= 0xff00))
973 bg_flags |= BG_TINT_BITAND; 713 bg_flags |= BG_TINT_BITAND;
974 } 714 else
975
976 if (has_shade || (bg_flags & BG_TINT_SET))
977 bg_flags |= BG_NEEDS_TINT;
978}
979
980bool
981rxvt_term::bg_set_tint (rxvt_color &new_tint)
982{
983 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
984 {
985 tint = new_tint;
986 bg_flags |= BG_TINT_SET; 715 bg_flags &= ~BG_TINT_BITAND;
987 set_tint_shade_flags (); 716
988 return true; 717 return true;
989 } 718 }
990 719
991 return false; 720 return false;
992} 721}
993 722
994bool 723bool
995rxvt_term::bg_set_shade (const char *shade_str) 724rxvt_term::bg_set_shade (const char *shade_str)
996{ 725{
997 int new_shade = (shade_str) ? atoi (shade_str) : 100; 726 int new_shade = atoi (shade_str);
998 727
999 clamp_it (new_shade, -100, 200); 728 clamp_it (new_shade, -100, 200);
1000 if (new_shade < 0) 729 if (new_shade < 0)
1001 new_shade = 200 - (100 + new_shade); 730 new_shade = 200 - (100 + new_shade);
1002 731
1003 if (new_shade != shade) 732 if (new_shade != shade)
1004 { 733 {
1005 shade = new_shade; 734 shade = new_shade;
1006 set_tint_shade_flags ();
1007 return true; 735 return true;
1008 } 736 }
1009 737
1010 return false; 738 return false;
1011} 739}
1032 params[i+2] = XDoubleToFixed (kernel[i] / sum); 760 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1033} 761}
1034#endif 762#endif
1035 763
1036bool 764bool
1037rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 765rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
1038{ 766{
1039 bool ret = false; 767 bool ret = false;
1040#if XRENDER 768#if XRENDER
769 if (!(bg_flags & BG_HAS_RENDER_CONV))
770 return false;
771
1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 772 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1042 double *kernel = (double *)malloc (size * sizeof (double)); 773 double *kernel = (double *)malloc (size * sizeof (double));
1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 774 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1044 775
1045 XRenderPictureAttributes pa; 776 XRenderPictureAttributes pa;
1046 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 777 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1047 778
779 pa.repeat = RepeatPad;
1048 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 780 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
781 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1049 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 782 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
783 XFreePixmap (dpy, tmp);
1050 784
1051 if (kernel && params) 785 if (kernel && params)
1052 { 786 {
1053 if (h_blurRadius)
1054 {
1055 size = h_blurRadius * 2 + 1; 787 size = h_blurRadius * 2 + 1;
1056 get_gaussian_kernel (h_blurRadius, size, kernel, params); 788 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1057 789
1058 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 790 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1059 XRenderComposite (dpy, 791 XRenderComposite (dpy,
1060 PictOpSrc, 792 PictOpSrc,
1061 src, 793 src,
1062 None, 794 None,
1063 dst, 795 dst,
1064 0, 0, 796 0, 0,
1065 0, 0, 797 0, 0,
1066 0, 0, 798 0, 0,
1067 width, height); 799 width, height);
1068 }
1069 800
1070 if (v_blurRadius) 801 ::swap (src, dst);
1071 { 802
1072 size = v_blurRadius * 2 + 1; 803 size = v_blurRadius * 2 + 1;
1073 get_gaussian_kernel (v_blurRadius, size, kernel, params); 804 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1074 ::swap (params[0], params[1]); 805 ::swap (params[0], params[1]);
1075 806
1076 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 807 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1077 XRenderComposite (dpy, 808 XRenderComposite (dpy,
1078 PictOpSrc, 809 PictOpSrc,
1079 src, 810 src,
1080 None, 811 None,
1081 dst, 812 dst,
1082 0, 0, 813 0, 0,
1083 0, 0, 814 0, 0,
1084 0, 0, 815 0, 0,
1085 width, height); 816 width, height);
1086 }
1087 817
1088 ret = true; 818 ret = true;
1089 } 819 }
1090 820
1091 free (kernel); 821 free (kernel);
1095#endif 825#endif
1096 return ret; 826 return ret;
1097} 827}
1098 828
1099bool 829bool
1100rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 830rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
1101{ 831{
1102 bool ret = false; 832 bool ret = false;
1103 833
1104 if (bg_flags & BG_TINT_BITAND) 834 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1105 { 835 {
1106 XGCValues gcv; 836 XGCValues gcv;
1107 GC gc; 837 GC gc;
1108 838
1109 /* In this case we can tint image server-side getting significant 839 /* In this case we can tint image server-side getting significant
1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 848 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1119 ret = true; 849 ret = true;
1120 XFreeGC (dpy, gc); 850 XFreeGC (dpy, gc);
1121 } 851 }
1122 } 852 }
1123 else
1124 {
1125# if XRENDER 853# if XRENDER
854 else if (bg_flags & BG_HAS_RENDER)
855 {
1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 856 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1127 857
1128 if (bg_flags & BG_TINT_SET) 858 if (bg_flags & BG_TINT_SET)
1129 tint.get (c); 859 tint.get (c);
1130 860
1139 c.r = c.r * (200 - shade) / 100; 869 c.r = c.r * (200 - shade) / 100;
1140 c.g = c.g * (200 - shade) / 100; 870 c.g = c.g * (200 - shade) / 100;
1141 c.b = c.b * (200 - shade) / 100; 871 c.b = c.b * (200 - shade) / 100;
1142 } 872 }
1143 873
1144 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1145 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 874 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1146 XRenderPictureAttributes pa;
1147 875
1148 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 876 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1149 877
1150 pa.repeat = True; 878 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1151 879
1152 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 880 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1153 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1154 XFreePixmap (dpy, overlay_pmap);
1155
1156 pa.component_alpha = True;
1157 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1158 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1159 XFreePixmap (dpy, mask_pmap);
1160 881
1161 XRenderColor mask_c; 882 XRenderColor mask_c;
1162 883
1163 mask_c.alpha = 0xffff; 884 mask_c.alpha = 0xffff;
1164 mask_c.red = 885 mask_c.red =
1169 mask_c.alpha = 0; 890 mask_c.alpha = 0;
1170 mask_c.red = 0xffff - c.r; 891 mask_c.red = 0xffff - c.r;
1171 mask_c.green = 0xffff - c.g; 892 mask_c.green = 0xffff - c.g;
1172 mask_c.blue = 0xffff - c.b; 893 mask_c.blue = 0xffff - c.b;
1173 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 894 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
895
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 896 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175 897
1176 if (shade > 100) 898 if (shade > 100)
1177 { 899 {
1178 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1179 mask_c.alpha = 0; 900 mask_c.alpha = 0;
901 mask_c.red =
902 mask_c.green =
903 mask_c.blue = 0xffff * (shade - 100) / 100;
1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 904 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1181 905
1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 906 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1183 } 907 }
1184 908
1185 ret = true; 909 ret = true;
1186 910
1187 XRenderFreePicture (dpy, mask_pic); 911 XRenderFreePicture (dpy, mask_pic);
1188 XRenderFreePicture (dpy, overlay_pic); 912 XRenderFreePicture (dpy, overlay_pic);
1189 XRenderFreePicture (dpy, back_pic); 913 XRenderFreePicture (dpy, back_pic);
914 }
1190# endif 915# endif
1191 }
1192 916
1193 return ret; 917 return ret;
1194} 918}
1195 919
1196/* 920/*
1197 * Builds a pixmap of the same size as the terminal window that contains 921 * Builds a pixmap of the same size as the terminal window that contains
1198 * the tiled portion of the root pixmap that is supposed to be covered by 922 * the tiled portion of the root pixmap that is supposed to be covered by
1199 * our window. 923 * our window.
1200 */ 924 */
1201unsigned long 925bool
1202rxvt_term::make_transparency_pixmap () 926rxvt_term::make_transparency_pixmap ()
1203{ 927{
1204 unsigned long result = 0; 928 bool ret = false;
1205 929
1206 /* root dimensions may change from call to call - but Display structure should 930 /* root dimensions may change from call to call - but Display structure should
1207 * be always up-to-date, so let's use it : 931 * be always up-to-date, so let's use it :
1208 */ 932 */
1209 int screen = display->screen; 933 int screen = display->screen;
1247#if XRENDER 971#if XRENDER
1248 if (bg_flags & BG_HAS_RENDER) 972 if (bg_flags & BG_HAS_RENDER)
1249 { 973 {
1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 974 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1251 975
1252 XRenderPictureAttributes pa;
1253
1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 976 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 977 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1256 978
1257 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 979 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1258 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 980 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1259 981
1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 982 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1261 983
1262 XRenderFreePicture (dpy, src); 984 XRenderFreePicture (dpy, src);
1263 XRenderFreePicture (dpy, dst); 985 XRenderFreePicture (dpy, dst);
1280 bg_pmap_width = window_width; 1002 bg_pmap_width = window_width;
1281 bg_pmap_height = window_height; 1003 bg_pmap_height = window_height;
1282 } 1004 }
1283 1005
1284 /* straightforward pixmap copy */ 1006 /* straightforward pixmap copy */
1285 while (sx < 0) sx += root_width; 1007 while (sx < 0) sx += root_pmap_width;
1286 while (sy < 0) sy += root_height; 1008 while (sy < 0) sy += root_pmap_height;
1287 1009
1288 gcv.tile = recoded_root_pmap; 1010 gcv.tile = recoded_root_pmap;
1289 gcv.fill_style = FillTiled; 1011 gcv.fill_style = FillTiled;
1290 gcv.ts_x_origin = -sx; 1012 gcv.ts_x_origin = -sx;
1291 gcv.ts_y_origin = -sy; 1013 gcv.ts_y_origin = -sy;
1292 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1014 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1293 1015
1294 if (gc) 1016 if (gc)
1295 { 1017 {
1296 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1018 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1019 ret = true;
1020 bool need_blur = h_blurRadius && v_blurRadius;
1021 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1022
1023 if (!(bg_flags & BG_CLIENT_RENDER))
1024 {
1025 if (need_blur)
1026 {
1027 if (blur_pixmap (bg_pixmap, window_width, window_height))
1028 need_blur = false;
1029 }
1030 if (need_tint)
1031 {
1032 if (tint_pixmap (bg_pixmap, window_width, window_height))
1033 need_tint = false;
1034 }
1035 if (need_tint)
1036 {
1037 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1038 if (ximage)
1039 {
1040 /* our own client-side tinting */
1041 tint_ximage (ximage);
1042
1043 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1044 XDestroyImage (ximage);
1045 }
1046 }
1047 } /* server side rendering completed */
1048
1298 XFreeGC (dpy, gc); 1049 XFreeGC (dpy, gc);
1299
1300 if (!(bg_flags & BG_CLIENT_RENDER))
1301 {
1302 if ((bg_flags & BG_NEEDS_BLUR)
1303 && (bg_flags & BG_HAS_RENDER_CONV))
1304 {
1305 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1306 result &= ~BG_NEEDS_BLUR;
1307 }
1308 if ((bg_flags & BG_NEEDS_TINT)
1309 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1310 {
1311 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1312 result &= ~BG_NEEDS_TINT;
1313 }
1314 } /* server side rendering completed */
1315 } 1050 }
1316 1051
1317 if (recoded_root_pmap != root_pixmap) 1052 if (recoded_root_pmap != root_pixmap)
1318 XFreePixmap (dpy, recoded_root_pmap); 1053 XFreePixmap (dpy, recoded_root_pmap);
1319 1054
1320 return result; 1055 return ret;
1321} 1056}
1322 1057
1323void 1058void
1324rxvt_term::bg_set_root_pixmap () 1059rxvt_term::bg_set_root_pixmap ()
1325{ 1060{
1329 1064
1330 root_pixmap = new_root_pixmap; 1065 root_pixmap = new_root_pixmap;
1331} 1066}
1332# endif /* ENABLE_TRANSPARENCY */ 1067# endif /* ENABLE_TRANSPARENCY */
1333 1068
1334#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1335static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1336# endif
1337
1338bool 1069bool
1339rxvt_term::bg_render () 1070rxvt_term::bg_render ()
1340{ 1071{
1341 unsigned long tr_flags = 0;
1342
1343 bg_invalidate (); 1072 bg_invalidate ();
1344# ifdef ENABLE_TRANSPARENCY 1073# ifdef ENABLE_TRANSPARENCY
1345 if (bg_flags & BG_IS_TRANSPARENT) 1074 if (bg_flags & BG_IS_TRANSPARENT)
1346 { 1075 {
1347 /* we need to re-generate transparency pixmap in that case ! */ 1076 /* we need to re-generate transparency pixmap in that case ! */
1348 tr_flags = make_transparency_pixmap (); 1077 if (make_transparency_pixmap ())
1349 if (tr_flags == 0)
1350 return false;
1351 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1352 bg_flags |= BG_IS_VALID; 1078 bg_flags |= BG_IS_VALID;
1353 } 1079 }
1354# endif 1080# endif
1355 1081
1356# ifdef BG_IMAGE_FROM_FILE 1082# ifdef BG_IMAGE_FROM_FILE
1357 if ((bg_flags & BG_IS_FROM_FILE) 1083 if (bg_image.flags & IM_IS_SET)
1358 || (tr_flags & BG_EFFECTS_FLAGS))
1359 { 1084 {
1360 if (render_image (tr_flags)) 1085 if (render_image (bg_image))
1361 bg_flags |= BG_IS_VALID; 1086 bg_flags |= BG_IS_VALID;
1362 }
1363# endif
1364
1365# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1366 XImage *result = NULL;
1367
1368 if (tr_flags && !(bg_flags & BG_IS_VALID))
1369 {
1370 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1371 }
1372
1373 if (result)
1374 {
1375 /* our own client-side tinting */
1376 if (tr_flags & BG_NEEDS_TINT)
1377 {
1378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1379 if (bg_flags & BG_TINT_SET)
1380 tint.get (c);
1381 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1382 }
1383
1384 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1385
1386 if (gc)
1387 {
1388 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1389
1390 XFreeGC (dpy, gc);
1391 bg_flags |= BG_IS_VALID;
1392 }
1393
1394 XDestroyImage (result);
1395 } 1087 }
1396# endif 1088# endif
1397 1089
1398 if (!(bg_flags & BG_IS_VALID)) 1090 if (!(bg_flags & BG_IS_VALID))
1399 { 1091 {
1436#endif 1128#endif
1437} 1129}
1438 1130
1439#endif /* HAVE_BG_PIXMAP */ 1131#endif /* HAVE_BG_PIXMAP */
1440 1132
1441#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1133#ifdef ENABLE_TRANSPARENCY
1442/* taken from aterm-0.4.2 */ 1134/* based on code from aterm-0.4.2 */
1443 1135
1444static void 1136static inline void
1445shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1137fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1446{ 1138{
1139 for (int i = 0; i <= mask >> sh; i++)
1140 {
1141 uint32_t tmp;
1142 tmp = i * high;
1143 tmp += (mask >> sh) * low;
1144 lookup[i] = (tmp / 0xffff) << sh;
1145 }
1146}
1147
1148void
1149rxvt_term::tint_ximage (XImage *ximage)
1150{
1151 unsigned int size_r, size_g, size_b;
1447 int sh_r, sh_g, sh_b; 1152 int sh_r, sh_g, sh_b;
1448 uint32_t mask_r, mask_g, mask_b; 1153 uint32_t mask_r, mask_g, mask_b;
1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1154 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1450 rgba low; 1155 unsigned short low;
1451 rgba high;
1452 int i;
1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1156 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1454 1157
1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1158 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1456 1159
1457 /* for convenience */ 1160 /* for convenience */
1458 mask_r = visual->red_mask; 1161 mask_r = visual->red_mask;
1459 mask_g = visual->green_mask; 1162 mask_g = visual->green_mask;
1460 mask_b = visual->blue_mask; 1163 mask_b = visual->blue_mask;
1461 1164
1462 /* boring lookup table pre-initialization */ 1165 /* boring lookup table pre-initialization */
1463 switch (ximage->depth) 1166 sh_r = ecb_ctz32 (mask_r);
1464 { 1167 sh_g = ecb_ctz32 (mask_g);
1465 case 15: 1168 sh_b = ecb_ctz32 (mask_b);
1466 if ((mask_r != 0x7c00) || 1169
1467 (mask_g != 0x03e0) || 1170 size_r = mask_r >> sh_r;
1468 (mask_b != 0x001f)) 1171 size_g = mask_g >> sh_g;
1172 size_b = mask_b >> sh_b;
1173
1174 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1469 return; 1175 return;
1470 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1176
1177 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1471 lookup_r = lookup; 1178 lookup_r = lookup;
1472 lookup_g = lookup+32; 1179 lookup_g = lookup + size_r;
1473 lookup_b = lookup+32+32; 1180 lookup_b = lookup + size_r + size_g;
1474 sh_r = 10; 1181
1475 sh_g = 5; 1182 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1476 sh_b = 0; 1183
1477 break; 1184 if (bg_flags & BG_TINT_SET)
1478 case 16: 1185 tint.get (c);
1479 if ((mask_r != 0xf800) ||
1480 (mask_g != 0x07e0) ||
1481 (mask_b != 0x001f))
1482 return;
1483 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1484 lookup_r = lookup;
1485 lookup_g = lookup+32;
1486 lookup_b = lookup+32+64;
1487 sh_r = 11;
1488 sh_g = 5;
1489 sh_b = 0;
1490 break;
1491 case 24:
1492 if ((mask_r != 0xff0000) ||
1493 (mask_g != 0x00ff00) ||
1494 (mask_b != 0x0000ff))
1495 return;
1496 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1497 lookup_r = lookup;
1498 lookup_g = lookup+256;
1499 lookup_b = lookup+256+256;
1500 sh_r = 16;
1501 sh_g = 8;
1502 sh_b = 0;
1503 break;
1504 case 32:
1505 if ((mask_r != 0xff0000) ||
1506 (mask_g != 0x00ff00) ||
1507 (mask_b != 0x0000ff))
1508 return;
1509 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1510 lookup_r = lookup;
1511 lookup_g = lookup+256;
1512 lookup_b = lookup+256+256;
1513 sh_r = 16;
1514 sh_g = 8;
1515 sh_b = 0;
1516 break;
1517 default:
1518 return; /* we do not support this color depth */
1519 }
1520 1186
1521 /* prepare limits for color transformation (each channel is handled separately) */ 1187 /* prepare limits for color transformation (each channel is handled separately) */
1522 if (shade > 100) 1188 if (shade > 100)
1523 { 1189 {
1524 shade = 200 - shade;
1525
1526 high.r = c.r * shade / 100;
1527 high.g = c.g * shade / 100;
1528 high.b = c.b * shade / 100;
1529
1530 low.r = 65535 * (100 - shade) / 100; 1190 c.r = c.r * (200 - shade) / 100;
1531 low.g = 65535 * (100 - shade) / 100; 1191 c.g = c.g * (200 - shade) / 100;
1532 low.b = 65535 * (100 - shade) / 100; 1192 c.b = c.b * (200 - shade) / 100;
1193
1194 low = 0xffff * (shade - 100) / 100;
1533 } 1195 }
1534 else 1196 else
1535 { 1197 {
1536 high.r = c.r * shade / 100; 1198 c.r = c.r * shade / 100;
1537 high.g = c.g * shade / 100; 1199 c.g = c.g * shade / 100;
1538 high.b = c.b * shade / 100; 1200 c.b = c.b * shade / 100;
1539 1201
1540 low.r = low.g = low.b = 0; 1202 low = 0;
1541 } 1203 }
1542 1204
1543 /* fill our lookup tables */ 1205 /* fill our lookup tables */
1544 for (i = 0; i <= mask_r>>sh_r; i++) 1206 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1545 { 1207 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1546 uint32_t tmp; 1208 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1547 tmp = i * high.r;
1548 tmp += (mask_r>>sh_r) * low.r;
1549 lookup_r[i] = (tmp/65535)<<sh_r;
1550 }
1551 for (i = 0; i <= mask_g>>sh_g; i++)
1552 {
1553 uint32_t tmp;
1554 tmp = i * high.g;
1555 tmp += (mask_g>>sh_g) * low.g;
1556 lookup_g[i] = (tmp/65535)<<sh_g;
1557 }
1558 for (i = 0; i <= mask_b>>sh_b; i++)
1559 {
1560 uint32_t tmp;
1561 tmp = i * high.b;
1562 tmp += (mask_b>>sh_b) * low.b;
1563 lookup_b[i] = (tmp/65535)<<sh_b;
1564 }
1565 1209
1566 /* apply table to input image (replacing colors by newly calculated ones) */ 1210 /* apply table to input image (replacing colors by newly calculated ones) */
1567 if (ximage->bits_per_pixel == 32 1211 if (ximage->bits_per_pixel == 32
1568 && (ximage->depth == 24 || ximage->depth == 32)
1569 && ximage->byte_order == host_byte_order) 1212 && ximage->byte_order == host_byte_order)
1570 { 1213 {
1571 uint32_t *p1, *pf, *p, *pl; 1214 char *line = ximage->data;
1572 p1 = (uint32_t *) ximage->data;
1573 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1574 1215
1575 while (p1 < pf) 1216 for (int y = 0; y < ximage->height; y++)
1576 {
1577 p = p1;
1578 pl = p1 + ximage->width;
1579 for (; p < pl; p++)
1580 { 1217 {
1581 *p = lookup_r[(*p & 0xff0000) >> 16] | 1218 uint32_t *p = (uint32_t *)line;
1582 lookup_g[(*p & 0x00ff00) >> 8] | 1219 for (int x = 0; x < ximage->width; x++)
1583 lookup_b[(*p & 0x0000ff)] |
1584 (*p & 0xff000000);
1585 } 1220 {
1586 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1221 *p = lookup_r[(*p & mask_r) >> sh_r] |
1222 lookup_g[(*p & mask_g) >> sh_g] |
1223 lookup_b[(*p & mask_b) >> sh_b];
1224 p++;
1225 }
1226 line += ximage->bytes_per_line;
1587 } 1227 }
1588 } 1228 }
1589 else 1229 else
1590 { 1230 {
1591 for (int y = 0; y < ximage->height; y++) 1231 for (int y = 0; y < ximage->height; y++)
1599 } 1239 }
1600 } 1240 }
1601 1241
1602 free (lookup); 1242 free (lookup);
1603} 1243}
1604#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1244#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines