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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines