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.195 by sf-exg, Mon Jan 2 19:31:00 2012 UTC vs.
Revision 1.217 by sf-exg, Sun May 20 16:34:42 2012 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines