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.214 by sf-exg, Thu May 17 10:18:32 2012 UTC vs.
Revision 1.242 by sf-exg, Mon Jun 11 14:56:33 2012 UTC

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 <math.h>
26#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
28 27
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
37#ifndef RepeatPad
38#define RepeatPad True
39#endif
40
41#ifdef HAVE_BG_PIXMAP 28#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 29
60void 30void
61rxvt_term::bg_destroy () 31rxvt_term::bg_destroy ()
62{ 32{
63 if (bg_pixmap) 33# if ENABLE_TRANSPARENCY
64 XFreePixmap (dpy, bg_pixmap); 34 delete root_img;
65} 35 root_img = 0;
36# endif
66 37
67bool 38# if BG_IMAGE_FROM_FILE
68rxvt_term::bg_set_position (int x, int y) 39 fimage.destroy ();
69{ 40# endif
70 41
71 if (target_x != x 42 delete bg_img;
72 || target_y != y) 43 bg_img = 0;
73 {
74 target_x = x;
75 target_y = y;
76 return true;
77 }
78 return false;
79} 44}
80 45
81bool 46bool
82rxvt_term::bg_window_size_sensitive () 47rxvt_term::bg_window_size_sensitive ()
83{ 48{
84# ifdef ENABLE_TRANSPARENCY 49# if ENABLE_TRANSPARENCY
85 if (bg_flags & BG_IS_TRANSPARENT) 50 if (bg_flags & BG_IS_TRANSPARENT)
86 return true; 51 return true;
87# endif 52# endif
88 53
89# ifdef BG_IMAGE_FROM_FILE 54# if BG_IMAGE_FROM_FILE
90 if (bg_image.flags & IM_IS_SET) 55 if (fimage.img)
91 { 56 {
92 if ((bg_image.flags & IM_IS_SIZE_SENSITIVE) 57 if ((fimage.flags & IM_IS_SIZE_SENSITIVE)
93 || bg_image.width () > szHint.width 58 || fimage.img->w > szHint.width
94 || bg_image.height () > szHint.height) 59 || fimage.img->h > szHint.height)
95 return true; 60 return true;
96 } 61 }
97# endif 62# endif
98 63
99 return false; 64 return false;
100} 65}
101 66
102bool 67bool
103rxvt_term::bg_window_position_sensitive () 68rxvt_term::bg_window_position_sensitive ()
104{ 69{
105# ifdef ENABLE_TRANSPARENCY 70# if ENABLE_TRANSPARENCY
106 if (bg_flags & BG_IS_TRANSPARENT) 71 if (bg_flags & BG_IS_TRANSPARENT)
107 return true; 72 return true;
108# endif 73# endif
109 74
110# ifdef BG_IMAGE_FROM_FILE 75# if BG_IMAGE_FROM_FILE
111 if (bg_image.flags & IM_IS_SET) 76 if (fimage.img)
112 { 77 {
113 if (bg_image.flags & IM_ROOT_ALIGN) 78 if (fimage.flags & IM_ROOT_ALIGN)
114 return true; 79 return true;
115 } 80 }
116# endif 81# endif
117 82
118 return false; 83 return false;
119} 84}
120 85
121# ifdef BG_IMAGE_FROM_FILE 86# if BG_IMAGE_FROM_FILE
122static inline int 87static inline int
123make_align_position (int align, int window_size, int image_size) 88make_align_position (int align, int window_size, int image_size)
124{ 89{
125 if (align >= 0 && align <= 100) 90 if (align >= 0 && align <= 100)
126 return lerp (0, window_size - image_size, align); 91 return lerp (0, window_size - image_size, align);
128 return lerp (window_size - image_size, window_size, align - 100); 93 return lerp (window_size - image_size, window_size, align - 100);
129 else 94 else
130 return lerp (-image_size, 0, align + 100); 95 return lerp (-image_size, 0, align + 100);
131} 96}
132 97
133static inline int 98static void
134make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 99parse_style (const char *style, int &x, int &y, unsigned int &w, unsigned int &h, uint8_t &flags)
135{ 100{
136 int src_pos = 0; 101 if (!strcasecmp (style, "tiled"))
137 dst_pos = pos;
138 dst_size = size;
139 if (pos < 0)
140 {
141 src_pos = -pos;
142 dst_pos = 0;
143 dst_size += pos;
144 } 102 {
145 103 flags = IM_TILE;
146 min_it (dst_size, target_size - dst_pos); 104 w = h = noScale;
147 return src_pos; 105 x = y = 0;
106 }
107 else if (!strcasecmp (style, "aspect-stretched"))
108 {
109 flags = IM_KEEP_ASPECT;
110 w = h = windowScale;
111 x = y = centerAlign;
112 }
113 else if (!strcasecmp (style, "stretched"))
114 {
115 flags = 0;
116 w = h = windowScale;
117 x = y = centerAlign;
118 }
119 else if (!strcasecmp (style, "centered"))
120 {
121 flags = 0;
122 w = h = noScale;
123 x = y = centerAlign;
124 }
125 else if (!strcasecmp (style, "root-tiled"))
126 {
127 flags = IM_TILE|IM_ROOT_ALIGN;
128 w = h = noScale;
129 x = y = 0;
130 }
148} 131}
149 132
150bool 133bool
151rxvt_image::set_geometry (const char *geom, bool update) 134rxvt_image::set_geometry (const char *geom, bool update)
152{ 135{
154 int geom_flags = 0; 137 int geom_flags = 0;
155 int x = h_align; 138 int x = h_align;
156 int y = v_align; 139 int y = v_align;
157 unsigned int w = h_scale; 140 unsigned int w = h_scale;
158 unsigned int h = v_scale; 141 unsigned int h = v_scale;
159 unsigned long new_flags = 0; 142 uint8_t new_flags = 0;
160 143
161 if (geom == NULL) 144 if (geom == NULL)
162 return false; 145 return false;
163 146
164 if (geom[0]) 147 if (geom[0])
165 { 148 {
166 char **arr = rxvt_strsplit (':', geom); 149 char **arr = rxvt_strsplit (':', geom);
167 150
168 for (int i = 0; arr[i]; i++) 151 for (int i = 0; arr[i]; i++)
169 { 152 {
170 if (!strcasecmp (arr[i], "style=tiled")) 153 if (!strncasecmp (arr[i], "style=", 6))
171 { 154 {
172 new_flags = IM_TILE; 155 parse_style (arr[i] + 6, x, y, w, h, new_flags);
173 w = h = noScale;
174 x = y = 0;
175 geom_flags = WidthValue|HeightValue|XValue|YValue; 156 geom_flags = WidthValue|HeightValue|XValue|YValue;
176 }
177 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
178 {
179 new_flags = IM_KEEP_ASPECT;
180 w = h = windowScale;
181 x = y = centerAlign;
182 geom_flags = WidthValue|HeightValue|XValue|YValue;
183 }
184 else if (!strcasecmp (arr[i], "style=stretched"))
185 {
186 new_flags = 0;
187 w = h = windowScale;
188 geom_flags = WidthValue|HeightValue;
189 }
190 else if (!strcasecmp (arr[i], "style=centered"))
191 {
192 new_flags = 0;
193 w = h = noScale;
194 x = y = centerAlign;
195 geom_flags = WidthValue|HeightValue|XValue|YValue;
196 }
197 else if (!strcasecmp (arr[i], "style=root-tiled"))
198 {
199 new_flags = IM_TILE|IM_ROOT_ALIGN;
200 w = h = noScale;
201 geom_flags = WidthValue|HeightValue;
202 } 157 }
203 else if (!strcasecmp (arr[i], "op=tile")) 158 else if (!strcasecmp (arr[i], "op=tile"))
204 new_flags |= IM_TILE; 159 new_flags |= IM_TILE;
205 else if (!strcasecmp (arr[i], "op=keep-aspect")) 160 else if (!strcasecmp (arr[i], "op=keep-aspect"))
206 new_flags |= IM_KEEP_ASPECT; 161 new_flags |= IM_KEEP_ASPECT;
274 h = w; 229 h = w;
275 else if (!(geom_flags & WidthValue)) 230 else if (!(geom_flags & WidthValue))
276 w = h; 231 w = h;
277 } 232 }
278 233
279 min_it (w, 1000);
280 min_it (h, 1000);
281 clamp_it (x, -100, 200); 234 clamp_it (x, -100, 200);
282 clamp_it (y, -100, 200); 235 clamp_it (y, -100, 200);
283 236
284 if (flags != new_flags 237 if (flags != new_flags
285 || h_scale != w 238 || h_scale != w
293 h_align = x; 246 h_align = x;
294 v_align = y; 247 v_align = y;
295 changed = true; 248 changed = true;
296 } 249 }
297 250
298 if (!(flags & IM_TILE) 251 if (is_size_sensitive ())
299 || h_scale || v_scale
300 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
301 flags |= IM_IS_SIZE_SENSITIVE; 252 flags |= IM_IS_SIZE_SENSITIVE;
302 else 253 else
303 flags &= ~IM_IS_SIZE_SENSITIVE; 254 flags &= ~IM_IS_SIZE_SENSITIVE;
304 255
305 return changed; 256 return changed;
306} 257}
307 258
308void 259void
309rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y) 260rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
310{ 261{
311 int image_width = image.width (); 262 int image_width = image.img->w;
312 int image_height = image.height (); 263 int image_height = image.img->h;
313 int target_width = szHint.width; 264 int parent_width = szHint.width;
314 int target_height = szHint.height; 265 int parent_height = szHint.height;
266 int h_scale = min (image.h_scale, 32767 * 100 / parent_width);
267 int v_scale = min (image.v_scale, 32767 * 100 / parent_height);
315 268
316 w = image.h_scale * target_width / 100; 269 w = h_scale * parent_width / 100;
317 h = image.v_scale * target_height / 100; 270 h = v_scale * parent_height / 100;
318 271
319 if (image.flags & IM_KEEP_ASPECT) 272 if (image.flags & IM_KEEP_ASPECT)
320 { 273 {
321 float scale = (float)w / image_width; 274 float scale = (float)w / image_width;
322 min_it (scale, (float)h / image_height); 275 min_it (scale, (float)h / image_height);
327 if (!w) w = image_width; 280 if (!w) w = image_width;
328 if (!h) h = image_height; 281 if (!h) h = image_height;
329 282
330 if (image.flags & IM_ROOT_ALIGN) 283 if (image.flags & IM_ROOT_ALIGN)
331 { 284 {
332 x = -target_x; 285 x = -parent_x;
333 y = -target_y; 286 y = -parent_y;
334 } 287 }
335 else 288 else
336 { 289 {
337 x = make_align_position (image.h_align, target_width, w); 290 x = make_align_position (image.h_align, parent_width, w);
338 y = make_align_position (image.v_align, target_height, h); 291 y = make_align_position (image.v_align, parent_height, h);
339 }
340}
341
342# ifdef HAVE_PIXBUF
343bool
344rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
345 int src_x, int src_y, int dst_x, int dst_y,
346 unsigned int width, unsigned int height)
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;
356
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)))
391 { 292 }
392 XDestroyImage (ximage);
393 return false;
394 }
395
396 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
397
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)
422 {
423 a = pixel[3];
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);
445 }
446
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} 293}
455 294
456bool 295bool
457rxvt_term::render_image (rxvt_image &image, bool transparent) 296rxvt_term::render_image (rxvt_image &image)
458{ 297{
459 GdkPixbuf *pixbuf = image.pixbuf;
460 if (!pixbuf)
461 return false;
462
463 if (transparent
464 && !(bg_flags & BG_HAS_RENDER))
465 return false;
466
467 GdkPixbuf *result;
468
469 int image_width = gdk_pixbuf_get_width (pixbuf);
470 int image_height = gdk_pixbuf_get_height (pixbuf);
471
472 int target_width = szHint.width; 298 int parent_width = szHint.width;
473 int target_height = szHint.height; 299 int parent_height = szHint.height;
474 int new_pmap_width = target_width;
475 int new_pmap_height = target_height;
476 300
477 int x = 0; 301 int x = 0;
478 int y = 0; 302 int y = 0;
479 int w = 0; 303 int w = 0;
480 int h = 0; 304 int h = 0;
481 305
482 get_image_geometry (image, w, h, x, y); 306 get_image_geometry (image, w, h, x, y);
483 307
484 if (!(image.flags & IM_ROOT_ALIGN) 308 if (!(image.flags & IM_ROOT_ALIGN)
485 && (x >= target_width 309 && (x >= parent_width
486 || y >= target_height 310 || y >= parent_height
487 || x + w <= 0 311 || x + w <= 0
488 || y + h <= 0)) 312 || y + h <= 0))
489 return false; 313 return false;
490 314
491 result = pixbuf; 315 rxvt_img *img = image.img->scale (w, h);
492 316
493 if (w != image_width 317 if (image.flags & IM_TILE)
494 || h != image_height) 318 img->repeat_mode (RepeatNormal);
495 {
496 result = gdk_pixbuf_scale_simple (pixbuf,
497 w, h,
498 GDK_INTERP_BILINEAR);
499 }
500
501 if (!result)
502 return false;
503
504 bool ret = false;
505
506 XGCValues gcv;
507 GC gc;
508 Pixmap root_pmap;
509
510 image_width = gdk_pixbuf_get_width (result);
511 image_height = gdk_pixbuf_get_height (result);
512
513 if (transparent)
514 {
515 root_pmap = bg_pixmap;
516 bg_pixmap = None;
517 }
518 else 319 else
519 { 320 img->repeat_mode (RepeatNone);
520 if (image.flags & IM_TILE) 321 img->sub_rect (-x, -y, parent_width, parent_height)->replace (img);
521 { 322
522 new_pmap_width = min (image_width, target_width); 323 if (bg_flags & BG_IS_VALID)
523 new_pmap_height = min (image_height, target_height);
524 }
525 } 324 {
526 325 double factor = image.alpha * 1. / 0xffff;
527 if (bg_pixmap == None 326 bg_img->blend (img, factor)->replace (img);
528 || bg_pmap_width != new_pmap_width
529 || bg_pmap_height != new_pmap_height)
530 { 327 }
531 if (bg_pixmap)
532 XFreePixmap (dpy, bg_pixmap);
533 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
534 bg_pmap_width = new_pmap_width;
535 bg_pmap_height = new_pmap_height;
536 }
537 328
538 gcv.foreground = pix_colors[Color_bg];
539 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
540
541 if (gc)
542 {
543 if (image.flags & IM_TILE)
544 {
545 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
546 pixbuf_to_pixmap (result, tile, gc,
547 0, 0,
548 0, 0,
549 image_width, image_height);
550
551 gcv.tile = tile;
552 gcv.fill_style = FillTiled;
553 gcv.ts_x_origin = x;
554 gcv.ts_y_origin = y;
555 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
556
557 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
558 XFreePixmap (dpy, tile);
559 }
560 else
561 {
562 int src_x, src_y, dst_x, dst_y;
563 int dst_width, dst_height;
564
565 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
566 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
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 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
574 pixbuf_to_pixmap (result, bg_pixmap, gc,
575 src_x, src_y,
576 dst_x, dst_y,
577 dst_width, dst_height);
578 }
579
580#if XRENDER
581 if (transparent)
582 {
583 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 329 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
330 img->convert_format (format, pix_colors [Color_bg])->replace (img);
584 331
585 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 332 delete bg_img;
333 bg_img = img;
586 334
587 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
588
589 Picture mask = create_xrender_mask (dpy, vt, False, False);
590
591 XRenderColor mask_c;
592
593 mask_c.alpha = 0x8000;
594 mask_c.red =
595 mask_c.green =
596 mask_c.blue = 0;
597 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
598
599 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
600
601 XRenderFreePicture (dpy, src);
602 XRenderFreePicture (dpy, dst);
603 XRenderFreePicture (dpy, mask);
604 }
605#endif
606
607 XFreeGC (dpy, gc);
608
609 ret = true;
610 }
611
612 if (result != pixbuf)
613 g_object_unref (result);
614
615 if (transparent)
616 XFreePixmap (dpy, root_pmap);
617
618 return ret; 335 return true;
619} 336}
620# endif /* HAVE_PIXBUF */
621 337
622bool 338rxvt_image::rxvt_image ()
339{
340 alpha = 0xffff;
341 flags = 0;
342 h_scale =
343 v_scale = defaultScale;
344 h_align =
345 v_align = defaultAlign;
346
347 img = 0;
348}
349
350void
623rxvt_image::set_file (const char *file) 351rxvt_image::set_file_geometry (rxvt_screen *s, const char *file)
624{ 352{
625 if (!file || !*file) 353 if (!file || !*file)
626 return false; 354 return;
627 355
628 bool ret = false;
629 const char *p = strchr (file, ';'); 356 const char *p = strchr (file, ';');
630 357
631 if (p) 358 if (p)
632 { 359 {
633 size_t len = p - file; 360 size_t len = p - file;
635 memcpy (f, file, len); 362 memcpy (f, file, len);
636 f[len] = '\0'; 363 f[len] = '\0';
637 file = f; 364 file = f;
638 } 365 }
639 366
640# ifdef HAVE_PIXBUF 367 set_file (s, file);
641 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 368 alpha = 0x8000;
642 if (image)
643 {
644 if (pixbuf)
645 g_object_unref (pixbuf);
646 pixbuf = image;
647 flags |= IM_IS_SET;
648 ret = true;
649 }
650# endif
651
652 if (ret)
653 {
654 if (p)
655 set_geometry (p + 1); 369 set_geometry (p ? p + 1 : "");
656 else 370}
657 set_default_geometry ();
658 }
659 371
660 return ret; 372void
373rxvt_image::set_file (rxvt_screen *s, const char *file)
374{
375 rxvt_img *img2 = rxvt_img::new_from_file (s, file);
376 delete img;
377 img = img2;
661} 378}
662 379
663# endif /* BG_IMAGE_FROM_FILE */ 380# endif /* BG_IMAGE_FROM_FILE */
664 381
665# ifdef ENABLE_TRANSPARENCY
666bool 382bool
667rxvt_term::bg_set_blur (const char *geom) 383image_effects::set_blur (const char *geom)
668{ 384{
669 bool changed = false; 385 bool changed = false;
670 unsigned int hr, vr; 386 unsigned int hr, vr;
671 int junk; 387 int junk;
672 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 388 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
693 409
694 return changed; 410 return changed;
695} 411}
696 412
697bool 413bool
698rxvt_term::bg_set_tint (rxvt_color &new_tint) 414image_effects::set_tint (const rxvt_color &new_tint)
699{ 415{
700 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 416 if (!tint_set || tint != new_tint)
701 { 417 {
702 tint = new_tint; 418 tint = new_tint;
703 bg_flags |= BG_TINT_SET; 419 tint_set = true;
704
705 rgba c;
706 tint.get (c);
707 if ((c.r <= 0x00ff || c.r >= 0xff00)
708 && (c.g <= 0x00ff || c.g >= 0xff00)
709 && (c.b <= 0x00ff || c.b >= 0xff00))
710 bg_flags |= BG_TINT_BITAND;
711 else
712 bg_flags &= ~BG_TINT_BITAND;
713 420
714 return true; 421 return true;
715 } 422 }
716 423
717 return false; 424 return false;
718} 425}
719 426
720bool 427bool
721rxvt_term::bg_set_shade (const char *shade_str) 428image_effects::set_shade (const char *shade_str)
722{ 429{
723 int new_shade = atoi (shade_str); 430 int new_shade = atoi (shade_str);
724 431
725 clamp_it (new_shade, -100, 200); 432 clamp_it (new_shade, -100, 200);
726 if (new_shade < 0) 433 if (new_shade < 0)
733 } 440 }
734 441
735 return false; 442 return false;
736} 443}
737 444
738#if XRENDER 445# if ENABLE_TRANSPARENCY
739static void
740get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
741{
742 double sigma = radius / 2.0;
743 double scale = sqrt (2.0 * M_PI) * sigma;
744 double sum = 0.0;
745
746 for (int i = 0; i < width; i++)
747 {
748 double x = i - width / 2;
749 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
750 sum += kernel[i];
751 }
752
753 params[0] = XDoubleToFixed (width);
754 params[1] = XDoubleToFixed (1);
755
756 for (int i = 0; i < width; i++)
757 params[i+2] = XDoubleToFixed (kernel[i] / sum);
758}
759#endif
760
761bool
762rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
763{
764 bool ret = false;
765#if XRENDER
766 if (!(bg_flags & BG_HAS_RENDER_CONV))
767 return false;
768
769 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
770 double *kernel = (double *)malloc (size * sizeof (double));
771 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
772
773 XRenderPictureAttributes pa;
774 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
775
776 pa.repeat = RepeatPad;
777 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
778 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
779 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
780 XFreePixmap (dpy, tmp);
781
782 if (kernel && params)
783 {
784 size = h_blurRadius * 2 + 1;
785 get_gaussian_kernel (h_blurRadius, size, kernel, params);
786
787 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
788 XRenderComposite (dpy,
789 PictOpSrc,
790 src,
791 None,
792 dst,
793 0, 0,
794 0, 0,
795 0, 0,
796 width, height);
797
798 ::swap (src, dst);
799
800 size = v_blurRadius * 2 + 1;
801 get_gaussian_kernel (v_blurRadius, size, kernel, params);
802 ::swap (params[0], params[1]);
803
804 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
805 XRenderComposite (dpy,
806 PictOpSrc,
807 src,
808 None,
809 dst,
810 0, 0,
811 0, 0,
812 0, 0,
813 width, height);
814
815 ret = true;
816 }
817
818 free (kernel);
819 free (params);
820 XRenderFreePicture (dpy, src);
821 XRenderFreePicture (dpy, dst);
822#endif
823 return ret;
824}
825
826bool
827rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
828{
829 bool ret = false;
830
831 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
832 {
833 XGCValues gcv;
834 GC gc;
835
836 /* In this case we can tint image server-side getting significant
837 * performance improvements, as we eliminate XImage transfer
838 */
839 gcv.foreground = Pixel (tint);
840 gcv.function = GXand;
841 gcv.fill_style = FillSolid;
842 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
843 if (gc)
844 {
845 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
846 ret = true;
847 XFreeGC (dpy, gc);
848 }
849 }
850# if XRENDER
851 else if (bg_flags & BG_HAS_RENDER)
852 {
853 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
854
855 if (bg_flags & BG_TINT_SET)
856 tint.get (c);
857
858 if (shade <= 100)
859 {
860 c.r = c.r * shade / 100;
861 c.g = c.g * shade / 100;
862 c.b = c.b * shade / 100;
863 }
864 else
865 {
866 c.r = c.r * (200 - shade) / 100;
867 c.g = c.g * (200 - shade) / 100;
868 c.b = c.b * (200 - shade) / 100;
869 }
870
871 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
872
873 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
874
875 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
876
877 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
878
879 XRenderColor mask_c;
880
881 mask_c.alpha = 0xffff;
882 mask_c.red =
883 mask_c.green =
884 mask_c.blue = 0;
885 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
886
887 mask_c.alpha = 0;
888 mask_c.red = 0xffff - c.r;
889 mask_c.green = 0xffff - c.g;
890 mask_c.blue = 0xffff - c.b;
891 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
892
893 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
894
895 if (shade > 100)
896 {
897 mask_c.alpha = 0;
898 mask_c.red =
899 mask_c.green =
900 mask_c.blue = 0xffff * (shade - 100) / 100;
901 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
902
903 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
904 }
905
906 ret = true;
907
908 XRenderFreePicture (dpy, mask_pic);
909 XRenderFreePicture (dpy, overlay_pic);
910 XRenderFreePicture (dpy, back_pic);
911 }
912# endif
913
914 return ret;
915}
916
917/* 446/*
918 * Builds a pixmap of the same size as the terminal window that contains 447 * Builds a pixmap of the same size as the terminal window that contains
919 * the tiled portion of the root pixmap that is supposed to be covered by 448 * the tiled portion of the root pixmap that is supposed to be covered by
920 * our window. 449 * our window.
921 */ 450 */
922bool 451bool
923rxvt_term::make_transparency_pixmap () 452rxvt_term::render_root_image ()
924{ 453{
925 bool ret = false;
926
927 /* root dimensions may change from call to call - but Display structure should 454 /* root dimensions may change from call to call - but Display structure should
928 * be always up-to-date, so let's use it : 455 * be always up-to-date, so let's use it :
929 */ 456 */
930 int screen = display->screen; 457 int screen = display->screen;
931 int root_depth = DefaultDepth (dpy, screen);
932 int root_width = DisplayWidth (dpy, screen); 458 int root_width = DisplayWidth (dpy, screen);
933 int root_height = DisplayHeight (dpy, screen); 459 int root_height = DisplayHeight (dpy, screen);
934 unsigned int root_pmap_width, root_pmap_height;
935 int window_width = szHint.width; 460 int parent_width = szHint.width;
936 int window_height = szHint.height; 461 int parent_height = szHint.height;
937 int sx, sy; 462 int sx, sy;
938 XGCValues gcv;
939 GC gc;
940 463
941 sx = target_x; 464 sx = parent_x;
942 sy = target_y; 465 sy = parent_y;
466
467 if (!root_img)
468 return false;
943 469
944 /* check if we are outside of the visible part of the virtual screen : */ 470 /* check if we are outside of the visible part of the virtual screen : */
945 if (sx + window_width <= 0 || sy + window_height <= 0 471 if (sx + parent_width <= 0 || sy + parent_height <= 0
946 || sx >= root_width || sy >= root_height) 472 || sx >= root_width || sy >= root_height)
947 return 0; 473 return 0;
948 474
949 // validate root pixmap and get its size 475 while (sx < 0) sx += root_img->w;
950 if (root_pixmap != None) 476 while (sy < 0) sy += root_img->h;
951 {
952 Window wdummy;
953 int idummy;
954 unsigned int udummy;
955 477
956 allowedxerror = -1; 478 rxvt_img *img = root_img->sub_rect (sx, sy, parent_width, parent_height);
957 479
958 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) 480 if (root_effects.need_blur ())
959 root_pixmap = None; 481 img->blur (root_effects.h_blurRadius, root_effects.v_blurRadius)->replace (img);
960 482
961 allowedxerror = 0; 483 if (root_effects.need_tint ())
962 } 484 tint_image (img, root_effects.tint, root_effects.tint_set, root_effects.shade);
963 485
964 Pixmap recoded_root_pmap = root_pixmap;
965
966 if (root_pixmap != None && root_depth != depth)
967 {
968#if XRENDER
969 if (bg_flags & BG_HAS_RENDER)
970 {
971 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
972
973 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
974 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
975
976 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 486 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
977 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0); 487 img->convert_format (format, pix_colors [Color_bg])->replace (img);
978 488
979 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 489 delete bg_img;
490 bg_img = img;
980 491
981 XRenderFreePicture (dpy, src);
982 XRenderFreePicture (dpy, dst);
983 }
984 else
985#endif
986 recoded_root_pmap = None;
987 }
988
989 if (recoded_root_pmap == None)
990 return 0;
991
992 if (bg_pixmap == None
993 || bg_pmap_width != window_width
994 || bg_pmap_height != window_height)
995 {
996 if (bg_pixmap)
997 XFreePixmap (dpy, bg_pixmap);
998 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
999 bg_pmap_width = window_width;
1000 bg_pmap_height = window_height;
1001 }
1002
1003 /* straightforward pixmap copy */
1004 while (sx < 0) sx += root_pmap_width;
1005 while (sy < 0) sy += root_pmap_height;
1006
1007 gcv.tile = recoded_root_pmap;
1008 gcv.fill_style = FillTiled;
1009 gcv.ts_x_origin = -sx;
1010 gcv.ts_y_origin = -sy;
1011 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1012
1013 if (gc)
1014 {
1015 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1016 ret = true;
1017 bool need_blur = h_blurRadius && v_blurRadius;
1018 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1019
1020 if (!(bg_flags & BG_CLIENT_RENDER))
1021 {
1022 if (need_blur)
1023 {
1024 if (blur_pixmap (bg_pixmap, window_width, window_height))
1025 need_blur = false;
1026 }
1027 if (need_tint)
1028 {
1029 if (tint_pixmap (bg_pixmap, window_width, window_height))
1030 need_tint = false;
1031 }
1032 if (need_tint)
1033 {
1034 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1035 if (ximage)
1036 {
1037 /* our own client-side tinting */
1038 tint_ximage (ximage);
1039
1040 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1041 XDestroyImage (ximage);
1042 }
1043 }
1044 } /* server side rendering completed */
1045
1046 XFreeGC (dpy, gc);
1047 }
1048
1049 if (recoded_root_pmap != root_pixmap)
1050 XFreePixmap (dpy, recoded_root_pmap);
1051
1052 return ret; 492 return true;
1053} 493}
1054 494
1055void 495void
1056rxvt_term::bg_set_root_pixmap () 496rxvt_term::bg_set_root_pixmap ()
1057{ 497{
1058 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]); 498 delete root_img;
1059 if (new_root_pixmap == None) 499 root_img = rxvt_img::new_from_root (this);
1060 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1061
1062 root_pixmap = new_root_pixmap;
1063} 500}
1064# endif /* ENABLE_TRANSPARENCY */ 501# endif /* ENABLE_TRANSPARENCY */
1065 502
1066bool 503void
1067rxvt_term::bg_render () 504rxvt_term::bg_render ()
1068{ 505{
1069 bool transparent = false; 506 if (bg_flags & BG_INHIBIT_RENDER)
507 return;
1070 508
1071 bg_invalidate (); 509 bg_invalidate ();
1072# ifdef ENABLE_TRANSPARENCY 510# if ENABLE_TRANSPARENCY
1073 if (bg_flags & BG_IS_TRANSPARENT) 511 if (bg_flags & BG_IS_TRANSPARENT)
1074 { 512 {
1075 /* we need to re-generate transparency pixmap in that case ! */ 513 /* we need to re-generate transparency pixmap in that case ! */
1076 transparent = make_transparency_pixmap (); 514 if (render_root_image ())
1077 if (transparent)
1078 bg_flags |= BG_IS_VALID; 515 bg_flags |= BG_IS_VALID;
1079 } 516 }
1080# endif 517# endif
1081 518
1082# ifdef BG_IMAGE_FROM_FILE 519# if BG_IMAGE_FROM_FILE
1083 if (bg_image.flags & IM_IS_SET) 520 if (fimage.img)
1084 { 521 {
1085 if (render_image (bg_image, transparent)) 522 if (render_image (fimage))
1086 bg_flags |= BG_IS_VALID; 523 bg_flags |= BG_IS_VALID;
1087 } 524 }
1088# endif 525# endif
1089 526
1090 if (!(bg_flags & BG_IS_VALID)) 527 if (!(bg_flags & BG_IS_VALID))
1091 { 528 {
1092 if (bg_pixmap != None) 529 delete bg_img;
1093 { 530 bg_img = 0;
1094 XFreePixmap (dpy, bg_pixmap);
1095 bg_pixmap = None;
1096 }
1097 } 531 }
1098 532
1099 scr_recolour (false); 533 scr_recolour (false);
1100 bg_flags |= BG_NEEDS_REFRESH; 534 bg_flags |= BG_NEEDS_REFRESH;
1101 535
1102 bg_valid_since = ev::now (); 536 bg_valid_since = ev::now ();
1103
1104 return true;
1105} 537}
1106 538
1107void 539void
1108rxvt_term::bg_init () 540rxvt_term::bg_init ()
1109{ 541{
1110#ifdef ENABLE_TRANSPARENCY 542#if ENABLE_TRANSPARENCY
1111 shade = 100; 543 if (option (Opt_transparent))
544 {
545 bg_set_transparent ();
546
547 if (rs [Rs_blurradius])
548 root_effects.set_blur (rs [Rs_blurradius]);
549
550 if (ISSET_PIXCOLOR (Color_tint))
551 root_effects.set_tint (pix_colors_focused [Color_tint]);
552
553 if (rs [Rs_shade])
554 root_effects.set_shade (rs [Rs_shade]);
555
556 bg_set_root_pixmap ();
557 XSelectInput (dpy, display->root, PropertyChangeMask);
558 rootwin_ev.start (display, display->root);
559 }
1112#endif 560#endif
1113 561
1114 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 562#if BG_IMAGE_FROM_FILE
1115#if XRENDER 563 if (rs[Rs_backgroundPixmap])
1116 int major, minor;
1117 if (XRenderQueryVersion (dpy, &major, &minor))
1118 bg_flags |= BG_HAS_RENDER;
1119 XFilters *filters = XRenderQueryFilters (dpy, vt);
1120 if (filters)
1121 { 564 {
1122 for (int i = 0; i < filters->nfilter; i++) 565 fimage.set_file_geometry (this, rs[Rs_backgroundPixmap]);
1123 if (!strcmp (filters->filter[i], FilterConvolution)) 566 if (!bg_window_position_sensitive ())
1124 bg_flags |= BG_HAS_RENDER_CONV; 567 update_background ();
1125
1126 XFree (filters);
1127 } 568 }
1128#endif 569#endif
1129} 570}
1130 571
1131#endif /* HAVE_BG_PIXMAP */
1132
1133#ifdef ENABLE_TRANSPARENCY
1134/* based on code from aterm-0.4.2 */
1135
1136static inline void
1137fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1138{
1139 for (int i = 0; i <= mask >> sh; i++)
1140 {
1141 uint32_t tmp;
1142 tmp = i * high;
1143 tmp += (mask >> sh) * low;
1144 lookup[i] = (tmp / 0xffff) << sh;
1145 }
1146}
1147
1148void 572void
1149rxvt_term::tint_ximage (XImage *ximage) 573rxvt_term::tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade)
1150{ 574{
1151 unsigned int size_r, size_g, size_b;
1152 int sh_r, sh_g, sh_b;
1153 uint32_t mask_r, mask_g, mask_b;
1154 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1155 unsigned short low;
1156 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1157
1158 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1159
1160 /* for convenience */
1161 mask_r = visual->red_mask;
1162 mask_g = visual->green_mask;
1163 mask_b = visual->blue_mask;
1164
1165 /* boring lookup table pre-initialization */
1166 sh_r = ecb_ctz32 (mask_r);
1167 sh_g = ecb_ctz32 (mask_g);
1168 sh_b = ecb_ctz32 (mask_b);
1169
1170 size_r = mask_r >> sh_r;
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)
1175 return;
1176
1177 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1178 lookup_r = lookup;
1179 lookup_g = lookup + size_r;
1180 lookup_b = lookup + size_r + size_g;
1181
1182 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 575 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1183 576
1184 if (bg_flags & BG_TINT_SET) 577 if (tint_set)
1185 tint.get (c); 578 tint.get (c);
1186 579
1187 /* prepare limits for color transformation (each channel is handled separately) */
1188 if (shade > 100) 580 if (shade > 100)
1189 { 581 {
1190 c.r = c.r * (200 - shade) / 100; 582 c.r = c.r * (200 - shade) / 100;
1191 c.g = c.g * (200 - shade) / 100; 583 c.g = c.g * (200 - shade) / 100;
1192 c.b = c.b * (200 - shade) / 100; 584 c.b = c.b * (200 - shade) / 100;
1193
1194 low = 0xffff * (shade - 100) / 100;
1195 } 585 }
1196 else 586 else
1197 { 587 {
1198 c.r = c.r * shade / 100; 588 c.r = c.r * shade / 100;
1199 c.g = c.g * shade / 100; 589 c.g = c.g * shade / 100;
1200 c.b = c.b * shade / 100; 590 c.b = c.b * shade / 100;
1201
1202 low = 0;
1203 }
1204
1205 /* fill our lookup tables */
1206 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1207 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1208 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1209
1210 /* apply table to input image (replacing colors by newly calculated ones) */
1211 if (ximage->bits_per_pixel == 32
1212 && ximage->byte_order == host_byte_order)
1213 { 591 }
1214 char *line = ximage->data;
1215 592
1216 for (int y = 0; y < ximage->height; y++) 593 img->contrast (c.r, c.g, c.b, c.a);
1217 { 594
1218 uint32_t *p = (uint32_t *)line; 595 if (shade > 100)
1219 for (int x = 0; x < ximage->width; x++)
1220 {
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;
1227 }
1228 } 596 {
1229 else 597 c.a = 0xffff;
598 c.r =
599 c.g =
600 c.b = 0xffff * (shade - 100) / 100;
601 img->brightness (c.r, c.g, c.b, c.a);
1230 { 602 }
1231 for (int y = 0; y < ximage->height; y++)
1232 for (int x = 0; x < ximage->width; x++)
1233 {
1234 unsigned long pixel = XGetPixel (ximage, x, y);
1235 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1236 lookup_g[(pixel & mask_g) >> sh_g] |
1237 lookup_b[(pixel & mask_b) >> sh_b];
1238 XPutPixel (ximage, x, y, pixel);
1239 }
1240 }
1241
1242 free (lookup);
1243} 603}
1244#endif /* ENABLE_TRANSPARENCY */ 604
605#endif /* HAVE_BG_PIXMAP */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines