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.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.131 by sf-exg, Mon Jan 10 19:58:24 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{
… …
120 g_object_unref (pixbuf); 121 g_object_unref (pixbuf);
121#endif 122#endif
122 123
123 if (pixmap && target) 124 if (pixmap && target)
124 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
126}
127
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;
125} 140}
126 141
127bool 142bool
128bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
129{ 144{
… …
246 int geom_flags = 0; 261 int geom_flags = 0;
247 int x = 0, y = 0; 262 int x = 0, y = 0;
248 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
249 unsigned int n; 264 unsigned int n;
250 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
251 const char *p; 266 const char *ops;
252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
253 268
254 if (geom == NULL) 269 if (geom == NULL)
255 return false; 270 return false;
256 271
257 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
258 273
259 while (isspace(*geom)) ++geom;
260 if ((p = strchr (geom, ';')) == NULL)
261 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
262 275 if (ops == NULL)
276 n = strlen (geom);
277 else
263 n = (p - geom); 278 n = ops - geom;
279
264 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
265 { 281 return false;
266 char *ops;
267 282
268 memcpy (str, geom, n); 283 memcpy (str, geom, n);
269 str[n] = '\0'; 284 str[n] = '\0';
270 if (str[0] == ':') 285 rxvt_strtrim (str);
271 ops = &str[0];
272 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
273 ops = &str[0];
274 else
275 {
276 char *tmp;
277 ops = strchr (str, ':');
278 if (ops != NULL)
279 {
280 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
281 *(++tmp) = '\0';
282 if (ops == tmp) ++ops;
283 }
284 }
285 286
286 if (ops > str || ops == NULL) 287 if (str[0])
287 { 288 {
288 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
289 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
290
291 if (!update) /* setting up geometry from scratch */
292 {
293 if (!(geom_flags & XValue))
294 {
295 /* use default geometry - centered */
296 x = y = defaultAlign;
297 }
298 else if (!(geom_flags & YValue))
299 y = x;
300
301 if ((geom_flags & (WidthValue|HeightValue)) == 0)
302 {
303 /* use default geometry - scaled */
304 w = h = defaultScale;
305 }
306 else if (geom_flags & WidthValue)
307 {
308 if (!(geom_flags & HeightValue))
309 h = w;
310 }
311 else
312 w = h;
313 }
314 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
292
315 else if (!update) 293 if (!update)
316 { 294 {
317 /* default geometry - scaled and centered */ 295 if (!(geom_flags & XValue))
318 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
319 w = h = defaultScale; 301 w = h = defaultScale;
320 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
321 306
322 if (!update)
323 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
324 309
325 if (ops) 310 if (ops)
326 { 311 {
327 while (*ops) 312 char **arr = rxvt_strsplit (':', ops + 1);
313
314 for (int i = 0; arr[i]; i++)
328 { 315 {
329 while (*ops == ':' || isspace(*ops)) ++ops;
330
331# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0)
332 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
333 { 318 {
334 w = h = noScale; 319 w = h = noScale;
335 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
336 } 321 }
337 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
338 { 323 {
339 new_flags |= propScale; 324 new_flags |= propScale;
340 } 325 }
341 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
342 { 327 {
343 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
344 329
345 h = noScale; 330 h = noScale;
346 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
347 } 332 }
348 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
349 { 334 {
350 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
351 336
352 w = noScale; 337 w = noScale;
353 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
354 } 339 }
355 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
356 { 341 {
357 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
358 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
359 344
360 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
361 } 346 }
362 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
363 { 348 {
364 w = h = windowScale; 349 w = h = windowScale;
365 x = y = centerAlign; 350 x = y = centerAlign;
366 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
367 } 352 }
368 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
369 { 354 {
370 new_flags |= rootAlign; 355 new_flags |= rootAlign;
371 w = h = noScale; 356 w = h = noScale;
372 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
373 } 358 }
374# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
375
376 while (*ops != ':' && *ops != '\0') ++ops;
377 } /* done parsing ops */ 360 } /* done parsing ops */
378 }
379 361
362 rxvt_free_strsplit (arr);
363 }
364
380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
381 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
382 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
384 }
385 369
386 if (new_flags != flags) 370 if (new_flags != flags)
387 { 371 {
388 flags = new_flags; 372 flags = new_flags;
389 changed = true; 373 changed = true;
… …
414 if (!w) w = image_width; 398 if (!w) w = image_width;
415 if (!h) h = image_height; 399 if (!h) h = image_height;
416 400
417 if (flags & rootAlign) 401 if (flags & rootAlign)
418 { 402 {
419 target->get_window_origin (x, y);
420 x = -x; 403 x = -target_x;
421 y = -y; 404 y = -target_y;
422 } 405 }
423 else 406 else
424 { 407 {
425 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
426 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
674} 657}
675# endif /* HAVE_AFTERIMAGE */ 658# endif /* HAVE_AFTERIMAGE */
676 659
677# ifdef HAVE_PIXBUF 660# ifdef HAVE_PIXBUF
678bool 661bool
662bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
663 int src_x, int src_y, int dst_x, int dst_y,
664 unsigned int width, unsigned int height)
665{
666 XImage *ximage;
667 char *data, *line;
668 int bytes_per_pixel;
669 int width_r, width_g, width_b;
670 int sh_r, sh_g, sh_b;
671 int rowstride;
672 int channels;
673 unsigned char *row;
674 Visual *visual = target->visual;
675 int depth = target->depth;
676
677 if (visual->c_class != TrueColor)
678 return false;
679
680 if (depth == 24 || depth == 32)
681 bytes_per_pixel = 4;
682 else if (depth == 15 || depth == 16)
683 bytes_per_pixel = 2;
684 else
685 return false;
686
687 width_r = rxvt_popcount (visual->red_mask);
688 width_g = rxvt_popcount (visual->green_mask);
689 width_b = rxvt_popcount (visual->blue_mask);
690
691 if (width_r > 8 || width_g > 8 || width_b > 8)
692 return false;
693
694 sh_r = rxvt_ctz (visual->red_mask);
695 sh_g = rxvt_ctz (visual->green_mask);
696 sh_b = rxvt_ctz (visual->blue_mask);
697
698 if (width > INT_MAX / height / bytes_per_pixel)
699 return false;
700
701 data = (char *)malloc (width * height * bytes_per_pixel);
702 if (!data)
703 return false;
704
705 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
706 width, height, bytes_per_pixel * 8, 0);
707 if (!ximage)
708 {
709 free (data);
710 return false;
711 }
712
713 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
714
715 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
716 channels = gdk_pixbuf_get_n_channels (pixbuf);
717 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
718 line = data;
719
720 for (int y = 0; y < height; y++)
721 {
722 for (int x = 0; x < width; x++)
723 {
724 unsigned char *pixel = row + x * channels;
725 uint32_t value;
726
727 value = ((pixel[0] >> (8 - width_r)) << sh_r)
728 | ((pixel[1] >> (8 - width_g)) << sh_g)
729 | ((pixel[2] >> (8 - width_b)) << sh_b);
730
731 if (bytes_per_pixel == 4)
732 ((uint32_t *)line)[x] = value;
733 else
734 ((uint16_t *)line)[x] = value;
735 }
736
737 row += rowstride;
738 line += ximage->bytes_per_line;
739 }
740
741 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
742 XDestroyImage (ximage);
743 return true;
744}
745
746bool
679bgPixmap_t::render_image (unsigned long background_flags) 747bgPixmap_t::render_image (unsigned long background_flags)
680{ 748{
681 if (target == NULL) 749 if (target == NULL)
682 return false; 750 return false;
683 751
… …
764 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
765 833
766 if (h_scale == 0 || v_scale == 0) 834 if (h_scale == 0 || v_scale == 0)
767 { 835 {
768 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 836 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
769 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 837 pixbuf_to_pixmap (result, tile, gc,
770 0, 0, 838 0, 0,
771 0, 0, 839 0, 0,
772 image_width, image_height, 840 image_width, image_height);
773 XLIB_RGB_DITHER_NONE,
774 0, 0);
775 841
776 gcv.tile = tile; 842 gcv.tile = tile;
777 gcv.fill_style = FillTiled; 843 gcv.fill_style = FillTiled;
778 gcv.ts_x_origin = x; 844 gcv.ts_x_origin = x;
779 gcv.ts_y_origin = y; 845 gcv.ts_y_origin = y;
… …
794 || dst_x + dst_width < new_pmap_width 860 || dst_x + dst_width < new_pmap_width
795 || dst_y + dst_height < new_pmap_height) 861 || dst_y + dst_height < new_pmap_height)
796 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 862 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
797 863
798 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 864 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
799 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 865 pixbuf_to_pixmap (result, pixmap, gc,
800 src_x, src_y, 866 src_x, src_y,
801 dst_x, dst_y, 867 dst_x, dst_y,
802 dst_width, dst_height, 868 dst_width, dst_height);
803 XLIB_RGB_DITHER_NONE,
804 0, 0);
805 } 869 }
806 870
807#if XRENDER 871#if XRENDER
808 if (background_flags) 872 if (background_flags)
809 { 873 {
… …
957 bool has_shade = shade != 100; 1021 bool has_shade = shade != 100;
958 1022
959 if (tint) 1023 if (tint)
960 { 1024 {
961 tint->get (c); 1025 tint->get (c);
962# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1027 if (!has_shade
963 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1028 && IS_COMPONENT_WHOLESOME (c.r)
964 && IS_COMPONENT_WHOLESOME (c.g) 1029 && IS_COMPONENT_WHOLESOME (c.g)
965 && IS_COMPONENT_WHOLESOME (c.b)) 1030 && IS_COMPONENT_WHOLESOME (c.b))
966 flags |= bgPixmap_t::tintWholesome; 1031 flags |= bgPixmap_t::tintWholesome;
967# undef IS_COMPONENT_WHOLESOME 1032# undef IS_COMPONENT_WHOLESOME
968 } 1033 }
969 1034
970 if (has_shade) 1035 if (has_shade || tint)
971 flags |= bgPixmap_t::tintNeeded; 1036 flags |= bgPixmap_t::tintNeeded;
972 else if (tint)
973 {
974 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
975 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
976 {
977 flags |= bgPixmap_t::tintNeeded;
978 }
979 }
980 1037
981 return flags; 1038 return flags;
982} 1039}
983 1040
984bool 1041bool
… …
987 if (!(flags & tintSet) || tint != new_tint) 1044 if (!(flags & tintSet) || tint != new_tint)
988 { 1045 {
989 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1046 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
990 tint = new_tint; 1047 tint = new_tint;
991 flags = (flags & ~tintFlags) | new_flags | tintSet; 1048 flags = (flags & ~tintFlags) | new_flags | tintSet;
992 return true;
993 }
994
995 return false;
996}
997
998bool
999bgPixmap_t::unset_tint ()
1000{
1001 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1002
1003 if (new_flags != (flags & tintFlags))
1004 {
1005 flags = (flags & ~tintFlags) | new_flags;
1006 return true; 1049 return true;
1007 } 1050 }
1008 1051
1009 return false; 1052 return false;
1010} 1053}
… …
1155 c.g = (c.g * shade) / 100; 1198 c.g = (c.g * shade) / 100;
1156 c.b = (c.b * shade) / 100; 1199 c.b = (c.b * shade) / 100;
1157 } 1200 }
1158 else 1201 else
1159 { 1202 {
1160 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1203 c.r = (c.r * (200 - shade)) / 100;
1161 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1204 c.g = (c.g * (200 - shade)) / 100;
1162 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1205 c.b = (c.b * (200 - shade)) / 100;
1163 } 1206 }
1164 1207
1165 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1208 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1166 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1209 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1167 XRenderPictureAttributes pa; 1210 XRenderPictureAttributes pa;
… …
1181 1224
1182 if (mask_pic && overlay_pic && back_pic) 1225 if (mask_pic && overlay_pic && back_pic)
1183 { 1226 {
1184 XRenderColor mask_c; 1227 XRenderColor mask_c;
1185 1228
1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1229 mask_c.red = mask_c.green = mask_c.blue = 0;
1187 mask_c.alpha = 0xffff; 1230 mask_c.alpha = 0xffff;
1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1231 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1189 1232
1190 mask_c.alpha = 0; 1233 mask_c.alpha = 0;
1191 mask_c.red = 0xffff - c.r; 1234 mask_c.red = 0xffff - c.r;
1192 mask_c.green = 0xffff - c.g; 1235 mask_c.green = 0xffff - c.g;
1193 mask_c.blue = 0xffff - c.b; 1236 mask_c.blue = 0xffff - c.b;
1194 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1237 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1195 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1238 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239
1240 if (shade > 100)
1241 {
1242 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1243 mask_c.alpha = 0;
1244 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1245
1246 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1247 }
1248
1196 ret = true; 1249 ret = true;
1197 } 1250 }
1198 1251
1199 XRenderFreePicture (dpy, mask_pic); 1252 XRenderFreePicture (dpy, mask_pic);
1200 XRenderFreePicture (dpy, overlay_pic); 1253 XRenderFreePicture (dpy, overlay_pic);
… …
1231 int window_height = target->szHint.height; 1284 int window_height = target->szHint.height;
1232 int sx, sy; 1285 int sx, sy;
1233 XGCValues gcv; 1286 XGCValues gcv;
1234 GC gc; 1287 GC gc;
1235 1288
1236 target->get_window_origin (sx, sy); 1289 sx = target_x;
1290 sy = target_y;
1237 1291
1238 /* check if we are outside of the visible part of the virtual screen : */ 1292 /* check if we are outside of the visible part of the virtual screen : */
1239 if (sx + window_width <= 0 || sy + window_height <= 0 1293 if (sx + window_width <= 0 || sy + window_height <= 0
1240 || sx >= root_width || sy >= root_height) 1294 || sx >= root_width || sy >= root_height)
1241 return 0; 1295 return 0;
… …
1294 1348
1295 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1349 if (tiled_root_pmap == None) /* something really bad happened - abort */
1296 return 0; 1350 return 0;
1297 1351
1298 /* straightforward pixmap copy */ 1352 /* straightforward pixmap copy */
1353 while (sx < 0) sx += (int)root_width;
1354 while (sy < 0) sy += (int)root_height;
1355
1299 gcv.tile = recoded_root_pmap; 1356 gcv.tile = recoded_root_pmap;
1300 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1301
1302 while (sx < 0) sx += (int)root_width;
1303 while (sy < 0) sy += (int)root_height;
1304
1305 gcv.ts_x_origin = -sx; 1358 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1359 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1360 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1361
1309 if (gc) 1362 if (gc)
… …
1346} 1399}
1347 1400
1348void 1401void
1349bgPixmap_t::set_root_pixmap () 1402bgPixmap_t::set_root_pixmap ()
1350{ 1403{
1351 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1404 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1352 if (new_root_pixmap == None) 1405 if (new_root_pixmap == None)
1353 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1406 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1354 1407
1355 root_pixmap = new_root_pixmap; 1408 root_pixmap = new_root_pixmap;
1356} 1409}
1357# endif /* ENABLE_TRANSPARENCY */ 1410# endif /* ENABLE_TRANSPARENCY */
1358 1411
1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1412#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1360static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1413static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1361# endif 1414# endif
1362 1415
1363bool 1416bool
1364bgPixmap_t::render () 1417bgPixmap_t::render ()
1365{ 1418{
… …
1375 /* we need to re-generate transparency pixmap in that case ! */ 1428 /* we need to re-generate transparency pixmap in that case ! */
1376 background_flags = make_transparency_pixmap (); 1429 background_flags = make_transparency_pixmap ();
1377 if (background_flags == 0) 1430 if (background_flags == 0)
1378 return false; 1431 return false;
1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1432 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1380 flags = flags & ~isInvalid; 1433 flags &= ~isInvalid;
1381 } 1434 }
1382# endif 1435# endif
1383 1436
1384# ifdef BG_IMAGE_FROM_FILE 1437# ifdef BG_IMAGE_FROM_FILE
1385 if (have_image 1438 if (have_image
1386 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1439 || (background_flags & transpTransformations) != (flags & transpTransformations))
1387 { 1440 {
1388 if (render_image (background_flags)) 1441 if (render_image (background_flags))
1389 flags = flags & ~isInvalid; 1442 flags &= ~isInvalid;
1390 } 1443 }
1391# endif 1444# endif
1392 1445
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1446# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1394 XImage *result = NULL; 1447 XImage *result = NULL;
… …
1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1457 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1405 { 1458 {
1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1459 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1407 if (flags & tintSet) 1460 if (flags & tintSet)
1408 tint.get (c); 1461 tint.get (c);
1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1462 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1410 } 1463 }
1411 1464
1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1413 1466
1414 if (gc) 1467 if (gc)
1415 { 1468 {
1416 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1469 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1417 1470
1418 XFreeGC (target->dpy, gc); 1471 XFreeGC (target->dpy, gc);
1419 flags = flags & ~isInvalid; 1472 flags &= ~isInvalid;
1420 } 1473 }
1421 1474
1422 XDestroyImage (result); 1475 XDestroyImage (result);
1423 } 1476 }
1424# endif 1477# endif
… …
1519 1572
1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1573#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1521/* taken from aterm-0.4.2 */ 1574/* taken from aterm-0.4.2 */
1522 1575
1523static void 1576static void
1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1577shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1525{ 1578{
1526 int sh_r, sh_g, sh_b; 1579 int sh_r, sh_g, sh_b;
1527 uint32_t mask_r, mask_g, mask_b; 1580 uint32_t mask_r, mask_g, mask_b;
1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1581 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1529 rgba low; 1582 rgba low;
1530 rgba high; 1583 rgba high;
1531 int i; 1584 int i;
1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1585 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1533 1586
1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1587 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1535 1588
1536 /* for convenience */ 1589 /* for convenience */
1537 mask_r = visual->red_mask; 1590 mask_r = visual->red_mask;
1538 mask_g = visual->green_mask; 1591 mask_g = visual->green_mask;
1539 mask_b = visual->blue_mask; 1592 mask_b = visual->blue_mask;
1540 1593
1541 /* boring lookup table pre-initialization */ 1594 /* boring lookup table pre-initialization */
1542 switch (srcImage->depth) 1595 switch (ximage->depth)
1543 { 1596 {
1544 case 15: 1597 case 15:
1545 if ((mask_r != 0x7c00) || 1598 if ((mask_r != 0x7c00) ||
1546 (mask_g != 0x03e0) || 1599 (mask_g != 0x03e0) ||
1547 (mask_b != 0x001f)) 1600 (mask_b != 0x001f))
… …
1600 /* prepare limits for color transformation (each channel is handled separately) */ 1653 /* prepare limits for color transformation (each channel is handled separately) */
1601 if (shade > 100) 1654 if (shade > 100)
1602 { 1655 {
1603 shade = 200 - shade; 1656 shade = 200 - shade;
1604 1657
1605 high.r = (65535 - c.r) * shade / 100; 1658 high.r = c.r * shade / 100;
1606 high.g = (65535 - c.g) * shade / 100; 1659 high.g = c.g * shade / 100;
1607 high.b = (65535 - c.b) * shade / 100; 1660 high.b = c.b * shade / 100;
1608 1661
1609 low.r = 65535 - high.r; 1662 low.r = 65535 * (100 - shade) / 100;
1610 low.g = 65535 - high.g; 1663 low.g = 65535 * (100 - shade) / 100;
1611 low.b = 65535 - high.b; 1664 low.b = 65535 * (100 - shade) / 100;
1612 } 1665 }
1613 else 1666 else
1614 { 1667 {
1615 high.r = c.r * shade / 100; 1668 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100; 1669 high.g = c.g * shade / 100;
… …
1641 tmp += (mask_b>>sh_b) * low.b; 1694 tmp += (mask_b>>sh_b) * low.b;
1642 lookup_b[i] = (tmp/65535)<<sh_b; 1695 lookup_b[i] = (tmp/65535)<<sh_b;
1643 } 1696 }
1644 1697
1645 /* apply table to input image (replacing colors by newly calculated ones) */ 1698 /* apply table to input image (replacing colors by newly calculated ones) */
1646 if (srcImage->bits_per_pixel == 32 1699 if (ximage->bits_per_pixel == 32
1647 && (srcImage->depth == 24 || srcImage->depth == 32) 1700 && (ximage->depth == 24 || ximage->depth == 32)
1648 && srcImage->byte_order == host_byte_order) 1701 && ximage->byte_order == host_byte_order)
1649 { 1702 {
1650 uint32_t *p1, *pf, *p, *pl; 1703 uint32_t *p1, *pf, *p, *pl;
1651 p1 = (uint32_t *) srcImage->data; 1704 p1 = (uint32_t *) ximage->data;
1652 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1705 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1653 1706
1654 while (p1 < pf) 1707 while (p1 < pf)
1655 { 1708 {
1656 p = p1; 1709 p = p1;
1657 pl = p1 + srcImage->width; 1710 pl = p1 + ximage->width;
1658 for (; p < pl; p++) 1711 for (; p < pl; p++)
1659 { 1712 {
1660 *p = lookup_r[(*p & 0xff0000) >> 16] | 1713 *p = lookup_r[(*p & 0xff0000) >> 16] |
1661 lookup_g[(*p & 0x00ff00) >> 8] | 1714 lookup_g[(*p & 0x00ff00) >> 8] |
1662 lookup_b[(*p & 0x0000ff)] | 1715 lookup_b[(*p & 0x0000ff)] |
1663 (*p & 0xff000000); 1716 (*p & 0xff000000);
1664 } 1717 }
1665 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1718 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1666 } 1719 }
1667 } 1720 }
1668 else 1721 else
1669 { 1722 {
1670 for (int y = 0; y < srcImage->height; y++) 1723 for (int y = 0; y < ximage->height; y++)
1671 for (int x = 0; x < srcImage->width; x++) 1724 for (int x = 0; x < ximage->width; x++)
1672 { 1725 {
1673 unsigned long pixel = XGetPixel (srcImage, x, y); 1726 unsigned long pixel = XGetPixel (ximage, x, y);
1674 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1727 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1675 lookup_g[(pixel & mask_g) >> sh_g] | 1728 lookup_g[(pixel & mask_g) >> sh_g] |
1676 lookup_b[(pixel & mask_b) >> sh_b]; 1729 lookup_b[(pixel & mask_b) >> sh_b];
1677 XPutPixel (srcImage, x, y, pixel); 1730 XPutPixel (ximage, x, y, pixel);
1678 } 1731 }
1679 } 1732 }
1680 1733
1681 free (lookup); 1734 free (lookup);
1682} 1735}

Diff Legend

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