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.124 by sf-exg, Tue Nov 23 16:37:36 2010 UTC vs.
Revision 1.138 by sf-exg, Thu Jan 20 17:39:29 2011 UTC

… …
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
31#endif 31#endif
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif
36
37#define DO_TIMING_TEST 0
38
39#if DO_TIMING_TEST
40# include <sys/time.h>
41#define TIMING_TEST_START(id) \
42 struct timeval timing_test_##id##_stv; \
43 gettimeofday (&timing_test_##id##_stv, NULL);
44
45#define TIMING_TEST_PRINT_RESULT(id) \
46 do { \
47 struct timeval tv; \
48 gettimeofday (&tv, NULL); \
49 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
50 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
51 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
52 } while (0)
53
54#else
55#define TIMING_TEST_START(id) do {} while (0)
56#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
57#endif 35#endif
58 36
59/* 37/*
60 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
61 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
… …
101#ifdef ENABLE_TRANSPARENCY 79#ifdef ENABLE_TRANSPARENCY
102 shade = 100; 80 shade = 100;
103#endif 81#endif
104 flags = 0; 82 flags = 0;
105 pixmap = None; 83 pixmap = None;
106 valid_since = invalid_since = 0; 84 valid_since = 0;
107 target = 0; 85 target = 0;
108 target_x = target_y = 0; 86 target_x = target_y = 0;
109} 87}
110 88
111void 89void
… …
172 if (flags & rootAlign) 150 if (flags & rootAlign)
173 return true; 151 return true;
174 } 152 }
175# endif 153# endif
176 154
177 return false;
178}
179
180bool bgPixmap_t::need_client_side_rendering ()
181{
182# ifdef HAVE_AFTERIMAGE
183 if (original_asim)
184 return true;
185# endif
186 return false; 155 return false;
187} 156}
188 157
189# ifdef BG_IMAGE_FROM_FILE 158# ifdef BG_IMAGE_FROM_FILE
190static inline bool 159static inline bool
… …
262 int x = 0, y = 0; 231 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 232 unsigned int w = 0, h = 0;
264 unsigned int n; 233 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 234 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *ops; 235 const char *ops;
267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
268 236
269 if (geom == NULL) 237 if (geom == NULL)
270 return false; 238 return false;
271 239
272 char str[MAXLEN_GEOM]; 240 char str[256];
273 241
274 ops = strchr (geom, ':'); 242 ops = strchr (geom, ':');
275 if (ops == NULL) 243 if (ops == NULL)
276 n = strlen (geom); 244 n = strlen (geom);
277 else 245 else
278 n = ops - geom; 246 n = ops - geom;
279 247
280 if (n >= MAXLEN_GEOM) 248 if (n >= sizeof (str))
281 return false; 249 return false;
282 250
283 memcpy (str, geom, n); 251 memcpy (str, geom, n);
284 str[n] = '\0'; 252 str[n] = '\0';
285 rxvt_strtrim (str); 253 rxvt_strtrim (str);
… …
307 geom_flags |= WidthValue|HeightValue|XValue|YValue; 275 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 } 276 }
309 277
310 if (ops) 278 if (ops)
311 { 279 {
312 while (*ops) 280 char **arr = rxvt_strsplit (':', ops + 1);
313 {
314 while (*ops == ':' || isspace(*ops)) ++ops;
315 281
316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 282 for (int i = 0; arr[i]; i++)
317 if (CHECK_GEOM_OPS ("tile")) 283 {
284 if (!strcasecmp (arr[i], "tile"))
318 { 285 {
319 w = h = noScale; 286 w = h = noScale;
320 geom_flags |= WidthValue|HeightValue; 287 geom_flags |= WidthValue|HeightValue;
321 } 288 }
322 else if (CHECK_GEOM_OPS ("propscale")) 289 else if (!strcasecmp (arr[i], "propscale"))
323 { 290 {
324 new_flags |= propScale; 291 new_flags |= propScale;
325 } 292 }
326 else if (CHECK_GEOM_OPS ("hscale")) 293 else if (!strcasecmp (arr[i], "hscale"))
327 { 294 {
328 if (w == 0) w = windowScale; 295 if (w == 0) w = windowScale;
329 296
330 h = noScale; 297 h = noScale;
331 geom_flags |= WidthValue|HeightValue; 298 geom_flags |= WidthValue|HeightValue;
332 } 299 }
333 else if (CHECK_GEOM_OPS ("vscale")) 300 else if (!strcasecmp (arr[i], "vscale"))
334 { 301 {
335 if (h == 0) h = windowScale; 302 if (h == 0) h = windowScale;
336 303
337 w = noScale; 304 w = noScale;
338 geom_flags |= WidthValue|HeightValue; 305 geom_flags |= WidthValue|HeightValue;
339 } 306 }
340 else if (CHECK_GEOM_OPS ("scale")) 307 else if (!strcasecmp (arr[i], "scale"))
341 { 308 {
342 if (h == 0) h = windowScale; 309 if (h == 0) h = windowScale;
343 if (w == 0) w = windowScale; 310 if (w == 0) w = windowScale;
344 311
345 geom_flags |= WidthValue|HeightValue; 312 geom_flags |= WidthValue|HeightValue;
346 } 313 }
347 else if (CHECK_GEOM_OPS ("auto")) 314 else if (!strcasecmp (arr[i], "auto"))
348 { 315 {
349 w = h = windowScale; 316 w = h = windowScale;
350 x = y = centerAlign; 317 x = y = centerAlign;
351 geom_flags |= WidthValue|HeightValue|XValue|YValue; 318 geom_flags |= WidthValue|HeightValue|XValue|YValue;
352 } 319 }
353 else if (CHECK_GEOM_OPS ("root")) 320 else if (!strcasecmp (arr[i], "root"))
354 { 321 {
355 new_flags |= rootAlign; 322 new_flags |= rootAlign;
356 w = h = noScale; 323 w = h = noScale;
357 geom_flags |= WidthValue|HeightValue; 324 geom_flags |= WidthValue|HeightValue;
358 } 325 }
359# undef CHECK_GEOM_OPS
360
361 while (*ops != ':' && *ops != '\0') ++ops;
362 } /* done parsing ops */ 326 } /* done parsing ops */
327
328 rxvt_free_strsplit (arr);
363 } 329 }
364 330
365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 331 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 332 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 333 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
… …
606 GC gc; 572 GC gc;
607 573
608 /* create Pixmap */ 574 /* create Pixmap */
609 if (pixmap == None 575 if (pixmap == None
610 || pmap_width != new_pmap_width 576 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height 577 || pmap_height != new_pmap_height)
612 || pmap_depth != target->depth)
613 { 578 {
614 if (pixmap) 579 if (pixmap)
615 XFreePixmap (target->dpy, pixmap); 580 XFreePixmap (target->dpy, pixmap);
616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 581 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
617 pmap_width = new_pmap_width; 582 pmap_width = new_pmap_width;
618 pmap_height = new_pmap_height; 583 pmap_height = new_pmap_height;
619 pmap_depth = target->depth;
620 } 584 }
621 /* fill with background color (if result's not completely overlapping it) */ 585 /* fill with background color (if result's not completely overlapping it) */
622 gcv.foreground = target->pix_colors[Color_bg]; 586 gcv.foreground = target->pix_colors[Color_bg];
623 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 587 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
624 588
… …
656 return ret; 620 return ret;
657} 621}
658# endif /* HAVE_AFTERIMAGE */ 622# endif /* HAVE_AFTERIMAGE */
659 623
660# ifdef HAVE_PIXBUF 624# ifdef HAVE_PIXBUF
625bool
626bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
627 int src_x, int src_y, int dst_x, int dst_y,
628 unsigned int width, unsigned int height)
629{
630 XImage *ximage;
631 char *data, *line;
632 int bytes_per_pixel;
633 int width_r, width_g, width_b;
634 int sh_r, sh_g, sh_b;
635 int rowstride;
636 int channels;
637 unsigned char *row;
638 Visual *visual = target->visual;
639 int depth = target->depth;
640
641 if (visual->c_class != TrueColor)
642 return false;
643
644 if (depth == 24 || depth == 32)
645 bytes_per_pixel = 4;
646 else if (depth == 15 || depth == 16)
647 bytes_per_pixel = 2;
648 else
649 return false;
650
651 width_r = rxvt_popcount (visual->red_mask);
652 width_g = rxvt_popcount (visual->green_mask);
653 width_b = rxvt_popcount (visual->blue_mask);
654
655 if (width_r > 8 || width_g > 8 || width_b > 8)
656 return false;
657
658 sh_r = rxvt_ctz (visual->red_mask);
659 sh_g = rxvt_ctz (visual->green_mask);
660 sh_b = rxvt_ctz (visual->blue_mask);
661
662 if (width > INT_MAX / height / bytes_per_pixel)
663 return false;
664
665 data = (char *)malloc (width * height * bytes_per_pixel);
666 if (!data)
667 return false;
668
669 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
670 width, height, bytes_per_pixel * 8, 0);
671 if (!ximage)
672 {
673 free (data);
674 return false;
675 }
676
677 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
678
679 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
680 channels = gdk_pixbuf_get_n_channels (pixbuf);
681 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
682 line = data;
683
684 for (int y = 0; y < height; y++)
685 {
686 for (int x = 0; x < width; x++)
687 {
688 unsigned char *pixel = row + x * channels;
689 uint32_t value;
690
691 value = ((pixel[0] >> (8 - width_r)) << sh_r)
692 | ((pixel[1] >> (8 - width_g)) << sh_g)
693 | ((pixel[2] >> (8 - width_b)) << sh_b);
694
695 if (bytes_per_pixel == 4)
696 ((uint32_t *)line)[x] = value;
697 else
698 ((uint16_t *)line)[x] = value;
699 }
700
701 row += rowstride;
702 line += ximage->bytes_per_line;
703 }
704
705 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
706 XDestroyImage (ximage);
707 return true;
708}
709
661bool 710bool
662bgPixmap_t::render_image (unsigned long background_flags) 711bgPixmap_t::render_image (unsigned long background_flags)
663{ 712{
664 if (target == NULL) 713 if (target == NULL)
665 return false; 714 return false;
… …
730 } 779 }
731 } 780 }
732 781
733 if (pixmap == None 782 if (pixmap == None
734 || pmap_width != new_pmap_width 783 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height 784 || pmap_height != new_pmap_height)
736 || pmap_depth != target->depth)
737 { 785 {
738 if (pixmap) 786 if (pixmap)
739 XFreePixmap (target->dpy, pixmap); 787 XFreePixmap (target->dpy, pixmap);
740 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 788 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
741 pmap_width = new_pmap_width; 789 pmap_width = new_pmap_width;
742 pmap_height = new_pmap_height; 790 pmap_height = new_pmap_height;
743 pmap_depth = target->depth;
744 } 791 }
745 792
746 gcv.foreground = target->pix_colors[Color_bg]; 793 gcv.foreground = target->pix_colors[Color_bg];
747 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 794 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
748 795
749 if (h_scale == 0 || v_scale == 0) 796 if (h_scale == 0 || v_scale == 0)
750 { 797 {
751 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 798 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
752 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 799 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 800 0, 0,
754 0, 0, 801 0, 0,
755 image_width, image_height, 802 image_width, image_height);
756 XLIB_RGB_DITHER_NONE,
757 0, 0);
758 803
759 gcv.tile = tile; 804 gcv.tile = tile;
760 gcv.fill_style = FillTiled; 805 gcv.fill_style = FillTiled;
761 gcv.ts_x_origin = x; 806 gcv.ts_x_origin = x;
762 gcv.ts_y_origin = y; 807 gcv.ts_y_origin = y;
… …
777 || dst_x + dst_width < new_pmap_width 822 || dst_x + dst_width < new_pmap_width
778 || dst_y + dst_height < new_pmap_height) 823 || dst_y + dst_height < new_pmap_height)
779 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 824 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
780 825
781 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 826 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
782 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 827 pixbuf_to_pixmap (result, pixmap, gc,
783 src_x, src_y, 828 src_x, src_y,
784 dst_x, dst_y, 829 dst_x, dst_y,
785 dst_width, dst_height, 830 dst_width, dst_height);
786 XLIB_RGB_DITHER_NONE,
787 0, 0);
788 } 831 }
789 832
790#if XRENDER 833#if XRENDER
791 if (background_flags) 834 if (background_flags)
792 { 835 {
… …
859 if (image) 902 if (image)
860 { 903 {
861 if (original_asim) 904 if (original_asim)
862 safe_asimage_destroy (original_asim); 905 safe_asimage_destroy (original_asim);
863 original_asim = image; 906 original_asim = image;
907 flags |= CLIENT_RENDER;
864 have_image = true; 908 have_image = true;
865 return true; 909 return true;
866 } 910 }
867# endif 911# endif
868 912
… …
940 bool has_shade = shade != 100; 984 bool has_shade = shade != 100;
941 985
942 if (tint) 986 if (tint)
943 { 987 {
944 tint->get (c); 988 tint->get (c);
945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
946 if (!has_shade 989 if (!has_shade
947 && IS_COMPONENT_WHOLESOME (c.r) 990 && (c.r <= 0x00ff || c.r >= 0xff00)
948 && IS_COMPONENT_WHOLESOME (c.g) 991 && (c.g <= 0x00ff || c.g >= 0xff00)
949 && IS_COMPONENT_WHOLESOME (c.b)) 992 && (c.b <= 0x00ff || c.b >= 0xff00))
950 flags |= bgPixmap_t::tintWholesome; 993 flags |= bgPixmap_t::tintWholesome;
951# undef IS_COMPONENT_WHOLESOME
952 } 994 }
953 995
954 if (has_shade || tint) 996 if (has_shade || tint)
955 flags |= bgPixmap_t::tintNeeded; 997 flags |= bgPixmap_t::tintNeeded;
956 998
… …
963 if (!(flags & tintSet) || tint != new_tint) 1005 if (!(flags & tintSet) || tint != new_tint)
964 { 1006 {
965 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1007 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
966 tint = new_tint; 1008 tint = new_tint;
967 flags = (flags & ~tintFlags) | new_flags | tintSet; 1009 flags = (flags & ~tintFlags) | new_flags | tintSet;
968 return true;
969 }
970
971 return false;
972}
973
974bool
975bgPixmap_t::unset_tint ()
976{
977 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
978
979 if (new_flags != (flags & tintFlags))
980 {
981 flags = (flags & ~tintFlags) | new_flags;
982 return true; 1010 return true;
983 } 1011 }
984 1012
985 return false; 1013 return false;
986} 1014}
… …
1131 c.g = (c.g * shade) / 100; 1159 c.g = (c.g * shade) / 100;
1132 c.b = (c.b * shade) / 100; 1160 c.b = (c.b * shade) / 100;
1133 } 1161 }
1134 else 1162 else
1135 { 1163 {
1136 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1164 c.r = (c.r * (200 - shade)) / 100;
1137 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1165 c.g = (c.g * (200 - shade)) / 100;
1138 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1166 c.b = (c.b * (200 - shade)) / 100;
1139 } 1167 }
1140 1168
1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1169 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1170 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143 XRenderPictureAttributes pa; 1171 XRenderPictureAttributes pa;
… …
1157 1185
1158 if (mask_pic && overlay_pic && back_pic) 1186 if (mask_pic && overlay_pic && back_pic)
1159 { 1187 {
1160 XRenderColor mask_c; 1188 XRenderColor mask_c;
1161 1189
1162 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1190 mask_c.red = mask_c.green = mask_c.blue = 0;
1163 mask_c.alpha = 0xffff; 1191 mask_c.alpha = 0xffff;
1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1192 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1165 1193
1166 mask_c.alpha = 0; 1194 mask_c.alpha = 0;
1167 mask_c.red = 0xffff - c.r; 1195 mask_c.red = 0xffff - c.r;
1168 mask_c.green = 0xffff - c.g; 1196 mask_c.green = 0xffff - c.g;
1169 mask_c.blue = 0xffff - c.b; 1197 mask_c.blue = 0xffff - c.b;
1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1198 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1171 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1199 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1200
1201 if (shade > 100)
1202 {
1203 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1204 mask_c.alpha = 0;
1205 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1206
1207 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1208 }
1209
1172 ret = true; 1210 ret = true;
1173 } 1211 }
1174 1212
1175 XRenderFreePicture (dpy, mask_pic); 1213 XRenderFreePicture (dpy, mask_pic);
1176 XRenderFreePicture (dpy, overlay_pic); 1214 XRenderFreePicture (dpy, overlay_pic);
… …
1265 } 1303 }
1266 1304
1267 if (root_pixmap == None) 1305 if (root_pixmap == None)
1268 return 0; 1306 return 0;
1269 1307
1308 if (pixmap == None
1309 || pmap_width != window_width
1310 || pmap_height != window_height)
1311 {
1312 if (pixmap)
1313 XFreePixmap (target->dpy, pixmap);
1270 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1314 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1315 pmap_width = window_width;
1316 pmap_height = window_height;
1317 }
1271 1318
1272 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1319 if (pixmap == None)
1273 return 0; 1320 return 0;
1274 1321
1275 /* straightforward pixmap copy */ 1322 /* straightforward pixmap copy */
1276 while (sx < 0) sx += (int)root_width; 1323 while (sx < 0) sx += (int)root_width;
1277 while (sy < 0) sy += (int)root_height; 1324 while (sy < 0) sy += (int)root_height;
… …
1282 gcv.ts_y_origin = -sy; 1329 gcv.ts_y_origin = -sy;
1283 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1330 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1284 1331
1285 if (gc) 1332 if (gc)
1286 { 1333 {
1287 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1334 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1288 result |= transpPmapTiled; 1335 result |= transpPmapTiled;
1289 XFreeGC (dpy, gc); 1336 XFreeGC (dpy, gc);
1290 1337
1291 if (!need_client_side_rendering ()) 1338 if (!(flags & CLIENT_RENDER))
1292 { 1339 {
1293 if ((flags & blurNeeded) 1340 if ((flags & blurNeeded)
1294 && (flags & HAS_RENDER_CONV)) 1341 && (flags & HAS_RENDER_CONV))
1295 { 1342 {
1296 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1343 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1297 result |= transpPmapBlurred; 1344 result |= transpPmapBlurred;
1298 } 1345 }
1299 if ((flags & tintNeeded) 1346 if ((flags & tintNeeded)
1300 && (flags & (tintWholesome | HAS_RENDER))) 1347 && (flags & (tintWholesome | HAS_RENDER)))
1301 { 1348 {
1302 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1349 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1303 result |= transpPmapTinted; 1350 result |= transpPmapTinted;
1304 } 1351 }
1305 } /* server side rendering completed */ 1352 } /* server side rendering completed */
1306
1307 if (pixmap)
1308 XFreePixmap (dpy, pixmap);
1309
1310 pixmap = tiled_root_pmap;
1311 pmap_width = window_width;
1312 pmap_height = window_height;
1313 pmap_depth = target->depth;
1314 } 1353 }
1315 else
1316 XFreePixmap (dpy, tiled_root_pmap);
1317 1354
1318 if (recoded_root_pmap != root_pixmap) 1355 if (recoded_root_pmap != root_pixmap)
1319 XFreePixmap (dpy, recoded_root_pmap); 1356 XFreePixmap (dpy, recoded_root_pmap);
1320 1357
1321 return result; 1358 return result;
1322} 1359}
1323 1360
1324void 1361void
1325bgPixmap_t::set_root_pixmap () 1362bgPixmap_t::set_root_pixmap ()
1326{ 1363{
1327 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1364 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1328 if (new_root_pixmap == None) 1365 if (new_root_pixmap == None)
1329 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1366 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1330 1367
1331 root_pixmap = new_root_pixmap; 1368 root_pixmap = new_root_pixmap;
1332} 1369}
1333# endif /* ENABLE_TRANSPARENCY */ 1370# endif /* ENABLE_TRANSPARENCY */
1334 1371
1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1372#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1373static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1337# endif 1374# endif
1338 1375
1339bool 1376bool
1340bgPixmap_t::render () 1377bgPixmap_t::render ()
1341{ 1378{
… …
1380 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1417 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1381 { 1418 {
1382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1419 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1383 if (flags & tintSet) 1420 if (flags & tintSet)
1384 tint.get (c); 1421 tint.get (c);
1385 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1422 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1386 } 1423 }
1387 1424
1388 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1425 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1389 1426
1390 if (gc) 1427 if (gc)
… …
1406 XFreePixmap (target->dpy, pixmap); 1443 XFreePixmap (target->dpy, pixmap);
1407 pixmap = None; 1444 pixmap = None;
1408 } 1445 }
1409 } 1446 }
1410 1447
1411 apply (); 1448 target->scr_recolour (false);
1449 flags |= hasChanged;
1412 1450
1413 valid_since = ev::now (); 1451 valid_since = ev::now ();
1414 1452
1415 return true; 1453 return true;
1416} 1454}
… …
1435 XFree (filters); 1473 XFree (filters);
1436 } 1474 }
1437#endif 1475#endif
1438} 1476}
1439 1477
1440void
1441bgPixmap_t::apply ()
1442{
1443 if (target == NULL)
1444 return;
1445
1446 if (pixmap != None)
1447 {
1448 /* set target's background to pixmap */
1449# ifdef ENABLE_TRANSPARENCY
1450 if (flags & isTransparent)
1451 {
1452 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1453 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1454
1455 if (target->scrollBar.win)
1456 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1457 }
1458 else
1459# endif
1460 {
1461 /* force old pixmap dereference in case it was transparent before :*/
1462 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1463 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1464 /* do we also need to set scrollbar's background here ? */
1465
1466 if (target->scrollBar.win)
1467 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1468 }
1469 }
1470 else
1471 {
1472 /* set target background to a pixel */
1473 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1474 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1475 /* do we also need to set scrollbar's background here ? */
1476 if (target->scrollBar.win)
1477 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1478 }
1479
1480 /* don't want Expose on the parent or vt. It is better to use
1481 scr_touch or we get a great deal of flicker otherwise: */
1482 XClearWindow (target->dpy, target->parent[0]);
1483
1484 if (target->scrollBar.state && target->scrollBar.win)
1485 {
1486 target->scrollBar.state = STATE_IDLE;
1487 target->scrollBar.show (0);
1488 }
1489
1490 target->want_refresh = 1;
1491 flags |= hasChanged;
1492}
1493
1494#endif /* HAVE_BG_PIXMAP */ 1478#endif /* HAVE_BG_PIXMAP */
1495 1479
1496#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1480#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1497/* taken from aterm-0.4.2 */ 1481/* taken from aterm-0.4.2 */
1498 1482
1499static void 1483static void
1500ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1484shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1501{ 1485{
1502 int sh_r, sh_g, sh_b; 1486 int sh_r, sh_g, sh_b;
1503 uint32_t mask_r, mask_g, mask_b; 1487 uint32_t mask_r, mask_g, mask_b;
1504 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1488 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1505 rgba low; 1489 rgba low;
1506 rgba high; 1490 rgba high;
1507 int i; 1491 int i;
1508 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1492 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1509 1493
1510 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1494 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1511 1495
1512 /* for convenience */ 1496 /* for convenience */
1513 mask_r = visual->red_mask; 1497 mask_r = visual->red_mask;
1514 mask_g = visual->green_mask; 1498 mask_g = visual->green_mask;
1515 mask_b = visual->blue_mask; 1499 mask_b = visual->blue_mask;
1516 1500
1517 /* boring lookup table pre-initialization */ 1501 /* boring lookup table pre-initialization */
1518 switch (srcImage->depth) 1502 switch (ximage->depth)
1519 { 1503 {
1520 case 15: 1504 case 15:
1521 if ((mask_r != 0x7c00) || 1505 if ((mask_r != 0x7c00) ||
1522 (mask_g != 0x03e0) || 1506 (mask_g != 0x03e0) ||
1523 (mask_b != 0x001f)) 1507 (mask_b != 0x001f))
… …
1576 /* prepare limits for color transformation (each channel is handled separately) */ 1560 /* prepare limits for color transformation (each channel is handled separately) */
1577 if (shade > 100) 1561 if (shade > 100)
1578 { 1562 {
1579 shade = 200 - shade; 1563 shade = 200 - shade;
1580 1564
1581 high.r = (65535 - c.r) * shade / 100; 1565 high.r = c.r * shade / 100;
1582 high.g = (65535 - c.g) * shade / 100; 1566 high.g = c.g * shade / 100;
1583 high.b = (65535 - c.b) * shade / 100; 1567 high.b = c.b * shade / 100;
1584 1568
1585 low.r = 65535 - high.r; 1569 low.r = 65535 * (100 - shade) / 100;
1586 low.g = 65535 - high.g; 1570 low.g = 65535 * (100 - shade) / 100;
1587 low.b = 65535 - high.b; 1571 low.b = 65535 * (100 - shade) / 100;
1588 } 1572 }
1589 else 1573 else
1590 { 1574 {
1591 high.r = c.r * shade / 100; 1575 high.r = c.r * shade / 100;
1592 high.g = c.g * shade / 100; 1576 high.g = c.g * shade / 100;
… …
1617 tmp += (mask_b>>sh_b) * low.b; 1601 tmp += (mask_b>>sh_b) * low.b;
1618 lookup_b[i] = (tmp/65535)<<sh_b; 1602 lookup_b[i] = (tmp/65535)<<sh_b;
1619 } 1603 }
1620 1604
1621 /* apply table to input image (replacing colors by newly calculated ones) */ 1605 /* apply table to input image (replacing colors by newly calculated ones) */
1622 if (srcImage->bits_per_pixel == 32 1606 if (ximage->bits_per_pixel == 32
1623 && (srcImage->depth == 24 || srcImage->depth == 32) 1607 && (ximage->depth == 24 || ximage->depth == 32)
1624 && srcImage->byte_order == host_byte_order) 1608 && ximage->byte_order == host_byte_order)
1625 { 1609 {
1626 uint32_t *p1, *pf, *p, *pl; 1610 uint32_t *p1, *pf, *p, *pl;
1627 p1 = (uint32_t *) srcImage->data; 1611 p1 = (uint32_t *) ximage->data;
1628 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1612 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1629 1613
1630 while (p1 < pf) 1614 while (p1 < pf)
1631 { 1615 {
1632 p = p1; 1616 p = p1;
1633 pl = p1 + srcImage->width; 1617 pl = p1 + ximage->width;
1634 for (; p < pl; p++) 1618 for (; p < pl; p++)
1635 { 1619 {
1636 *p = lookup_r[(*p & 0xff0000) >> 16] | 1620 *p = lookup_r[(*p & 0xff0000) >> 16] |
1637 lookup_g[(*p & 0x00ff00) >> 8] | 1621 lookup_g[(*p & 0x00ff00) >> 8] |
1638 lookup_b[(*p & 0x0000ff)] | 1622 lookup_b[(*p & 0x0000ff)] |
1639 (*p & 0xff000000); 1623 (*p & 0xff000000);
1640 } 1624 }
1641 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1625 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1642 } 1626 }
1643 } 1627 }
1644 else 1628 else
1645 { 1629 {
1646 for (int y = 0; y < srcImage->height; y++) 1630 for (int y = 0; y < ximage->height; y++)
1647 for (int x = 0; x < srcImage->width; x++) 1631 for (int x = 0; x < ximage->width; x++)
1648 { 1632 {
1649 unsigned long pixel = XGetPixel (srcImage, x, y); 1633 unsigned long pixel = XGetPixel (ximage, x, y);
1650 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1634 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1651 lookup_g[(pixel & mask_g) >> sh_g] | 1635 lookup_g[(pixel & mask_g) >> sh_g] |
1652 lookup_b[(pixel & mask_b) >> sh_b]; 1636 lookup_b[(pixel & mask_b) >> sh_b];
1653 XPutPixel (srcImage, x, y, pixel); 1637 XPutPixel (ximage, x, y, pixel);
1654 } 1638 }
1655 } 1639 }
1656 1640
1657 free (lookup); 1641 free (lookup);
1658} 1642}

Diff Legend

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