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.218 by sf-exg, Mon May 21 12:29:22 2012 UTC vs.
Revision 1.243 by sf-exg, Sun Jun 17 17:06:47 2012 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C
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>
… …
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;
… …
291 h_align = x; 246 h_align = x;
292 v_align = y; 247 v_align = y;
293 changed = true; 248 changed = true;
294 } 249 }
295 250
296 if (!(flags & IM_TILE) 251 if (is_size_sensitive ())
297 || h_scale || v_scale
298 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
299 flags |= IM_IS_SIZE_SENSITIVE; 252 flags |= IM_IS_SIZE_SENSITIVE;
300 else 253 else
301 flags &= ~IM_IS_SIZE_SENSITIVE; 254 flags &= ~IM_IS_SIZE_SENSITIVE;
302 255
303 return changed; 256 return changed;
304} 257}
305 258
306void 259void
307rxvt_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)
308{ 261{
309 int image_width = image.width (); 262 int image_width = image.img->w;
310 int image_height = image.height (); 263 int image_height = image.img->h;
311 int target_width = szHint.width; 264 int parent_width = szHint.width;
312 int target_height = szHint.height; 265 int parent_height = szHint.height;
313 int h_scale = min (image.h_scale, 32767 * 100 / target_width); 266 int h_scale = min (image.h_scale, 32767 * 100 / parent_width);
314 int v_scale = min (image.v_scale, 32767 * 100 / target_height); 267 int v_scale = min (image.v_scale, 32767 * 100 / parent_height);
315 268
316 w = h_scale * target_width / 100; 269 w = h_scale * parent_width / 100;
317 h = 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, bool argb)
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;
356
357 if (visual->c_class != TrueColor)
358 return false;
359
360 if (argb)
361 { 292 }
362 red_mask = 0xff << 16;
363 green_mask = 0xff << 8;
364 blue_mask = 0xff;
365 alpha_mask = 0xff << 24;
366 }
367 else
368 {
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);
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)
435 {
436 a = pixel[3];
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);
458 }
459
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} 293}
468 294
469bool 295bool
470rxvt_term::render_image (rxvt_image &image) 296rxvt_term::render_image (rxvt_image &image)
471{ 297{
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);
486
487 int target_width = szHint.width; 298 int parent_width = szHint.width;
488 int target_height = szHint.height; 299 int parent_height = szHint.height;
489 int new_pmap_width = target_width;
490 int new_pmap_height = target_height;
491 300
492 int x = 0; 301 int x = 0;
493 int y = 0; 302 int y = 0;
494 int w = 0; 303 int w = 0;
495 int h = 0; 304 int h = 0;
496 305
497 get_image_geometry (image, w, h, x, y); 306 get_image_geometry (image, w, h, x, y);
498 307
499 if (!(image.flags & IM_ROOT_ALIGN) 308 if (!(image.flags & IM_ROOT_ALIGN)
500 && (x >= target_width 309 && (x >= parent_width
501 || y >= target_height 310 || y >= parent_height
502 || x + w <= 0 311 || x + w <= 0
503 || y + h <= 0)) 312 || y + h <= 0))
504 return false; 313 return false;
505 314
506 result = pixbuf; 315 rxvt_img *img = image.img->scale (w, h);
507 316
508 if (w != image_width 317 if (image.flags & IM_TILE)
509 || h != image_height) 318 img->repeat_mode (RepeatNormal);
510 {
511 result = gdk_pixbuf_scale_simple (pixbuf,
512 w, h,
513 GDK_INTERP_BILINEAR);
514 }
515
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 319 else
531 { 320 img->repeat_mode (RepeatNone);
532 if (image.flags & IM_TILE) 321 img->sub_rect (-x, -y, parent_width, parent_height)->replace (img);
533 {
534 new_pmap_width = min (image_width, target_width);
535 new_pmap_height = min (image_height, target_height);
536 }
537 322
538 if (bg_pixmap == None 323 if (bg_flags & BG_IS_VALID)
539 || bg_pmap_width != new_pmap_width
540 || bg_pmap_height != new_pmap_height)
541 {
542 if (bg_pixmap)
543 XFreePixmap (dpy, bg_pixmap);
544 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
545 bg_pmap_width = new_pmap_width;
546 bg_pmap_height = new_pmap_height;
547 }
548
549 tmp_pixmap = bg_pixmap;
550 } 324 {
551 325 double factor = image.alpha * 1. / 0xffff;
552 gcv.foreground = pix_colors[Color_bg]; 326 bg_img->blend (img, factor)->replace (img);
553 gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
554
555 if (gc)
556 { 327 }
557 if (image.flags & IM_TILE)
558 {
559 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
560 pixbuf_to_pixmap (result, tile, gc,
561 0, 0,
562 0, 0,
563 image_width, image_height, need_blend);
564 328
565 gcv.tile = tile;
566 gcv.fill_style = FillTiled;
567 gcv.ts_x_origin = x;
568 gcv.ts_y_origin = y;
569 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
570
571 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
572 XFreePixmap (dpy, tile);
573 }
574 else
575 {
576 int src_x, src_y, dst_x, dst_y;
577 int dst_width, dst_height;
578
579 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
580 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
581
582 if (dst_x > 0 || dst_y > 0
583 || dst_x + dst_width < new_pmap_width
584 || dst_y + dst_height < new_pmap_height)
585 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
586
587 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
588 pixbuf_to_pixmap (result, tmp_pixmap, gc,
589 src_x, src_y,
590 dst_x, dst_y,
591 dst_width, dst_height, need_blend);
592 }
593
594#if XRENDER
595 if (need_blend)
596 {
597 XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
598 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 329 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
330 img->convert_format (format, pix_colors [Color_bg])->replace (img);
599 331
600 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0); 332 delete bg_img;
333 bg_img = img;
601 334
602 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
603
604 Picture mask = create_xrender_mask (dpy, vt, False, False);
605
606 XRenderColor mask_c;
607
608 mask_c.alpha = 0x8000;
609 mask_c.red =
610 mask_c.green =
611 mask_c.blue = 0;
612 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
613
614 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
615
616 XRenderFreePicture (dpy, src);
617 XRenderFreePicture (dpy, dst);
618 XRenderFreePicture (dpy, mask);
619 }
620#endif
621
622 XFreeGC (dpy, gc);
623
624 ret = true;
625 }
626
627 if (result != pixbuf)
628 g_object_unref (result);
629
630 if (need_blend)
631 XFreePixmap (dpy, tmp_pixmap);
632
633 return ret; 335 return true;
634} 336}
635# endif /* HAVE_PIXBUF */
636 337
637bool 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
638rxvt_image::set_file (const char *file) 351rxvt_image::set_file_geometry (rxvt_screen *s, const char *file)
639{ 352{
640 if (!file || !*file) 353 if (!file || !*file)
641 return false; 354 return;
642 355
643 bool ret = false;
644 const char *p = strchr (file, ';'); 356 const char *p = strchr (file, ';');
645 357
646 if (p) 358 if (p)
647 { 359 {
648 size_t len = p - file; 360 size_t len = p - file;
… …
650 memcpy (f, file, len); 362 memcpy (f, file, len);
651 f[len] = '\0'; 363 f[len] = '\0';
652 file = f; 364 file = f;
653 } 365 }
654 366
655# ifdef HAVE_PIXBUF 367 set_file (s, file);
656 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 368 alpha = 0x8000;
657 if (image)
658 {
659 if (pixbuf)
660 g_object_unref (pixbuf);
661 pixbuf = image;
662 ret = true;
663 }
664# endif
665
666 if (ret)
667 {
668 flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE;
669 h_scale = v_scale = defaultScale;
670 h_align = v_align = defaultAlign;
671
672 if (p)
673 set_geometry (p + 1); 369 set_geometry (p ? p + 1 : "");
674 } 370}
675 371
676 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;
677} 378}
678 379
679# endif /* BG_IMAGE_FROM_FILE */ 380# endif /* BG_IMAGE_FROM_FILE */
680 381
681# ifdef ENABLE_TRANSPARENCY
682bool 382bool
683rxvt_term::bg_set_blur (const char *geom) 383image_effects::set_blur (const char *geom)
684{ 384{
685 bool changed = false; 385 bool changed = false;
686 unsigned int hr, vr; 386 unsigned int hr, vr;
687 int junk; 387 int junk;
688 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 388 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
… …
709 409
710 return changed; 410 return changed;
711} 411}
712 412
713bool 413bool
714rxvt_term::bg_set_tint (rxvt_color &new_tint) 414image_effects::set_tint (const rxvt_color &new_tint)
715{ 415{
716 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 416 if (!tint_set || tint != new_tint)
717 { 417 {
718 tint = new_tint; 418 tint = new_tint;
719 bg_flags |= BG_TINT_SET; 419 tint_set = true;
720
721 rgba c;
722 tint.get (c);
723 if ((c.r <= 0x00ff || c.r >= 0xff00)
724 && (c.g <= 0x00ff || c.g >= 0xff00)
725 && (c.b <= 0x00ff || c.b >= 0xff00))
726 bg_flags |= BG_TINT_BITAND;
727 else
728 bg_flags &= ~BG_TINT_BITAND;
729 420
730 return true; 421 return true;
731 } 422 }
732 423
733 return false; 424 return false;
734} 425}
735 426
736bool 427bool
737rxvt_term::bg_set_shade (const char *shade_str) 428image_effects::set_shade (const char *shade_str)
738{ 429{
739 int new_shade = atoi (shade_str); 430 int new_shade = atoi (shade_str);
740 431
741 clamp_it (new_shade, -100, 200); 432 clamp_it (new_shade, -100, 200);
742 if (new_shade < 0) 433 if (new_shade < 0)
… …
749 } 440 }
750 441
751 return false; 442 return false;
752} 443}
753 444
754#if XRENDER 445# if ENABLE_TRANSPARENCY
755static void
756get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
757{
758 double sigma = radius / 2.0;
759 double scale = sqrt (2.0 * M_PI) * sigma;
760 double sum = 0.0;
761
762 for (int i = 0; i < width; i++)
763 {
764 double x = i - width / 2;
765 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
766 sum += kernel[i];
767 }
768
769 params[0] = XDoubleToFixed (width);
770 params[1] = XDoubleToFixed (1);
771
772 for (int i = 0; i < width; i++)
773 params[i+2] = XDoubleToFixed (kernel[i] / sum);
774}
775#endif
776
777bool
778rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
779{
780 bool ret = false;
781#if XRENDER
782 if (!(bg_flags & BG_HAS_RENDER_CONV))
783 return false;
784
785 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
786 double *kernel = (double *)malloc (size * sizeof (double));
787 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
788
789 XRenderPictureAttributes pa;
790 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
791
792 pa.repeat = RepeatPad;
793 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
794 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
795 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
796 XFreePixmap (dpy, tmp);
797
798 if (kernel && params)
799 {
800 size = h_blurRadius * 2 + 1;
801 get_gaussian_kernel (h_blurRadius, size, kernel, params);
802
803 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
804 XRenderComposite (dpy,
805 PictOpSrc,
806 src,
807 None,
808 dst,
809 0, 0,
810 0, 0,
811 0, 0,
812 width, height);
813
814 ::swap (src, dst);
815
816 size = v_blurRadius * 2 + 1;
817 get_gaussian_kernel (v_blurRadius, size, kernel, params);
818 ::swap (params[0], params[1]);
819
820 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
821 XRenderComposite (dpy,
822 PictOpSrc,
823 src,
824 None,
825 dst,
826 0, 0,
827 0, 0,
828 0, 0,
829 width, height);
830
831 ret = true;
832 }
833
834 free (kernel);
835 free (params);
836 XRenderFreePicture (dpy, src);
837 XRenderFreePicture (dpy, dst);
838#endif
839 return ret;
840}
841
842bool
843rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
844{
845 bool ret = false;
846
847 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
848 {
849 XGCValues gcv;
850 GC gc;
851
852 /* In this case we can tint image server-side getting significant
853 * performance improvements, as we eliminate XImage transfer
854 */
855 gcv.foreground = Pixel (tint);
856 gcv.function = GXand;
857 gcv.fill_style = FillSolid;
858 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
859 if (gc)
860 {
861 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
862 ret = true;
863 XFreeGC (dpy, gc);
864 }
865 }
866# if XRENDER
867 else if (bg_flags & BG_HAS_RENDER)
868 {
869 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
870
871 if (bg_flags & BG_TINT_SET)
872 tint.get (c);
873
874 if (shade <= 100)
875 {
876 c.r = c.r * shade / 100;
877 c.g = c.g * shade / 100;
878 c.b = c.b * shade / 100;
879 }
880 else
881 {
882 c.r = c.r * (200 - shade) / 100;
883 c.g = c.g * (200 - shade) / 100;
884 c.b = c.b * (200 - shade) / 100;
885 }
886
887 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
888
889 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
890
891 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
892
893 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
894
895 XRenderColor mask_c;
896
897 mask_c.alpha = 0xffff;
898 mask_c.red =
899 mask_c.green =
900 mask_c.blue = 0;
901 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
902
903 mask_c.alpha = 0;
904 mask_c.red = 0xffff - c.r;
905 mask_c.green = 0xffff - c.g;
906 mask_c.blue = 0xffff - c.b;
907 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
908
909 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
910
911 if (shade > 100)
912 {
913 mask_c.alpha = 0;
914 mask_c.red =
915 mask_c.green =
916 mask_c.blue = 0xffff * (shade - 100) / 100;
917 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
918
919 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
920 }
921
922 ret = true;
923
924 XRenderFreePicture (dpy, mask_pic);
925 XRenderFreePicture (dpy, overlay_pic);
926 XRenderFreePicture (dpy, back_pic);
927 }
928# endif
929
930 return ret;
931}
932
933/* 446/*
934 * 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
935 * 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
936 * our window. 449 * our window.
937 */ 450 */
938bool 451bool
939rxvt_term::make_transparency_pixmap () 452rxvt_term::render_root_image ()
940{ 453{
941 bool ret = false;
942
943 /* 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
944 * be always up-to-date, so let's use it : 455 * be always up-to-date, so let's use it :
945 */ 456 */
946 int screen = display->screen; 457 int screen = display->screen;
947 int root_depth = DefaultDepth (dpy, screen);
948 int root_width = DisplayWidth (dpy, screen); 458 int root_width = DisplayWidth (dpy, screen);
949 int root_height = DisplayHeight (dpy, screen); 459 int root_height = DisplayHeight (dpy, screen);
950 unsigned int root_pmap_width, root_pmap_height;
951 int window_width = szHint.width; 460 int parent_width = szHint.width;
952 int window_height = szHint.height; 461 int parent_height = szHint.height;
953 int sx, sy; 462 int sx, sy;
954 XGCValues gcv;
955 GC gc;
956 463
957 sx = target_x; 464 sx = parent_x;
958 sy = target_y; 465 sy = parent_y;
466
467 if (!root_img)
468 return false;
959 469
960 /* 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 : */
961 if (sx + window_width <= 0 || sy + window_height <= 0 471 if (sx + parent_width <= 0 || sy + parent_height <= 0
962 || sx >= root_width || sy >= root_height) 472 || sx >= root_width || sy >= root_height)
963 return 0; 473 return 0;
964 474
965 // validate root pixmap and get its size 475 while (sx < 0) sx += root_img->w;
966 if (root_pixmap != None) 476 while (sy < 0) sy += root_img->h;
967 {
968 Window wdummy;
969 int idummy;
970 unsigned int udummy;
971 477
972 allowedxerror = -1; 478 rxvt_img *img = root_img->sub_rect (sx, sy, parent_width, parent_height);
973 479
974 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) 480 if (root_effects.need_blur ())
975 root_pixmap = None; 481 img->blur (root_effects.h_blurRadius, root_effects.v_blurRadius)->replace (img);
976 482
977 allowedxerror = 0; 483 if (root_effects.need_tint ())
978 } 484 tint_image (img, root_effects.tint, root_effects.tint_set, root_effects.shade);
979 485
980 Pixmap recoded_root_pmap = root_pixmap;
981
982 if (root_pixmap != None && root_depth != depth)
983 {
984#if XRENDER
985 if (bg_flags & BG_HAS_RENDER)
986 {
987 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
988
989 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
990 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
991
992 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 486 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
993 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0); 487 img->convert_format (format, pix_colors [Color_bg])->replace (img);
994 488
995 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;
996 491
997 XRenderFreePicture (dpy, src);
998 XRenderFreePicture (dpy, dst);
999 }
1000 else
1001#endif
1002 recoded_root_pmap = None;
1003 }
1004
1005 if (recoded_root_pmap == None)
1006 return 0;
1007
1008 if (bg_pixmap == None
1009 || bg_pmap_width != window_width
1010 || bg_pmap_height != window_height)
1011 {
1012 if (bg_pixmap)
1013 XFreePixmap (dpy, bg_pixmap);
1014 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1015 bg_pmap_width = window_width;
1016 bg_pmap_height = window_height;
1017 }
1018
1019 /* straightforward pixmap copy */
1020 while (sx < 0) sx += root_pmap_width;
1021 while (sy < 0) sy += root_pmap_height;
1022
1023 gcv.tile = recoded_root_pmap;
1024 gcv.fill_style = FillTiled;
1025 gcv.ts_x_origin = -sx;
1026 gcv.ts_y_origin = -sy;
1027 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1028
1029 if (gc)
1030 {
1031 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
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
1062 XFreeGC (dpy, gc);
1063 }
1064
1065 if (recoded_root_pmap != root_pixmap)
1066 XFreePixmap (dpy, recoded_root_pmap);
1067
1068 return ret; 492 return true;
1069} 493}
1070 494
1071void 495void
1072rxvt_term::bg_set_root_pixmap () 496rxvt_term::bg_set_root_pixmap ()
1073{ 497{
1074 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]); 498 delete root_img;
1075 if (new_root_pixmap == None) 499 root_img = rxvt_img::new_from_root (this);
1076 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1077
1078 root_pixmap = new_root_pixmap;
1079} 500}
1080# endif /* ENABLE_TRANSPARENCY */ 501# endif /* ENABLE_TRANSPARENCY */
1081 502
1082bool 503void
1083rxvt_term::bg_render () 504rxvt_term::bg_render ()
1084{ 505{
506 if (bg_flags & BG_INHIBIT_RENDER)
507 return;
508
1085 bg_invalidate (); 509 bg_invalidate ();
1086# ifdef ENABLE_TRANSPARENCY 510# if ENABLE_TRANSPARENCY
1087 if (bg_flags & BG_IS_TRANSPARENT) 511 if (bg_flags & BG_IS_TRANSPARENT)
1088 { 512 {
1089 /* we need to re-generate transparency pixmap in that case ! */ 513 /* we need to re-generate transparency pixmap in that case ! */
1090 if (make_transparency_pixmap ()) 514 if (render_root_image ())
1091 bg_flags |= BG_IS_VALID; 515 bg_flags |= BG_IS_VALID;
1092 } 516 }
1093# endif 517# endif
1094 518
1095# ifdef BG_IMAGE_FROM_FILE 519# if BG_IMAGE_FROM_FILE
1096 if (bg_image.flags & IM_IS_SET) 520 if (fimage.img)
1097 { 521 {
1098 if (render_image (bg_image)) 522 if (render_image (fimage))
1099 bg_flags |= BG_IS_VALID; 523 bg_flags |= BG_IS_VALID;
1100 } 524 }
1101# endif 525# endif
1102 526
1103 if (!(bg_flags & BG_IS_VALID)) 527 if (!(bg_flags & BG_IS_VALID))
1104 { 528 {
1105 if (bg_pixmap != None) 529 delete bg_img;
1106 { 530 bg_img = 0;
1107 XFreePixmap (dpy, bg_pixmap);
1108 bg_pixmap = None;
1109 }
1110 } 531 }
1111 532
1112 scr_recolour (false); 533 scr_recolour (false);
1113 bg_flags |= BG_NEEDS_REFRESH; 534 bg_flags |= BG_NEEDS_REFRESH;
1114 535
1115 bg_valid_since = ev::now (); 536 bg_valid_since = ev::now ();
1116
1117 return true;
1118} 537}
1119 538
1120void 539void
1121rxvt_term::bg_init () 540rxvt_term::bg_init ()
1122{ 541{
1123#ifdef ENABLE_TRANSPARENCY 542#if ENABLE_TRANSPARENCY
1124 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 }
1125#endif 560#endif
1126 561
1127 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 562#if BG_IMAGE_FROM_FILE
1128#if XRENDER 563 if (rs[Rs_backgroundPixmap])
1129 int major, minor;
1130 if (XRenderQueryVersion (dpy, &major, &minor))
1131 bg_flags |= BG_HAS_RENDER;
1132 XFilters *filters = XRenderQueryFilters (dpy, vt);
1133 if (filters)
1134 { 564 {
1135 for (int i = 0; i < filters->nfilter; i++) 565 fimage.set_file_geometry (this, rs[Rs_backgroundPixmap]);
1136 if (!strcmp (filters->filter[i], FilterConvolution)) 566 if (!bg_window_position_sensitive ())
1137 bg_flags |= BG_HAS_RENDER_CONV; 567 update_background ();
1138
1139 XFree (filters);
1140 } 568 }
1141#endif 569#endif
1142} 570}
1143 571
1144#endif /* HAVE_BG_PIXMAP */
1145
1146#ifdef ENABLE_TRANSPARENCY
1147/* based on code from aterm-0.4.2 */
1148
1149static inline void
1150fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
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 572void
1162rxvt_term::tint_ximage (XImage *ximage) 573rxvt_term::tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade)
1163{ 574{
1164 unsigned int size_r, size_g, size_b;
1165 int sh_r, sh_g, sh_b;
1166 uint32_t mask_r, mask_g, mask_b;
1167 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1168 unsigned short low;
1169 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1170
1171 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1172
1173 /* for convenience */
1174 mask_r = visual->red_mask;
1175 mask_g = visual->green_mask;
1176 mask_b = visual->blue_mask;
1177
1178 /* boring lookup table pre-initialization */
1179 sh_r = ecb_ctz32 (mask_r);
1180 sh_g = ecb_ctz32 (mask_g);
1181 sh_b = ecb_ctz32 (mask_b);
1182
1183 size_r = mask_r >> sh_r;
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)
1188 return;
1189
1190 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1191 lookup_r = lookup;
1192 lookup_g = lookup + size_r;
1193 lookup_b = lookup + size_r + size_g;
1194
1195 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 575 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1196 576
1197 if (bg_flags & BG_TINT_SET) 577 if (tint_set)
1198 tint.get (c); 578 tint.get (c);
1199 579
1200 /* prepare limits for color transformation (each channel is handled separately) */
1201 if (shade > 100) 580 if (shade > 100)
1202 { 581 {
1203 c.r = c.r * (200 - shade) / 100; 582 c.r = c.r * (200 - shade) / 100;
1204 c.g = c.g * (200 - shade) / 100; 583 c.g = c.g * (200 - shade) / 100;
1205 c.b = c.b * (200 - shade) / 100; 584 c.b = c.b * (200 - shade) / 100;
1206
1207 low = 0xffff * (shade - 100) / 100;
1208 } 585 }
1209 else 586 else
1210 { 587 {
1211 c.r = c.r * shade / 100; 588 c.r = c.r * shade / 100;
1212 c.g = c.g * shade / 100; 589 c.g = c.g * shade / 100;
1213 c.b = c.b * shade / 100; 590 c.b = c.b * shade / 100;
1214
1215 low = 0;
1216 }
1217
1218 /* fill our lookup tables */
1219 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1220 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1221 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1222
1223 /* apply table to input image (replacing colors by newly calculated ones) */
1224 if (ximage->bits_per_pixel == 32
1225 && ximage->byte_order == host_byte_order)
1226 { 591 }
1227 char *line = ximage->data;
1228 592
1229 for (int y = 0; y < ximage->height; y++) 593 img->contrast (c.r, c.g, c.b, c.a);
1230 { 594
1231 uint32_t *p = (uint32_t *)line; 595 if (shade > 100)
1232 for (int x = 0; x < ximage->width; x++)
1233 {
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;
1240 }
1241 } 596 {
1242 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);
1243 { 602 }
1244 for (int y = 0; y < ximage->height; y++)
1245 for (int x = 0; x < ximage->width; x++)
1246 {
1247 unsigned long pixel = XGetPixel (ximage, x, y);
1248 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1249 lookup_g[(pixel & mask_g) >> sh_g] |
1250 lookup_b[(pixel & mask_b) >> sh_b];
1251 XPutPixel (ximage, x, y, pixel);
1252 }
1253 }
1254
1255 free (lookup);
1256} 603}
1257#endif /* ENABLE_TRANSPARENCY */ 604
605#endif /* HAVE_BG_PIXMAP */

Diff Legend

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