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.129 by root, Mon Jan 3 03:05:47 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{
… …
260 if (ops == NULL) 275 if (ops == NULL)
261 n = strlen (geom); 276 n = strlen (geom);
262 else 277 else
263 n = ops - geom; 278 n = ops - geom;
264 279
265 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
266 { 281 return false;
282
267 memcpy (str, geom, n); 283 memcpy (str, geom, n);
268 str[n] = '\0'; 284 str[n] = '\0';
269 rxvt_strtrim (str); 285 rxvt_strtrim (str);
270 286
271 if (str[0]) 287 if (str[0])
272 { 288 {
273 /* 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 */
274 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
275 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
276 292
277 if (!update) 293 if (!update)
278 { 294 {
279 if (!(geom_flags & XValue)) 295 if (!(geom_flags & XValue))
280 x = y = defaultAlign; 296 x = y = defaultAlign;
281 else if (!(geom_flags & YValue)) 297 else if (!(geom_flags & YValue))
282 y = x; 298 y = x;
283 299
284 if (!(geom_flags & (WidthValue|HeightValue))) 300 if (!(geom_flags & (WidthValue|HeightValue)))
285 w = h = defaultScale; 301 w = h = defaultScale;
286 else if (!(geom_flags & HeightValue)) 302 else if (!(geom_flags & HeightValue))
287 h = w; 303 h = w;
288 else if (!(geom_flags & WidthValue)) 304 else if (!(geom_flags & WidthValue))
289 w = h; 305 w = h;
290 306
291 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 } 308 }
293 309
294 if (ops) 310 if (ops)
295 { 311 {
296 while (*ops) 312 while (*ops)
297 { 313 {
298 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
299 315
300# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
301 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
302 { 318 {
303 w = h = noScale; 319 w = h = noScale;
304 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
305 } 321 }
306 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
307 { 323 {
308 new_flags |= propScale; 324 new_flags |= propScale;
309 } 325 }
310 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
311 { 327 {
312 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
313 329
314 h = noScale; 330 h = noScale;
315 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
316 } 332 }
317 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
318 { 334 {
319 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
320 336
321 w = noScale; 337 w = noScale;
322 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
323 } 339 }
324 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
325 { 341 {
326 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
327 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
328 344
329 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
330 } 346 }
331 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
332 { 348 {
333 w = h = windowScale; 349 w = h = windowScale;
334 x = y = centerAlign; 350 x = y = centerAlign;
335 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
336 } 352 }
337 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
338 { 354 {
339 new_flags |= rootAlign; 355 new_flags |= rootAlign;
340 w = h = noScale; 356 w = h = noScale;
341 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
342 } 358 }
343# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
344 360
345 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
346 } /* done parsing ops */ 362 } /* done parsing ops */
347 } 363 }
348 364
349 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;
350 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;
351 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;
352 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;
353 }
354 369
355 if (new_flags != flags) 370 if (new_flags != flags)
356 { 371 {
357 flags = new_flags; 372 flags = new_flags;
358 changed = true; 373 changed = true;
… …
383 if (!w) w = image_width; 398 if (!w) w = image_width;
384 if (!h) h = image_height; 399 if (!h) h = image_height;
385 400
386 if (flags & rootAlign) 401 if (flags & rootAlign)
387 { 402 {
388 target->get_window_origin (x, y);
389 x = -x; 403 x = -target_x;
390 y = -y; 404 y = -target_y;
391 } 405 }
392 else 406 else
393 { 407 {
394 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
395 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
643} 657}
644# endif /* HAVE_AFTERIMAGE */ 658# endif /* HAVE_AFTERIMAGE */
645 659
646# ifdef HAVE_PIXBUF 660# ifdef HAVE_PIXBUF
647bool 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
648bgPixmap_t::render_image (unsigned long background_flags) 747bgPixmap_t::render_image (unsigned long background_flags)
649{ 748{
650 if (target == NULL) 749 if (target == NULL)
651 return false; 750 return false;
652 751
… …
733 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
734 833
735 if (h_scale == 0 || v_scale == 0) 834 if (h_scale == 0 || v_scale == 0)
736 { 835 {
737 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);
738 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 837 pixbuf_to_pixmap (result, tile, gc,
739 0, 0, 838 0, 0,
740 0, 0, 839 0, 0,
741 image_width, image_height, 840 image_width, image_height);
742 XLIB_RGB_DITHER_NONE,
743 0, 0);
744 841
745 gcv.tile = tile; 842 gcv.tile = tile;
746 gcv.fill_style = FillTiled; 843 gcv.fill_style = FillTiled;
747 gcv.ts_x_origin = x; 844 gcv.ts_x_origin = x;
748 gcv.ts_y_origin = y; 845 gcv.ts_y_origin = y;
… …
763 || dst_x + dst_width < new_pmap_width 860 || dst_x + dst_width < new_pmap_width
764 || dst_y + dst_height < new_pmap_height) 861 || dst_y + dst_height < new_pmap_height)
765 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);
766 863
767 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 864 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
768 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 865 pixbuf_to_pixmap (result, pixmap, gc,
769 src_x, src_y, 866 src_x, src_y,
770 dst_x, dst_y, 867 dst_x, dst_y,
771 dst_width, dst_height, 868 dst_width, dst_height);
772 XLIB_RGB_DITHER_NONE,
773 0, 0);
774 } 869 }
775 870
776#if XRENDER 871#if XRENDER
777 if (background_flags) 872 if (background_flags)
778 { 873 {
… …
926 bool has_shade = shade != 100; 1021 bool has_shade = shade != 100;
927 1022
928 if (tint) 1023 if (tint)
929 { 1024 {
930 tint->get (c); 1025 tint->get (c);
931# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1027 if (!has_shade
932 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 1028 && IS_COMPONENT_WHOLESOME (c.r)
933 && IS_COMPONENT_WHOLESOME (c.g) 1029 && IS_COMPONENT_WHOLESOME (c.g)
934 && IS_COMPONENT_WHOLESOME (c.b)) 1030 && IS_COMPONENT_WHOLESOME (c.b))
935 flags |= bgPixmap_t::tintWholesome; 1031 flags |= bgPixmap_t::tintWholesome;
936# undef IS_COMPONENT_WHOLESOME 1032# undef IS_COMPONENT_WHOLESOME
937 } 1033 }
938 1034
939 if (has_shade) 1035 if (has_shade || tint)
940 flags |= bgPixmap_t::tintNeeded; 1036 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 1037
950 return flags; 1038 return flags;
951} 1039}
952 1040
953bool 1041bool
… …
1124 c.g = (c.g * shade) / 100; 1212 c.g = (c.g * shade) / 100;
1125 c.b = (c.b * shade) / 100; 1213 c.b = (c.b * shade) / 100;
1126 } 1214 }
1127 else 1215 else
1128 { 1216 {
1129 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1217 c.r = (c.r * (200 - shade)) / 100;
1130 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1218 c.g = (c.g * (200 - shade)) / 100;
1131 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1219 c.b = (c.b * (200 - shade)) / 100;
1132 } 1220 }
1133 1221
1134 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1222 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1135 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1223 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1136 XRenderPictureAttributes pa; 1224 XRenderPictureAttributes pa;
… …
1150 1238
1151 if (mask_pic && overlay_pic && back_pic) 1239 if (mask_pic && overlay_pic && back_pic)
1152 { 1240 {
1153 XRenderColor mask_c; 1241 XRenderColor mask_c;
1154 1242
1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1243 mask_c.red = mask_c.green = mask_c.blue = 0;
1156 mask_c.alpha = 0xffff; 1244 mask_c.alpha = 0xffff;
1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1245 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1158 1246
1159 mask_c.alpha = 0; 1247 mask_c.alpha = 0;
1160 mask_c.red = 0xffff - c.r; 1248 mask_c.red = 0xffff - c.r;
1161 mask_c.green = 0xffff - c.g; 1249 mask_c.green = 0xffff - c.g;
1162 mask_c.blue = 0xffff - c.b; 1250 mask_c.blue = 0xffff - c.b;
1163 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1251 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); 1252 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1253
1254 if (shade > 100)
1255 {
1256 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1257 mask_c.alpha = 0;
1258 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1259
1260 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1261 }
1262
1165 ret = true; 1263 ret = true;
1166 } 1264 }
1167 1265
1168 XRenderFreePicture (dpy, mask_pic); 1266 XRenderFreePicture (dpy, mask_pic);
1169 XRenderFreePicture (dpy, overlay_pic); 1267 XRenderFreePicture (dpy, overlay_pic);
… …
1200 int window_height = target->szHint.height; 1298 int window_height = target->szHint.height;
1201 int sx, sy; 1299 int sx, sy;
1202 XGCValues gcv; 1300 XGCValues gcv;
1203 GC gc; 1301 GC gc;
1204 1302
1205 target->get_window_origin (sx, sy); 1303 sx = target_x;
1304 sy = target_y;
1206 1305
1207 /* check if we are outside of the visible part of the virtual screen : */ 1306 /* check if we are outside of the visible part of the virtual screen : */
1208 if (sx + window_width <= 0 || sy + window_height <= 0 1307 if (sx + window_width <= 0 || sy + window_height <= 0
1209 || sx >= root_width || sy >= root_height) 1308 || sx >= root_width || sy >= root_height)
1210 return 0; 1309 return 0;
… …
1263 1362
1264 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1363 if (tiled_root_pmap == None) /* something really bad happened - abort */
1265 return 0; 1364 return 0;
1266 1365
1267 /* straightforward pixmap copy */ 1366 /* straightforward pixmap copy */
1367 while (sx < 0) sx += (int)root_width;
1368 while (sy < 0) sy += (int)root_height;
1369
1268 gcv.tile = recoded_root_pmap; 1370 gcv.tile = recoded_root_pmap;
1269 gcv.fill_style = FillTiled; 1371 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; 1372 gcv.ts_x_origin = -sx;
1275 gcv.ts_y_origin = -sy; 1373 gcv.ts_y_origin = -sy;
1276 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1374 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1277 1375
1278 if (gc) 1376 if (gc)
… …
1315} 1413}
1316 1414
1317void 1415void
1318bgPixmap_t::set_root_pixmap () 1416bgPixmap_t::set_root_pixmap ()
1319{ 1417{
1320 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1418 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1321 if (new_root_pixmap == None) 1419 if (new_root_pixmap == None)
1322 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1420 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1323 1421
1324 root_pixmap = new_root_pixmap; 1422 root_pixmap = new_root_pixmap;
1325} 1423}
1326# endif /* ENABLE_TRANSPARENCY */ 1424# endif /* ENABLE_TRANSPARENCY */
1327 1425
1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1426#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1329static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1427static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1330# endif 1428# endif
1331 1429
1332bool 1430bool
1333bgPixmap_t::render () 1431bgPixmap_t::render ()
1334{ 1432{
… …
1344 /* we need to re-generate transparency pixmap in that case ! */ 1442 /* we need to re-generate transparency pixmap in that case ! */
1345 background_flags = make_transparency_pixmap (); 1443 background_flags = make_transparency_pixmap ();
1346 if (background_flags == 0) 1444 if (background_flags == 0)
1347 return false; 1445 return false;
1348 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1446 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1349 flags = flags & ~isInvalid; 1447 flags &= ~isInvalid;
1350 } 1448 }
1351# endif 1449# endif
1352 1450
1353# ifdef BG_IMAGE_FROM_FILE 1451# ifdef BG_IMAGE_FROM_FILE
1354 if (have_image 1452 if (have_image
1355 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1453 || (background_flags & transpTransformations) != (flags & transpTransformations))
1356 { 1454 {
1357 if (render_image (background_flags)) 1455 if (render_image (background_flags))
1358 flags = flags & ~isInvalid; 1456 flags &= ~isInvalid;
1359 } 1457 }
1360# endif 1458# endif
1361 1459
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1460# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1363 XImage *result = NULL; 1461 XImage *result = NULL;
… …
1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1374 { 1472 {
1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1376 if (flags & tintSet) 1474 if (flags & tintSet)
1377 tint.get (c); 1475 tint.get (c);
1378 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1476 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1379 } 1477 }
1380 1478
1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1479 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1382 1480
1383 if (gc) 1481 if (gc)
1384 { 1482 {
1385 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1483 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1386 1484
1387 XFreeGC (target->dpy, gc); 1485 XFreeGC (target->dpy, gc);
1388 flags = flags & ~isInvalid; 1486 flags &= ~isInvalid;
1389 } 1487 }
1390 1488
1391 XDestroyImage (result); 1489 XDestroyImage (result);
1392 } 1490 }
1393# endif 1491# endif
… …
1488 1586
1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1490/* taken from aterm-0.4.2 */ 1588/* taken from aterm-0.4.2 */
1491 1589
1492static void 1590static void
1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1591shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1494{ 1592{
1495 int sh_r, sh_g, sh_b; 1593 int sh_r, sh_g, sh_b;
1496 uint32_t mask_r, mask_g, mask_b; 1594 uint32_t mask_r, mask_g, mask_b;
1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1498 rgba low; 1596 rgba low;
1499 rgba high; 1597 rgba high;
1500 int i; 1598 int i;
1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1599 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1502 1600
1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1601 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1504 1602
1505 /* for convenience */ 1603 /* for convenience */
1506 mask_r = visual->red_mask; 1604 mask_r = visual->red_mask;
1507 mask_g = visual->green_mask; 1605 mask_g = visual->green_mask;
1508 mask_b = visual->blue_mask; 1606 mask_b = visual->blue_mask;
1509 1607
1510 /* boring lookup table pre-initialization */ 1608 /* boring lookup table pre-initialization */
1511 switch (srcImage->depth) 1609 switch (ximage->depth)
1512 { 1610 {
1513 case 15: 1611 case 15:
1514 if ((mask_r != 0x7c00) || 1612 if ((mask_r != 0x7c00) ||
1515 (mask_g != 0x03e0) || 1613 (mask_g != 0x03e0) ||
1516 (mask_b != 0x001f)) 1614 (mask_b != 0x001f))
… …
1569 /* prepare limits for color transformation (each channel is handled separately) */ 1667 /* prepare limits for color transformation (each channel is handled separately) */
1570 if (shade > 100) 1668 if (shade > 100)
1571 { 1669 {
1572 shade = 200 - shade; 1670 shade = 200 - shade;
1573 1671
1574 high.r = (65535 - c.r) * shade / 100; 1672 high.r = c.r * shade / 100;
1575 high.g = (65535 - c.g) * shade / 100; 1673 high.g = c.g * shade / 100;
1576 high.b = (65535 - c.b) * shade / 100; 1674 high.b = c.b * shade / 100;
1577 1675
1578 low.r = 65535 - high.r; 1676 low.r = 65535 * (100 - shade) / 100;
1579 low.g = 65535 - high.g; 1677 low.g = 65535 * (100 - shade) / 100;
1580 low.b = 65535 - high.b; 1678 low.b = 65535 * (100 - shade) / 100;
1581 } 1679 }
1582 else 1680 else
1583 { 1681 {
1584 high.r = c.r * shade / 100; 1682 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100; 1683 high.g = c.g * shade / 100;
… …
1610 tmp += (mask_b>>sh_b) * low.b; 1708 tmp += (mask_b>>sh_b) * low.b;
1611 lookup_b[i] = (tmp/65535)<<sh_b; 1709 lookup_b[i] = (tmp/65535)<<sh_b;
1612 } 1710 }
1613 1711
1614 /* apply table to input image (replacing colors by newly calculated ones) */ 1712 /* apply table to input image (replacing colors by newly calculated ones) */
1615 if (srcImage->bits_per_pixel == 32 1713 if (ximage->bits_per_pixel == 32
1616 && (srcImage->depth == 24 || srcImage->depth == 32) 1714 && (ximage->depth == 24 || ximage->depth == 32)
1617 && srcImage->byte_order == host_byte_order) 1715 && ximage->byte_order == host_byte_order)
1618 { 1716 {
1619 uint32_t *p1, *pf, *p, *pl; 1717 uint32_t *p1, *pf, *p, *pl;
1620 p1 = (uint32_t *) srcImage->data; 1718 p1 = (uint32_t *) ximage->data;
1621 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1719 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1622 1720
1623 while (p1 < pf) 1721 while (p1 < pf)
1624 { 1722 {
1625 p = p1; 1723 p = p1;
1626 pl = p1 + srcImage->width; 1724 pl = p1 + ximage->width;
1627 for (; p < pl; p++) 1725 for (; p < pl; p++)
1628 { 1726 {
1629 *p = lookup_r[(*p & 0xff0000) >> 16] | 1727 *p = lookup_r[(*p & 0xff0000) >> 16] |
1630 lookup_g[(*p & 0x00ff00) >> 8] | 1728 lookup_g[(*p & 0x00ff00) >> 8] |
1631 lookup_b[(*p & 0x0000ff)] | 1729 lookup_b[(*p & 0x0000ff)] |
1632 (*p & 0xff000000); 1730 (*p & 0xff000000);
1633 } 1731 }
1634 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1732 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1635 } 1733 }
1636 } 1734 }
1637 else 1735 else
1638 { 1736 {
1639 for (int y = 0; y < srcImage->height; y++) 1737 for (int y = 0; y < ximage->height; y++)
1640 for (int x = 0; x < srcImage->width; x++) 1738 for (int x = 0; x < ximage->width; x++)
1641 { 1739 {
1642 unsigned long pixel = XGetPixel (srcImage, x, y); 1740 unsigned long pixel = XGetPixel (ximage, x, y);
1643 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1741 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1644 lookup_g[(pixel & mask_g) >> sh_g] | 1742 lookup_g[(pixel & mask_g) >> sh_g] |
1645 lookup_b[(pixel & mask_b) >> sh_b]; 1743 lookup_b[(pixel & mask_b) >> sh_b];
1646 XPutPixel (srcImage, x, y, pixel); 1744 XPutPixel (ximage, x, y, pixel);
1647 } 1745 }
1648 } 1746 }
1649 1747
1650 free (lookup); 1748 free (lookup);
1651} 1749}

Diff Legend

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