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.174 by sf-exg, Wed Nov 23 16:53:53 2011 UTC vs.
Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines