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.120 by sf-exg, Thu Nov 18 17:29:25 2010 UTC vs.
Revision 1.132 by sf-exg, Mon Jan 10 20:46:20 2011 UTC

… …
103#endif 103#endif
104 flags = 0; 104 flags = 0;
105 pixmap = None; 105 pixmap = None;
106 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
107 target = 0; 107 target = 0;
108 target_x = target_y = 0;
108} 109}
109 110
110void 111void
111bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
112{ 113{
… …
123 if (pixmap && target) 124 if (pixmap && target)
124 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
125} 126}
126 127
127bool 128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
140}
141
142bool
128bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
129{ 144{
130# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
131 if (flags & isTransparent) 146 if (flags & isTransparent)
132 return true; 147 return true;
… …
157 if (flags & rootAlign) 172 if (flags & rootAlign)
158 return true; 173 return true;
159 } 174 }
160# endif 175# endif
161 176
162 return false;
163}
164
165bool bgPixmap_t::need_client_side_rendering ()
166{
167# ifdef HAVE_AFTERIMAGE
168 if (original_asim)
169 return true;
170# endif
171 return false; 177 return false;
172} 178}
173 179
174# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
175static inline bool 181static inline bool
… …
260 if (ops == NULL) 266 if (ops == NULL)
261 n = strlen (geom); 267 n = strlen (geom);
262 else 268 else
263 n = ops - geom; 269 n = ops - geom;
264 270
265 if (n < MAXLEN_GEOM) 271 if (n >= MAXLEN_GEOM)
266 { 272 return false;
273
267 memcpy (str, geom, n); 274 memcpy (str, geom, n);
268 str[n] = '\0'; 275 str[n] = '\0';
269 rxvt_strtrim (str); 276 rxvt_strtrim (str);
270 277
271 if (str[0]) 278 if (str[0])
272 { 279 {
273 /* we have geometry string - let's handle it prior to applying ops */ 280 /* we have geometry string - let's handle it prior to applying ops */
274 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
275 } /* done parsing geometry string */ 282 } /* done parsing geometry string */
276 283
277 if (!update) 284 if (!update)
278 { 285 {
279 if (!(geom_flags & XValue)) 286 if (!(geom_flags & XValue))
280 x = y = defaultAlign; 287 x = y = defaultAlign;
281 else if (!(geom_flags & YValue)) 288 else if (!(geom_flags & YValue))
282 y = x; 289 y = x;
283 290
284 if (!(geom_flags & (WidthValue|HeightValue))) 291 if (!(geom_flags & (WidthValue|HeightValue)))
285 w = h = defaultScale; 292 w = h = defaultScale;
286 else if (!(geom_flags & HeightValue)) 293 else if (!(geom_flags & HeightValue))
287 h = w; 294 h = w;
288 else if (!(geom_flags & WidthValue)) 295 else if (!(geom_flags & WidthValue))
289 w = h; 296 w = h;
290 297
291 geom_flags |= WidthValue|HeightValue|XValue|YValue; 298 geom_flags |= WidthValue|HeightValue|XValue|YValue;
299 }
300
301 if (ops)
302 {
303 char **arr = rxvt_strsplit (':', ops + 1);
304
305 for (int i = 0; arr[i]; i++)
292 } 306 {
293
294 if (ops)
295 {
296 while (*ops)
297 {
298 while (*ops == ':' || isspace(*ops)) ++ops;
299
300# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 307# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0)
301 if (CHECK_GEOM_OPS ("tile")) 308 if (CHECK_GEOM_OPS ("tile"))
302 { 309 {
303 w = h = noScale; 310 w = h = noScale;
304 geom_flags |= WidthValue|HeightValue; 311 geom_flags |= WidthValue|HeightValue;
305 } 312 }
306 else if (CHECK_GEOM_OPS ("propscale")) 313 else if (CHECK_GEOM_OPS ("propscale"))
307 { 314 {
308 new_flags |= propScale; 315 new_flags |= propScale;
309 } 316 }
310 else if (CHECK_GEOM_OPS ("hscale")) 317 else if (CHECK_GEOM_OPS ("hscale"))
311 { 318 {
312 if (w == 0) w = windowScale; 319 if (w == 0) w = windowScale;
313 320
314 h = noScale; 321 h = noScale;
315 geom_flags |= WidthValue|HeightValue; 322 geom_flags |= WidthValue|HeightValue;
316 } 323 }
317 else if (CHECK_GEOM_OPS ("vscale")) 324 else if (CHECK_GEOM_OPS ("vscale"))
318 { 325 {
319 if (h == 0) h = windowScale; 326 if (h == 0) h = windowScale;
320 327
321 w = noScale; 328 w = noScale;
322 geom_flags |= WidthValue|HeightValue; 329 geom_flags |= WidthValue|HeightValue;
323 } 330 }
324 else if (CHECK_GEOM_OPS ("scale")) 331 else if (CHECK_GEOM_OPS ("scale"))
325 { 332 {
326 if (h == 0) h = windowScale; 333 if (h == 0) h = windowScale;
327 if (w == 0) w = windowScale; 334 if (w == 0) w = windowScale;
328 335
329 geom_flags |= WidthValue|HeightValue; 336 geom_flags |= WidthValue|HeightValue;
330 } 337 }
331 else if (CHECK_GEOM_OPS ("auto")) 338 else if (CHECK_GEOM_OPS ("auto"))
332 { 339 {
333 w = h = windowScale; 340 w = h = windowScale;
334 x = y = centerAlign; 341 x = y = centerAlign;
335 geom_flags |= WidthValue|HeightValue|XValue|YValue; 342 geom_flags |= WidthValue|HeightValue|XValue|YValue;
336 } 343 }
337 else if (CHECK_GEOM_OPS ("root")) 344 else if (CHECK_GEOM_OPS ("root"))
338 { 345 {
339 new_flags |= rootAlign; 346 new_flags |= rootAlign;
340 w = h = noScale; 347 w = h = noScale;
341 geom_flags |= WidthValue|HeightValue; 348 geom_flags |= WidthValue|HeightValue;
342 } 349 }
343# undef CHECK_GEOM_OPS 350# undef CHECK_GEOM_OPS
344
345 while (*ops != ':' && *ops != '\0') ++ops;
346 } /* done parsing ops */ 351 } /* done parsing ops */
347 }
348 352
353 rxvt_free_strsplit (arr);
354 }
355
349 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 356 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
350 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 357 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
351 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 358 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
352 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 359 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
353 }
354 360
355 if (new_flags != flags) 361 if (new_flags != flags)
356 { 362 {
357 flags = new_flags; 363 flags = new_flags;
358 changed = true; 364 changed = true;
… …
383 if (!w) w = image_width; 389 if (!w) w = image_width;
384 if (!h) h = image_height; 390 if (!h) h = image_height;
385 391
386 if (flags & rootAlign) 392 if (flags & rootAlign)
387 { 393 {
388 target->get_window_origin (x, y);
389 x = -x; 394 x = -target_x;
390 y = -y; 395 y = -target_y;
391 } 396 }
392 else 397 else
393 { 398 {
394 x = make_align_position (h_align, target_width, w); 399 x = make_align_position (h_align, target_width, w);
395 y = make_align_position (v_align, target_height, h); 400 y = make_align_position (v_align, target_height, h);
… …
643} 648}
644# endif /* HAVE_AFTERIMAGE */ 649# endif /* HAVE_AFTERIMAGE */
645 650
646# ifdef HAVE_PIXBUF 651# ifdef HAVE_PIXBUF
647bool 652bool
653bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
654 int src_x, int src_y, int dst_x, int dst_y,
655 unsigned int width, unsigned int height)
656{
657 XImage *ximage;
658 char *data, *line;
659 int bytes_per_pixel;
660 int width_r, width_g, width_b;
661 int sh_r, sh_g, sh_b;
662 int rowstride;
663 int channels;
664 unsigned char *row;
665 Visual *visual = target->visual;
666 int depth = target->depth;
667
668 if (visual->c_class != TrueColor)
669 return false;
670
671 if (depth == 24 || depth == 32)
672 bytes_per_pixel = 4;
673 else if (depth == 15 || depth == 16)
674 bytes_per_pixel = 2;
675 else
676 return false;
677
678 width_r = rxvt_popcount (visual->red_mask);
679 width_g = rxvt_popcount (visual->green_mask);
680 width_b = rxvt_popcount (visual->blue_mask);
681
682 if (width_r > 8 || width_g > 8 || width_b > 8)
683 return false;
684
685 sh_r = rxvt_ctz (visual->red_mask);
686 sh_g = rxvt_ctz (visual->green_mask);
687 sh_b = rxvt_ctz (visual->blue_mask);
688
689 if (width > INT_MAX / height / bytes_per_pixel)
690 return false;
691
692 data = (char *)malloc (width * height * bytes_per_pixel);
693 if (!data)
694 return false;
695
696 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
697 width, height, bytes_per_pixel * 8, 0);
698 if (!ximage)
699 {
700 free (data);
701 return false;
702 }
703
704 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
705
706 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
707 channels = gdk_pixbuf_get_n_channels (pixbuf);
708 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
709 line = data;
710
711 for (int y = 0; y < height; y++)
712 {
713 for (int x = 0; x < width; x++)
714 {
715 unsigned char *pixel = row + x * channels;
716 uint32_t value;
717
718 value = ((pixel[0] >> (8 - width_r)) << sh_r)
719 | ((pixel[1] >> (8 - width_g)) << sh_g)
720 | ((pixel[2] >> (8 - width_b)) << sh_b);
721
722 if (bytes_per_pixel == 4)
723 ((uint32_t *)line)[x] = value;
724 else
725 ((uint16_t *)line)[x] = value;
726 }
727
728 row += rowstride;
729 line += ximage->bytes_per_line;
730 }
731
732 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
733 XDestroyImage (ximage);
734 return true;
735}
736
737bool
648bgPixmap_t::render_image (unsigned long background_flags) 738bgPixmap_t::render_image (unsigned long background_flags)
649{ 739{
650 if (target == NULL) 740 if (target == NULL)
651 return false; 741 return false;
652 742
… …
733 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
734 824
735 if (h_scale == 0 || v_scale == 0) 825 if (h_scale == 0 || v_scale == 0)
736 { 826 {
737 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
738 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 828 pixbuf_to_pixmap (result, tile, gc,
739 0, 0, 829 0, 0,
740 0, 0, 830 0, 0,
741 image_width, image_height, 831 image_width, image_height);
742 XLIB_RGB_DITHER_NONE,
743 0, 0);
744 832
745 gcv.tile = tile; 833 gcv.tile = tile;
746 gcv.fill_style = FillTiled; 834 gcv.fill_style = FillTiled;
747 gcv.ts_x_origin = x; 835 gcv.ts_x_origin = x;
748 gcv.ts_y_origin = y; 836 gcv.ts_y_origin = y;
… …
763 || dst_x + dst_width < new_pmap_width 851 || dst_x + dst_width < new_pmap_width
764 || dst_y + dst_height < new_pmap_height) 852 || dst_y + dst_height < new_pmap_height)
765 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 853 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
766 854
767 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 855 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
768 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 856 pixbuf_to_pixmap (result, pixmap, gc,
769 src_x, src_y, 857 src_x, src_y,
770 dst_x, dst_y, 858 dst_x, dst_y,
771 dst_width, dst_height, 859 dst_width, dst_height);
772 XLIB_RGB_DITHER_NONE,
773 0, 0);
774 } 860 }
775 861
776#if XRENDER 862#if XRENDER
777 if (background_flags) 863 if (background_flags)
778 { 864 {
… …
845 if (image) 931 if (image)
846 { 932 {
847 if (original_asim) 933 if (original_asim)
848 safe_asimage_destroy (original_asim); 934 safe_asimage_destroy (original_asim);
849 original_asim = image; 935 original_asim = image;
936 flags |= CLIENT_RENDER;
850 have_image = true; 937 have_image = true;
851 return true; 938 return true;
852 } 939 }
853# endif 940# endif
854 941
… …
926 bool has_shade = shade != 100; 1013 bool has_shade = shade != 100;
927 1014
928 if (tint) 1015 if (tint)
929 { 1016 {
930 tint->get (c); 1017 tint->get (c);
931# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1018# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1019 if (!has_shade
932 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1020 && IS_COMPONENT_WHOLESOME (c.r)
933 && IS_COMPONENT_WHOLESOME (c.g) 1021 && IS_COMPONENT_WHOLESOME (c.g)
934 && IS_COMPONENT_WHOLESOME (c.b)) 1022 && IS_COMPONENT_WHOLESOME (c.b))
935 flags |= bgPixmap_t::tintWholesome; 1023 flags |= bgPixmap_t::tintWholesome;
936# undef IS_COMPONENT_WHOLESOME 1024# undef IS_COMPONENT_WHOLESOME
937 } 1025 }
938 1026
939 if (has_shade) 1027 if (has_shade || tint)
940 flags |= bgPixmap_t::tintNeeded; 1028 flags |= bgPixmap_t::tintNeeded;
941 else if (tint)
942 {
943 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
944 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
945 {
946 flags |= bgPixmap_t::tintNeeded;
947 }
948 }
949 1029
950 return flags; 1030 return flags;
951} 1031}
952 1032
953bool 1033bool
… …
956 if (!(flags & tintSet) || tint != new_tint) 1036 if (!(flags & tintSet) || tint != new_tint)
957 { 1037 {
958 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1038 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
959 tint = new_tint; 1039 tint = new_tint;
960 flags = (flags & ~tintFlags) | new_flags | tintSet; 1040 flags = (flags & ~tintFlags) | new_flags | tintSet;
961 return true;
962 }
963
964 return false;
965}
966
967bool
968bgPixmap_t::unset_tint ()
969{
970 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
971
972 if (new_flags != (flags & tintFlags))
973 {
974 flags = (flags & ~tintFlags) | new_flags;
975 return true; 1041 return true;
976 } 1042 }
977 1043
978 return false; 1044 return false;
979} 1045}
… …
1124 c.g = (c.g * shade) / 100; 1190 c.g = (c.g * shade) / 100;
1125 c.b = (c.b * shade) / 100; 1191 c.b = (c.b * shade) / 100;
1126 } 1192 }
1127 else 1193 else
1128 { 1194 {
1129 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1195 c.r = (c.r * (200 - shade)) / 100;
1130 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1196 c.g = (c.g * (200 - shade)) / 100;
1131 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1197 c.b = (c.b * (200 - shade)) / 100;
1132 } 1198 }
1133 1199
1134 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1200 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1135 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1201 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1136 XRenderPictureAttributes pa; 1202 XRenderPictureAttributes pa;
… …
1150 1216
1151 if (mask_pic && overlay_pic && back_pic) 1217 if (mask_pic && overlay_pic && back_pic)
1152 { 1218 {
1153 XRenderColor mask_c; 1219 XRenderColor mask_c;
1154 1220
1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1221 mask_c.red = mask_c.green = mask_c.blue = 0;
1156 mask_c.alpha = 0xffff; 1222 mask_c.alpha = 0xffff;
1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1223 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1158 1224
1159 mask_c.alpha = 0; 1225 mask_c.alpha = 0;
1160 mask_c.red = 0xffff - c.r; 1226 mask_c.red = 0xffff - c.r;
1161 mask_c.green = 0xffff - c.g; 1227 mask_c.green = 0xffff - c.g;
1162 mask_c.blue = 0xffff - c.b; 1228 mask_c.blue = 0xffff - c.b;
1163 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1229 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1164 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1230 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1231
1232 if (shade > 100)
1233 {
1234 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1235 mask_c.alpha = 0;
1236 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1237
1238 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239 }
1240
1165 ret = true; 1241 ret = true;
1166 } 1242 }
1167 1243
1168 XRenderFreePicture (dpy, mask_pic); 1244 XRenderFreePicture (dpy, mask_pic);
1169 XRenderFreePicture (dpy, overlay_pic); 1245 XRenderFreePicture (dpy, overlay_pic);
… …
1200 int window_height = target->szHint.height; 1276 int window_height = target->szHint.height;
1201 int sx, sy; 1277 int sx, sy;
1202 XGCValues gcv; 1278 XGCValues gcv;
1203 GC gc; 1279 GC gc;
1204 1280
1205 target->get_window_origin (sx, sy); 1281 sx = target_x;
1282 sy = target_y;
1206 1283
1207 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1208 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1209 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1210 return 0; 1287 return 0;
… …
1263 1340
1264 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1265 return 0; 1342 return 0;
1266 1343
1267 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1345 while (sx < 0) sx += (int)root_width;
1346 while (sy < 0) sy += (int)root_height;
1347
1268 gcv.tile = recoded_root_pmap; 1348 gcv.tile = recoded_root_pmap;
1269 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
1270
1271 while (sx < 0) sx += (int)root_width;
1272 while (sy < 0) sy += (int)root_height;
1273
1274 gcv.ts_x_origin = -sx; 1350 gcv.ts_x_origin = -sx;
1275 gcv.ts_y_origin = -sy; 1351 gcv.ts_y_origin = -sy;
1276 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1352 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1277 1353
1278 if (gc) 1354 if (gc)
1279 { 1355 {
1280 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1281 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1282 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1283 1359
1284 if (!need_client_side_rendering ()) 1360 if (!(flags & CLIENT_RENDER))
1285 { 1361 {
1286 if ((flags & blurNeeded) 1362 if ((flags & blurNeeded)
1287 && (flags & HAS_RENDER_CONV)) 1363 && (flags & HAS_RENDER_CONV))
1288 { 1364 {
1289 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
… …
1315} 1391}
1316 1392
1317void 1393void
1318bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
1319{ 1395{
1320 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1396 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1321 if (new_root_pixmap == None) 1397 if (new_root_pixmap == None)
1322 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1398 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1323 1399
1324 root_pixmap = new_root_pixmap; 1400 root_pixmap = new_root_pixmap;
1325} 1401}
1326# endif /* ENABLE_TRANSPARENCY */ 1402# endif /* ENABLE_TRANSPARENCY */
1327 1403
1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1404#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1329static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1405static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1330# endif 1406# endif
1331 1407
1332bool 1408bool
1333bgPixmap_t::render () 1409bgPixmap_t::render ()
1334{ 1410{
… …
1344 /* we need to re-generate transparency pixmap in that case ! */ 1420 /* we need to re-generate transparency pixmap in that case ! */
1345 background_flags = make_transparency_pixmap (); 1421 background_flags = make_transparency_pixmap ();
1346 if (background_flags == 0) 1422 if (background_flags == 0)
1347 return false; 1423 return false;
1348 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1424 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1349 flags = flags & ~isInvalid; 1425 flags &= ~isInvalid;
1350 } 1426 }
1351# endif 1427# endif
1352 1428
1353# ifdef BG_IMAGE_FROM_FILE 1429# ifdef BG_IMAGE_FROM_FILE
1354 if (have_image 1430 if (have_image
1355 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1431 || (background_flags & transpTransformations) != (flags & transpTransformations))
1356 { 1432 {
1357 if (render_image (background_flags)) 1433 if (render_image (background_flags))
1358 flags = flags & ~isInvalid; 1434 flags &= ~isInvalid;
1359 } 1435 }
1360# endif 1436# endif
1361 1437
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1363 XImage *result = NULL; 1439 XImage *result = NULL;
… …
1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1374 { 1450 {
1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1376 if (flags & tintSet) 1452 if (flags & tintSet)
1377 tint.get (c); 1453 tint.get (c);
1378 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1454 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1379 } 1455 }
1380 1456
1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1457 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1382 1458
1383 if (gc) 1459 if (gc)
1384 { 1460 {
1385 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1461 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1386 1462
1387 XFreeGC (target->dpy, gc); 1463 XFreeGC (target->dpy, gc);
1388 flags = flags & ~isInvalid; 1464 flags &= ~isInvalid;
1389 } 1465 }
1390 1466
1391 XDestroyImage (result); 1467 XDestroyImage (result);
1392 } 1468 }
1393# endif 1469# endif
… …
1488 1564
1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1565#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1490/* taken from aterm-0.4.2 */ 1566/* taken from aterm-0.4.2 */
1491 1567
1492static void 1568static void
1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1569shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1494{ 1570{
1495 int sh_r, sh_g, sh_b; 1571 int sh_r, sh_g, sh_b;
1496 uint32_t mask_r, mask_g, mask_b; 1572 uint32_t mask_r, mask_g, mask_b;
1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1573 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1498 rgba low; 1574 rgba low;
1499 rgba high; 1575 rgba high;
1500 int i; 1576 int i;
1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1577 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1502 1578
1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1579 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1504 1580
1505 /* for convenience */ 1581 /* for convenience */
1506 mask_r = visual->red_mask; 1582 mask_r = visual->red_mask;
1507 mask_g = visual->green_mask; 1583 mask_g = visual->green_mask;
1508 mask_b = visual->blue_mask; 1584 mask_b = visual->blue_mask;
1509 1585
1510 /* boring lookup table pre-initialization */ 1586 /* boring lookup table pre-initialization */
1511 switch (srcImage->depth) 1587 switch (ximage->depth)
1512 { 1588 {
1513 case 15: 1589 case 15:
1514 if ((mask_r != 0x7c00) || 1590 if ((mask_r != 0x7c00) ||
1515 (mask_g != 0x03e0) || 1591 (mask_g != 0x03e0) ||
1516 (mask_b != 0x001f)) 1592 (mask_b != 0x001f))
… …
1569 /* prepare limits for color transformation (each channel is handled separately) */ 1645 /* prepare limits for color transformation (each channel is handled separately) */
1570 if (shade > 100) 1646 if (shade > 100)
1571 { 1647 {
1572 shade = 200 - shade; 1648 shade = 200 - shade;
1573 1649
1574 high.r = (65535 - c.r) * shade / 100; 1650 high.r = c.r * shade / 100;
1575 high.g = (65535 - c.g) * shade / 100; 1651 high.g = c.g * shade / 100;
1576 high.b = (65535 - c.b) * shade / 100; 1652 high.b = c.b * shade / 100;
1577 1653
1578 low.r = 65535 - high.r; 1654 low.r = 65535 * (100 - shade) / 100;
1579 low.g = 65535 - high.g; 1655 low.g = 65535 * (100 - shade) / 100;
1580 low.b = 65535 - high.b; 1656 low.b = 65535 * (100 - shade) / 100;
1581 } 1657 }
1582 else 1658 else
1583 { 1659 {
1584 high.r = c.r * shade / 100; 1660 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100; 1661 high.g = c.g * shade / 100;
… …
1610 tmp += (mask_b>>sh_b) * low.b; 1686 tmp += (mask_b>>sh_b) * low.b;
1611 lookup_b[i] = (tmp/65535)<<sh_b; 1687 lookup_b[i] = (tmp/65535)<<sh_b;
1612 } 1688 }
1613 1689
1614 /* apply table to input image (replacing colors by newly calculated ones) */ 1690 /* apply table to input image (replacing colors by newly calculated ones) */
1615 if (srcImage->bits_per_pixel == 32 1691 if (ximage->bits_per_pixel == 32
1616 && (srcImage->depth == 24 || srcImage->depth == 32) 1692 && (ximage->depth == 24 || ximage->depth == 32)
1617 && srcImage->byte_order == host_byte_order) 1693 && ximage->byte_order == host_byte_order)
1618 { 1694 {
1619 uint32_t *p1, *pf, *p, *pl; 1695 uint32_t *p1, *pf, *p, *pl;
1620 p1 = (uint32_t *) srcImage->data; 1696 p1 = (uint32_t *) ximage->data;
1621 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1697 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1622 1698
1623 while (p1 < pf) 1699 while (p1 < pf)
1624 { 1700 {
1625 p = p1; 1701 p = p1;
1626 pl = p1 + srcImage->width; 1702 pl = p1 + ximage->width;
1627 for (; p < pl; p++) 1703 for (; p < pl; p++)
1628 { 1704 {
1629 *p = lookup_r[(*p & 0xff0000) >> 16] | 1705 *p = lookup_r[(*p & 0xff0000) >> 16] |
1630 lookup_g[(*p & 0x00ff00) >> 8] | 1706 lookup_g[(*p & 0x00ff00) >> 8] |
1631 lookup_b[(*p & 0x0000ff)] | 1707 lookup_b[(*p & 0x0000ff)] |
1632 (*p & 0xff000000); 1708 (*p & 0xff000000);
1633 } 1709 }
1634 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1710 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1635 } 1711 }
1636 } 1712 }
1637 else 1713 else
1638 { 1714 {
1639 for (int y = 0; y < srcImage->height; y++) 1715 for (int y = 0; y < ximage->height; y++)
1640 for (int x = 0; x < srcImage->width; x++) 1716 for (int x = 0; x < ximage->width; x++)
1641 { 1717 {
1642 unsigned long pixel = XGetPixel (srcImage, x, y); 1718 unsigned long pixel = XGetPixel (ximage, x, y);
1643 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1719 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1644 lookup_g[(pixel & mask_g) >> sh_g] | 1720 lookup_g[(pixel & mask_g) >> sh_g] |
1645 lookup_b[(pixel & mask_b) >> sh_b]; 1721 lookup_b[(pixel & mask_b) >> sh_b];
1646 XPutPixel (srcImage, x, y, pixel); 1722 XPutPixel (ximage, x, y, pixel);
1647 } 1723 }
1648 } 1724 }
1649 1725
1650 free (lookup); 1726 free (lookup);
1651} 1727}

Diff Legend

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