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

Diff Legend

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