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.170 by sf-exg, Sun Aug 21 11:00:02 2011 UTC vs.
Revision 1.218 by sf-exg, Mon May 21 12:29:22 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines