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.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC vs.
Revision 1.214 by sf-exg, Thu May 17 10:18:32 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines