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.161 by sf-exg, Thu Aug 11 08:39:10 2011 UTC vs.
Revision 1.216 by sf-exg, Sun May 20 16:23:42 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines