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.122 by sf-exg, Sat Nov 20 11:30:58 2010 UTC vs.
Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC

… …
175# endif 175# endif
176 176
177 return false; 177 return false;
178} 178}
179 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;
187}
188
189# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
190static inline bool 181static inline bool
191check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 182check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
192{ 183{
193 if (geom_flags & flag) 184 if (geom_flags & flag)
… …
262 int x = 0, y = 0; 253 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 254 unsigned int w = 0, h = 0;
264 unsigned int n; 255 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 256 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *ops; 257 const char *ops;
267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
268 258
269 if (geom == NULL) 259 if (geom == NULL)
270 return false; 260 return false;
271 261
272 char str[MAXLEN_GEOM]; 262 char str[256];
273 263
274 ops = strchr (geom, ':'); 264 ops = strchr (geom, ':');
275 if (ops == NULL) 265 if (ops == NULL)
276 n = strlen (geom); 266 n = strlen (geom);
277 else 267 else
278 n = ops - geom; 268 n = ops - geom;
279 269
280 if (n >= MAXLEN_GEOM) 270 if (n >= sizeof (str))
281 return false; 271 return false;
282 272
283 memcpy (str, geom, n); 273 memcpy (str, geom, n);
284 str[n] = '\0'; 274 str[n] = '\0';
285 rxvt_strtrim (str); 275 rxvt_strtrim (str);
… …
307 geom_flags |= WidthValue|HeightValue|XValue|YValue; 297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 } 298 }
309 299
310 if (ops) 300 if (ops)
311 { 301 {
312 while (*ops) 302 char **arr = rxvt_strsplit (':', ops + 1);
313 {
314 while (*ops == ':' || isspace(*ops)) ++ops;
315 303
316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 304 for (int i = 0; arr[i]; i++)
317 if (CHECK_GEOM_OPS ("tile")) 305 {
306 if (!strcasecmp (arr[i], "tile"))
318 { 307 {
319 w = h = noScale; 308 w = h = noScale;
320 geom_flags |= WidthValue|HeightValue; 309 geom_flags |= WidthValue|HeightValue;
321 } 310 }
322 else if (CHECK_GEOM_OPS ("propscale")) 311 else if (!strcasecmp (arr[i], "propscale"))
323 { 312 {
324 new_flags |= propScale; 313 new_flags |= propScale;
325 } 314 }
326 else if (CHECK_GEOM_OPS ("hscale")) 315 else if (!strcasecmp (arr[i], "hscale"))
327 { 316 {
328 if (w == 0) w = windowScale; 317 if (w == 0) w = windowScale;
329 318
330 h = noScale; 319 h = noScale;
331 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
332 } 321 }
333 else if (CHECK_GEOM_OPS ("vscale")) 322 else if (!strcasecmp (arr[i], "vscale"))
334 { 323 {
335 if (h == 0) h = windowScale; 324 if (h == 0) h = windowScale;
336 325
337 w = noScale; 326 w = noScale;
338 geom_flags |= WidthValue|HeightValue; 327 geom_flags |= WidthValue|HeightValue;
339 } 328 }
340 else if (CHECK_GEOM_OPS ("scale")) 329 else if (!strcasecmp (arr[i], "scale"))
341 { 330 {
342 if (h == 0) h = windowScale; 331 if (h == 0) h = windowScale;
343 if (w == 0) w = windowScale; 332 if (w == 0) w = windowScale;
344 333
345 geom_flags |= WidthValue|HeightValue; 334 geom_flags |= WidthValue|HeightValue;
346 } 335 }
347 else if (CHECK_GEOM_OPS ("auto")) 336 else if (!strcasecmp (arr[i], "auto"))
348 { 337 {
349 w = h = windowScale; 338 w = h = windowScale;
350 x = y = centerAlign; 339 x = y = centerAlign;
351 geom_flags |= WidthValue|HeightValue|XValue|YValue; 340 geom_flags |= WidthValue|HeightValue|XValue|YValue;
352 } 341 }
353 else if (CHECK_GEOM_OPS ("root")) 342 else if (!strcasecmp (arr[i], "root"))
354 { 343 {
355 new_flags |= rootAlign; 344 new_flags |= rootAlign;
356 w = h = noScale; 345 w = h = noScale;
357 geom_flags |= WidthValue|HeightValue; 346 geom_flags |= WidthValue|HeightValue;
358 } 347 }
359# undef CHECK_GEOM_OPS
360
361 while (*ops != ':' && *ops != '\0') ++ops;
362 } /* done parsing ops */ 348 } /* done parsing ops */
349
350 rxvt_free_strsplit (arr);
363 } 351 }
364 352
365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 353 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; 354 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; 355 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
… …
606 GC gc; 594 GC gc;
607 595
608 /* create Pixmap */ 596 /* create Pixmap */
609 if (pixmap == None 597 if (pixmap == None
610 || pmap_width != new_pmap_width 598 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height 599 || pmap_height != new_pmap_height)
612 || pmap_depth != target->depth)
613 { 600 {
614 if (pixmap) 601 if (pixmap)
615 XFreePixmap (target->dpy, pixmap); 602 XFreePixmap (target->dpy, pixmap);
616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 603 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
617 pmap_width = new_pmap_width; 604 pmap_width = new_pmap_width;
618 pmap_height = new_pmap_height; 605 pmap_height = new_pmap_height;
619 pmap_depth = target->depth;
620 } 606 }
621 /* fill with background color (if result's not completely overlapping it) */ 607 /* fill with background color (if result's not completely overlapping it) */
622 gcv.foreground = target->pix_colors[Color_bg]; 608 gcv.foreground = target->pix_colors[Color_bg];
623 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 609 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
624 610
… …
656 return ret; 642 return ret;
657} 643}
658# endif /* HAVE_AFTERIMAGE */ 644# endif /* HAVE_AFTERIMAGE */
659 645
660# ifdef HAVE_PIXBUF 646# ifdef HAVE_PIXBUF
647bool
648bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
649 int src_x, int src_y, int dst_x, int dst_y,
650 unsigned int width, unsigned int height)
651{
652 XImage *ximage;
653 char *data, *line;
654 int bytes_per_pixel;
655 int width_r, width_g, width_b;
656 int sh_r, sh_g, sh_b;
657 int rowstride;
658 int channels;
659 unsigned char *row;
660 Visual *visual = target->visual;
661 int depth = target->depth;
662
663 if (visual->c_class != TrueColor)
664 return false;
665
666 if (depth == 24 || depth == 32)
667 bytes_per_pixel = 4;
668 else if (depth == 15 || depth == 16)
669 bytes_per_pixel = 2;
670 else
671 return false;
672
673 width_r = rxvt_popcount (visual->red_mask);
674 width_g = rxvt_popcount (visual->green_mask);
675 width_b = rxvt_popcount (visual->blue_mask);
676
677 if (width_r > 8 || width_g > 8 || width_b > 8)
678 return false;
679
680 sh_r = rxvt_ctz (visual->red_mask);
681 sh_g = rxvt_ctz (visual->green_mask);
682 sh_b = rxvt_ctz (visual->blue_mask);
683
684 if (width > INT_MAX / height / bytes_per_pixel)
685 return false;
686
687 data = (char *)malloc (width * height * bytes_per_pixel);
688 if (!data)
689 return false;
690
691 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
692 width, height, bytes_per_pixel * 8, 0);
693 if (!ximage)
694 {
695 free (data);
696 return false;
697 }
698
699 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
700
701 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
702 channels = gdk_pixbuf_get_n_channels (pixbuf);
703 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
704 line = data;
705
706 for (int y = 0; y < height; y++)
707 {
708 for (int x = 0; x < width; x++)
709 {
710 unsigned char *pixel = row + x * channels;
711 uint32_t value;
712
713 value = ((pixel[0] >> (8 - width_r)) << sh_r)
714 | ((pixel[1] >> (8 - width_g)) << sh_g)
715 | ((pixel[2] >> (8 - width_b)) << sh_b);
716
717 if (bytes_per_pixel == 4)
718 ((uint32_t *)line)[x] = value;
719 else
720 ((uint16_t *)line)[x] = value;
721 }
722
723 row += rowstride;
724 line += ximage->bytes_per_line;
725 }
726
727 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
728 XDestroyImage (ximage);
729 return true;
730}
731
661bool 732bool
662bgPixmap_t::render_image (unsigned long background_flags) 733bgPixmap_t::render_image (unsigned long background_flags)
663{ 734{
664 if (target == NULL) 735 if (target == NULL)
665 return false; 736 return false;
… …
730 } 801 }
731 } 802 }
732 803
733 if (pixmap == None 804 if (pixmap == None
734 || pmap_width != new_pmap_width 805 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height 806 || pmap_height != new_pmap_height)
736 || pmap_depth != target->depth)
737 { 807 {
738 if (pixmap) 808 if (pixmap)
739 XFreePixmap (target->dpy, pixmap); 809 XFreePixmap (target->dpy, pixmap);
740 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 810 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
741 pmap_width = new_pmap_width; 811 pmap_width = new_pmap_width;
742 pmap_height = new_pmap_height; 812 pmap_height = new_pmap_height;
743 pmap_depth = target->depth;
744 } 813 }
745 814
746 gcv.foreground = target->pix_colors[Color_bg]; 815 gcv.foreground = target->pix_colors[Color_bg];
747 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 816 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
748 817
749 if (h_scale == 0 || v_scale == 0) 818 if (h_scale == 0 || v_scale == 0)
750 { 819 {
751 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 820 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
752 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 821 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 822 0, 0,
754 0, 0, 823 0, 0,
755 image_width, image_height, 824 image_width, image_height);
756 XLIB_RGB_DITHER_NONE,
757 0, 0);
758 825
759 gcv.tile = tile; 826 gcv.tile = tile;
760 gcv.fill_style = FillTiled; 827 gcv.fill_style = FillTiled;
761 gcv.ts_x_origin = x; 828 gcv.ts_x_origin = x;
762 gcv.ts_y_origin = y; 829 gcv.ts_y_origin = y;
… …
777 || dst_x + dst_width < new_pmap_width 844 || dst_x + dst_width < new_pmap_width
778 || dst_y + dst_height < new_pmap_height) 845 || dst_y + dst_height < new_pmap_height)
779 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
780 847
781 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
782 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 849 pixbuf_to_pixmap (result, pixmap, gc,
783 src_x, src_y, 850 src_x, src_y,
784 dst_x, dst_y, 851 dst_x, dst_y,
785 dst_width, dst_height, 852 dst_width, dst_height);
786 XLIB_RGB_DITHER_NONE,
787 0, 0);
788 } 853 }
789 854
790#if XRENDER 855#if XRENDER
791 if (background_flags) 856 if (background_flags)
792 { 857 {
… …
859 if (image) 924 if (image)
860 { 925 {
861 if (original_asim) 926 if (original_asim)
862 safe_asimage_destroy (original_asim); 927 safe_asimage_destroy (original_asim);
863 original_asim = image; 928 original_asim = image;
929 flags |= CLIENT_RENDER;
864 have_image = true; 930 have_image = true;
865 return true; 931 return true;
866 } 932 }
867# endif 933# endif
868 934
… …
940 bool has_shade = shade != 100; 1006 bool has_shade = shade != 100;
941 1007
942 if (tint) 1008 if (tint)
943 { 1009 {
944 tint->get (c); 1010 tint->get (c);
945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
946 if (!has_shade 1011 if (!has_shade
947 && IS_COMPONENT_WHOLESOME (c.r) 1012 && (c.r <= 0x00ff || c.r >= 0xff00)
948 && IS_COMPONENT_WHOLESOME (c.g) 1013 && (c.g <= 0x00ff || c.g >= 0xff00)
949 && IS_COMPONENT_WHOLESOME (c.b)) 1014 && (c.b <= 0x00ff || c.b >= 0xff00))
950 flags |= bgPixmap_t::tintWholesome; 1015 flags |= bgPixmap_t::tintWholesome;
951# undef IS_COMPONENT_WHOLESOME
952 } 1016 }
953 1017
954 if (has_shade) 1018 if (has_shade || tint)
955 flags |= bgPixmap_t::tintNeeded; 1019 flags |= bgPixmap_t::tintNeeded;
956 else if (tint)
957 {
958 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
959 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
960 {
961 flags |= bgPixmap_t::tintNeeded;
962 }
963 }
964 1020
965 return flags; 1021 return flags;
966} 1022}
967 1023
968bool 1024bool
… …
971 if (!(flags & tintSet) || tint != new_tint) 1027 if (!(flags & tintSet) || tint != new_tint)
972 { 1028 {
973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1029 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
974 tint = new_tint; 1030 tint = new_tint;
975 flags = (flags & ~tintFlags) | new_flags | tintSet; 1031 flags = (flags & ~tintFlags) | new_flags | tintSet;
976 return true;
977 }
978
979 return false;
980}
981
982bool
983bgPixmap_t::unset_tint ()
984{
985 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
986
987 if (new_flags != (flags & tintFlags))
988 {
989 flags = (flags & ~tintFlags) | new_flags;
990 return true; 1032 return true;
991 } 1033 }
992 1034
993 return false; 1035 return false;
994} 1036}
… …
1139 c.g = (c.g * shade) / 100; 1181 c.g = (c.g * shade) / 100;
1140 c.b = (c.b * shade) / 100; 1182 c.b = (c.b * shade) / 100;
1141 } 1183 }
1142 else 1184 else
1143 { 1185 {
1144 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1186 c.r = (c.r * (200 - shade)) / 100;
1145 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1187 c.g = (c.g * (200 - shade)) / 100;
1146 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1188 c.b = (c.b * (200 - shade)) / 100;
1147 } 1189 }
1148 1190
1149 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1191 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1192 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 XRenderPictureAttributes pa; 1193 XRenderPictureAttributes pa;
… …
1165 1207
1166 if (mask_pic && overlay_pic && back_pic) 1208 if (mask_pic && overlay_pic && back_pic)
1167 { 1209 {
1168 XRenderColor mask_c; 1210 XRenderColor mask_c;
1169 1211
1170 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1212 mask_c.red = mask_c.green = mask_c.blue = 0;
1171 mask_c.alpha = 0xffff; 1213 mask_c.alpha = 0xffff;
1172 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1214 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1173 1215
1174 mask_c.alpha = 0; 1216 mask_c.alpha = 0;
1175 mask_c.red = 0xffff - c.r; 1217 mask_c.red = 0xffff - c.r;
1176 mask_c.green = 0xffff - c.g; 1218 mask_c.green = 0xffff - c.g;
1177 mask_c.blue = 0xffff - c.b; 1219 mask_c.blue = 0xffff - c.b;
1178 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1220 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1179 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1221 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1222
1223 if (shade > 100)
1224 {
1225 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1226 mask_c.alpha = 0;
1227 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1228
1229 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1230 }
1231
1180 ret = true; 1232 ret = true;
1181 } 1233 }
1182 1234
1183 XRenderFreePicture (dpy, mask_pic); 1235 XRenderFreePicture (dpy, mask_pic);
1184 XRenderFreePicture (dpy, overlay_pic); 1236 XRenderFreePicture (dpy, overlay_pic);
… …
1273 } 1325 }
1274 1326
1275 if (root_pixmap == None) 1327 if (root_pixmap == None)
1276 return 0; 1328 return 0;
1277 1329
1330 if (pixmap == None
1331 || pmap_width != window_width
1332 || pmap_height != window_height)
1333 {
1334 if (pixmap)
1335 XFreePixmap (target->dpy, pixmap);
1278 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1336 pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
1337 pmap_width = window_width;
1338 pmap_height = window_height;
1339 }
1279 1340
1280 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (pixmap == None)
1281 return 0; 1342 return 0;
1282 1343
1283 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1284 while (sx < 0) sx += (int)root_width; 1345 while (sx < 0) sx += (int)root_width;
1285 while (sy < 0) sy += (int)root_height; 1346 while (sy < 0) sy += (int)root_height;
… …
1290 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1292 1353
1293 if (gc) 1354 if (gc)
1294 { 1355 {
1295 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1296 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1297 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1298 1359
1299 if (!need_client_side_rendering ()) 1360 if (!(flags & CLIENT_RENDER))
1300 { 1361 {
1301 if ((flags & blurNeeded) 1362 if ((flags & blurNeeded)
1302 && (flags & HAS_RENDER_CONV)) 1363 && (flags & HAS_RENDER_CONV))
1303 { 1364 {
1304 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1305 result |= transpPmapBlurred; 1366 result |= transpPmapBlurred;
1306 } 1367 }
1307 if ((flags & tintNeeded) 1368 if ((flags & tintNeeded)
1308 && (flags & (tintWholesome | HAS_RENDER))) 1369 && (flags & (tintWholesome | HAS_RENDER)))
1309 { 1370 {
1310 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1371 if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1311 result |= transpPmapTinted; 1372 result |= transpPmapTinted;
1312 } 1373 }
1313 } /* server side rendering completed */ 1374 } /* server side rendering completed */
1314
1315 if (pixmap)
1316 XFreePixmap (dpy, pixmap);
1317
1318 pixmap = tiled_root_pmap;
1319 pmap_width = window_width;
1320 pmap_height = window_height;
1321 pmap_depth = target->depth;
1322 } 1375 }
1323 else
1324 XFreePixmap (dpy, tiled_root_pmap);
1325 1376
1326 if (recoded_root_pmap != root_pixmap) 1377 if (recoded_root_pmap != root_pixmap)
1327 XFreePixmap (dpy, recoded_root_pmap); 1378 XFreePixmap (dpy, recoded_root_pmap);
1328 1379
1329 return result; 1380 return result;
1330} 1381}
1331 1382
1332void 1383void
1333bgPixmap_t::set_root_pixmap () 1384bgPixmap_t::set_root_pixmap ()
1334{ 1385{
1335 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1386 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1336 if (new_root_pixmap == None) 1387 if (new_root_pixmap == None)
1337 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1388 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1338 1389
1339 root_pixmap = new_root_pixmap; 1390 root_pixmap = new_root_pixmap;
1340} 1391}
1341# endif /* ENABLE_TRANSPARENCY */ 1392# endif /* ENABLE_TRANSPARENCY */
1342 1393
1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1394#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1395static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1345# endif 1396# endif
1346 1397
1347bool 1398bool
1348bgPixmap_t::render () 1399bgPixmap_t::render ()
1349{ 1400{
… …
1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1439 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1389 { 1440 {
1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1441 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1391 if (flags & tintSet) 1442 if (flags & tintSet)
1392 tint.get (c); 1443 tint.get (c);
1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1444 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1394 } 1445 }
1395 1446
1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1447 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1397 1448
1398 if (gc) 1449 if (gc)
… …
1503 1554
1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1555#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1505/* taken from aterm-0.4.2 */ 1556/* taken from aterm-0.4.2 */
1506 1557
1507static void 1558static void
1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1559shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1509{ 1560{
1510 int sh_r, sh_g, sh_b; 1561 int sh_r, sh_g, sh_b;
1511 uint32_t mask_r, mask_g, mask_b; 1562 uint32_t mask_r, mask_g, mask_b;
1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1563 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1513 rgba low; 1564 rgba low;
1514 rgba high; 1565 rgba high;
1515 int i; 1566 int i;
1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1567 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1517 1568
1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1569 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1519 1570
1520 /* for convenience */ 1571 /* for convenience */
1521 mask_r = visual->red_mask; 1572 mask_r = visual->red_mask;
1522 mask_g = visual->green_mask; 1573 mask_g = visual->green_mask;
1523 mask_b = visual->blue_mask; 1574 mask_b = visual->blue_mask;
1524 1575
1525 /* boring lookup table pre-initialization */ 1576 /* boring lookup table pre-initialization */
1526 switch (srcImage->depth) 1577 switch (ximage->depth)
1527 { 1578 {
1528 case 15: 1579 case 15:
1529 if ((mask_r != 0x7c00) || 1580 if ((mask_r != 0x7c00) ||
1530 (mask_g != 0x03e0) || 1581 (mask_g != 0x03e0) ||
1531 (mask_b != 0x001f)) 1582 (mask_b != 0x001f))
… …
1584 /* prepare limits for color transformation (each channel is handled separately) */ 1635 /* prepare limits for color transformation (each channel is handled separately) */
1585 if (shade > 100) 1636 if (shade > 100)
1586 { 1637 {
1587 shade = 200 - shade; 1638 shade = 200 - shade;
1588 1639
1589 high.r = (65535 - c.r) * shade / 100; 1640 high.r = c.r * shade / 100;
1590 high.g = (65535 - c.g) * shade / 100; 1641 high.g = c.g * shade / 100;
1591 high.b = (65535 - c.b) * shade / 100; 1642 high.b = c.b * shade / 100;
1592 1643
1593 low.r = 65535 - high.r; 1644 low.r = 65535 * (100 - shade) / 100;
1594 low.g = 65535 - high.g; 1645 low.g = 65535 * (100 - shade) / 100;
1595 low.b = 65535 - high.b; 1646 low.b = 65535 * (100 - shade) / 100;
1596 } 1647 }
1597 else 1648 else
1598 { 1649 {
1599 high.r = c.r * shade / 100; 1650 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100; 1651 high.g = c.g * shade / 100;
… …
1625 tmp += (mask_b>>sh_b) * low.b; 1676 tmp += (mask_b>>sh_b) * low.b;
1626 lookup_b[i] = (tmp/65535)<<sh_b; 1677 lookup_b[i] = (tmp/65535)<<sh_b;
1627 } 1678 }
1628 1679
1629 /* apply table to input image (replacing colors by newly calculated ones) */ 1680 /* apply table to input image (replacing colors by newly calculated ones) */
1630 if (srcImage->bits_per_pixel == 32 1681 if (ximage->bits_per_pixel == 32
1631 && (srcImage->depth == 24 || srcImage->depth == 32) 1682 && (ximage->depth == 24 || ximage->depth == 32)
1632 && srcImage->byte_order == host_byte_order) 1683 && ximage->byte_order == host_byte_order)
1633 { 1684 {
1634 uint32_t *p1, *pf, *p, *pl; 1685 uint32_t *p1, *pf, *p, *pl;
1635 p1 = (uint32_t *) srcImage->data; 1686 p1 = (uint32_t *) ximage->data;
1636 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1687 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1637 1688
1638 while (p1 < pf) 1689 while (p1 < pf)
1639 { 1690 {
1640 p = p1; 1691 p = p1;
1641 pl = p1 + srcImage->width; 1692 pl = p1 + ximage->width;
1642 for (; p < pl; p++) 1693 for (; p < pl; p++)
1643 { 1694 {
1644 *p = lookup_r[(*p & 0xff0000) >> 16] | 1695 *p = lookup_r[(*p & 0xff0000) >> 16] |
1645 lookup_g[(*p & 0x00ff00) >> 8] | 1696 lookup_g[(*p & 0x00ff00) >> 8] |
1646 lookup_b[(*p & 0x0000ff)] | 1697 lookup_b[(*p & 0x0000ff)] |
1647 (*p & 0xff000000); 1698 (*p & 0xff000000);
1648 } 1699 }
1649 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1700 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1650 } 1701 }
1651 } 1702 }
1652 else 1703 else
1653 { 1704 {
1654 for (int y = 0; y < srcImage->height; y++) 1705 for (int y = 0; y < ximage->height; y++)
1655 for (int x = 0; x < srcImage->width; x++) 1706 for (int x = 0; x < ximage->width; x++)
1656 { 1707 {
1657 unsigned long pixel = XGetPixel (srcImage, x, y); 1708 unsigned long pixel = XGetPixel (ximage, x, y);
1658 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1709 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1659 lookup_g[(pixel & mask_g) >> sh_g] | 1710 lookup_g[(pixel & mask_g) >> sh_g] |
1660 lookup_b[(pixel & mask_b) >> sh_b]; 1711 lookup_b[(pixel & mask_b) >> sh_b];
1661 XPutPixel (srcImage, x, y, pixel); 1712 XPutPixel (ximage, x, y, pixel);
1662 } 1713 }
1663 } 1714 }
1664 1715
1665 free (lookup); 1716 free (lookup);
1666} 1717}

Diff Legend

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