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.106 by sf-exg, Mon Nov 1 11:37:02 2010 UTC vs.
Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 2010 UTC

… …
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
28 32
29#define DO_TIMING_TEST 0 33#define DO_TIMING_TEST 0
30 34
31#if DO_TIMING_TEST 35#if DO_TIMING_TEST
32# include <sys/time.h> 36# include <sys/time.h>
… …
250} 254}
251 255
252bool 256bool
253bgPixmap_t::set_geometry (const char *geom) 257bgPixmap_t::set_geometry (const char *geom)
254{ 258{
259 bool changed = false;
255 int geom_flags = 0, changed = 0; 260 int geom_flags = 0;
256 int x = 0, y = 0; 261 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
258 unsigned int n; 263 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 265 const char *p;
… …
416 421
417 while (*ops != ':' && *ops != '\0') ++ops; 422 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 423 } /* done parsing ops */
419 } 424 }
420 425
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 428 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 } 430 }
426 431
427 if (new_flags != flags) 432 if (new_flags != flags)
428 { 433 {
429 flags = new_flags; 434 flags = new_flags;
430 changed++; 435 changed = true;
431 } 436 }
432 437
433 return (changed > 0); 438 return changed;
434} 439}
435 440
436void 441void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 442bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 443{
… …
661 if (result) 666 if (result)
662 { 667 {
663 XGCValues gcv; 668 XGCValues gcv;
664 GC gc; 669 GC gc;
665 670
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 671 /* create Pixmap */
678 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
679 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 682 pmap_depth = target->depth;
684 } 683 }
… …
729 return false; 728 return false;
730 729
731 if (!pixbuf) 730 if (!pixbuf)
732 return false; 731 return false;
733 732
734#if !XRENDER
735 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
736 return false; 735 return false;
737#endif
738 736
739 GdkPixbuf *result; 737 GdkPixbuf *result;
740 738
741 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 740 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
795 } 793 }
796 } 794 }
797 795
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
810 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 806 pmap_depth = target->depth;
815 } 807 }
… …
909# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
910 902
911bool 903bool
912bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
913{ 905{
914 assert (file); 906 if (!file || !*file)
907 return false;
915 908
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
919 { 910 {
920 size_t len = p - file; 911 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 913 memcpy (f, file, len);
923 f[len] = '\0'; 914 f[len] = '\0';
924 file = f; 915 file = f;
925 } 916 }
926 917
927# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 919 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 922 if (image)
932 { 923 {
933 if (original_asim) 924 if (original_asim)
934 safe_asimage_destroy (original_asim); 925 safe_asimage_destroy (original_asim);
935 original_asim = image; 926 original_asim = image;
936 have_image = true; 927 have_image = true;
937 return true; 928 return true;
938 } 929 }
939# endif 930# endif
940 931
941# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 934 if (image)
944 { 935 {
945 if (pixbuf) 936 if (pixbuf)
946 g_object_unref (pixbuf); 937 g_object_unref (pixbuf);
947 pixbuf = image; 938 pixbuf = image;
948 have_image = true; 939 have_image = true;
949 return true; 940 return true;
950 } 941 }
951# endif 942# endif
952 }
953 943
954 return false; 944 return false;
955} 945}
956 946
957# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
970} 960}
971 961
972bool 962bool
973bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
974{ 964{
975 int changed = 0; 965 bool changed = false;
976 unsigned int hr, vr; 966 unsigned int hr, vr;
977 int junk; 967 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 969
980 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 975 min_it (hr, 128);
986 min_it (vr, 128); 976 min_it (vr, 128);
987 977
988 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
989 { 979 {
990 ++changed; 980 changed = true;
991 h_blurRadius = hr; 981 h_blurRadius = hr;
992 } 982 }
993 983
994 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
995 { 985 {
996 ++changed; 986 changed = true;
997 v_blurRadius = vr; 987 v_blurRadius = vr;
998 } 988 }
999 989
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
1002 else 992 else
1003 flags |= blurNeeded; 993 flags |= blurNeeded;
1004 994
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 995 return changed;
1018} 996}
1019 997
1020static inline unsigned long 998static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 1000{
… …
1041 { 1019 {
1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1020 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1021 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1044 { 1022 {
1045 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
1046 }
1047 }
1048
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XRENDER
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 } 1024 }
1059 } 1025 }
1060 1026
1061 return flags; 1027 return flags;
1062} 1028}
… …
1261 1227
1262 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1263 { 1229 {
1264 XRenderColor mask_c; 1230 XRenderColor mask_c;
1265 1231
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1267 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1235
1270 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
… …
1338 Pixmap recoded_root_pmap = root_pixmap; 1304 Pixmap recoded_root_pmap = root_pixmap;
1339 1305
1340 if (root_pixmap != None && root_depth != target->depth) 1306 if (root_pixmap != None && root_depth != target->depth)
1341 { 1307 {
1342#if XRENDER 1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1343 XRenderPictureAttributes pa; 1311 XRenderPictureAttributes pa;
1344 1312
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347 1315
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); 1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351 1319
1352 if (src && dst) 1320 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1354 else 1331 else
1355 { 1332#endif
1356 XFreePixmap (dpy, recoded_root_pmap);
1357 root_pixmap = None;
1358 }
1359
1360 XRenderFreePicture (dpy, src);
1361 XRenderFreePicture (dpy, dst);
1362#else
1363 root_pixmap = None; 1333 root_pixmap = None;
1364#endif
1365 } 1334 }
1366 1335
1367 if (root_pixmap == None) 1336 if (root_pixmap == None)
1368 return 0; 1337 return 0;
1369 1338
… …
1386 if (gc) 1355 if (gc)
1387 { 1356 {
1388 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1389 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1390 XFreeGC (dpy, gc); 1359 XFreeGC (dpy, gc);
1391 }
1392 1360
1393 if (tiled_root_pmap != None)
1394 {
1395 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1396 { 1362 {
1397 if ((flags & blurNeeded) 1363 if ((flags & blurNeeded)
1398 && (flags & blurServerSide)) 1364 && (flags & HAS_RENDER_CONV))
1399 { 1365 {
1400 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1401 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1402 } 1368 }
1403 if ((flags & tintNeeded) 1369 if ((flags & tintNeeded)
1404 && (flags & tintServerSide)) 1370 && (flags & (tintWholesome | HAS_RENDER)))
1405 { 1371 {
1406 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1407 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1408 } 1374 }
1409 } /* server side rendering completed */ 1375 } /* server side rendering completed */
… …
1414 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1415 pmap_width = window_width; 1381 pmap_width = window_width;
1416 pmap_height = window_height; 1382 pmap_height = window_height;
1417 pmap_depth = target->depth; 1383 pmap_depth = target->depth;
1418 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1419 1387
1420 if (recoded_root_pmap != root_pixmap) 1388 if (recoded_root_pmap != root_pixmap)
1421 XFreePixmap (dpy, recoded_root_pmap); 1389 XFreePixmap (dpy, recoded_root_pmap);
1422 1390
1423 return result; 1391 return result;
… …
1432 1400
1433 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1434} 1402}
1435# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1436 1404
1437# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1438static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1439# endif 1407# endif
1440 1408
1441bool 1409bool
1442bgPixmap_t::render () 1410bgPixmap_t::render ()
1443{ 1411{
… …
1466 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1467 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1468 } 1436 }
1469# endif 1437# endif
1470 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1471 XImage *result = NULL; 1440 XImage *result = NULL;
1472 1441
1473 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1474 { 1443 {
1475 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1476 } 1445 }
1477 1446
1478 if (result) 1447 if (result)
1479 { 1448 {
1480# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1481 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1482 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1483 { 1451 {
1484 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1485 if (flags & tintSet) 1453 if (flags & tintSet)
1486 tint.get (c); 1454 tint.get (c);
1487 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1488 } 1456 }
1489# endif
1490 1457
1491 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1492 1459
1493 if (gc) 1460 if (gc)
1494 { 1461 {
… …
1498 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1499 } 1466 }
1500 1467
1501 XDestroyImage (result); 1468 XDestroyImage (result);
1502 } 1469 }
1470# endif
1503 1471
1504 if (flags & isInvalid) 1472 if (flags & isInvalid)
1505 { 1473 {
1506 if (pixmap != None) 1474 if (pixmap != None)
1507 { 1475 {
… …
1519 1487
1520void 1488void
1521bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1522{ 1490{
1523 target = new_target; 1491 target = new_target;
1492
1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1507#endif
1524} 1508}
1525 1509
1526void 1510void
1527bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1528{ 1512{
1529 if (target) 1513 if (target == NULL)
1530 { 1514 return;
1515
1531 if (pixmap != None) 1516 if (pixmap != None)
1532 { 1517 {
1533 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1534# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1535 if (flags & isTransparent) 1520 if (flags & isTransparent)
1536 { 1521 {
1537 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1538 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1539 1524
1540 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1541 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1542 } 1527 }
1543 else 1528 else
1544# endif 1529# endif
1545 { 1530 {
1546 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* force old pixmap dereference in case it was transparent before :*/
1547 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1548 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1549 /* do we also need to set scrollbar's background here ? */
1550
1551 if (target->scrollBar.win)
1552 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1553 }
1554 }
1555 else
1556 {
1557 /* set target background to a pixel */
1558 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1559 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1560 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1561 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1562 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1563 } 1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1564 1549
1565 /* don't want Expose on the parent or vt. It is better to use 1550 /* don't want Expose on the parent or vt. It is better to use
1566 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1567 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1568 1553
1569 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1570 { 1555 {
1571 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1572 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1573 } 1558 }
1574 1559
1575 target->want_refresh = 1; 1560 target->want_refresh = 1;
1576 flags |= hasChanged; 1561 flags |= hasChanged;
1577 }
1578} 1562}
1579 1563
1580#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1581 1565
1582#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1583/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1584 1568
1585static void 1569static void
1586ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1587{ 1571{
1588 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1589 uint32_t mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1590 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1591 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1592 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1593 int i; 1577 int i;
1594 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1595 1579
1596 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1597 1581
… …
1662 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1663 if (shade > 100) 1647 if (shade > 100)
1664 { 1648 {
1665 shade = 200 - shade; 1649 shade = 200 - shade;
1666 1650
1667 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1668 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1669 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1670 1654
1671 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1655 low.r = 65535 - high.r;
1672 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1656 low.g = 65535 - high.g;
1673 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1657 low.b = 65535 - high.b;
1674
1675 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1676 } 1658 }
1677 else 1659 else
1678 { 1660 {
1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1679 1664
1680 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1665 low.r = low.g = low.b = 0;
1681
1682 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1683 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1684 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1685 } 1666 }
1686 1667
1687 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1688 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1689 { 1670 {
1690 uint32_t tmp; 1671 uint32_t tmp;
1691 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1692 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1693 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1694 } 1675 }
1695 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1696 { 1677 {
1697 uint32_t tmp; 1678 uint32_t tmp;
1698 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1699 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1700 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1701 } 1682 }
1702 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1703 { 1684 {
1704 uint32_t tmp; 1685 uint32_t tmp;
1705 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1706 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1707 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1708 } 1689 }
1709 1690
1710 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1711 if (srcImage->bits_per_pixel == 32 1692 if (srcImage->bits_per_pixel == 32

Diff Legend

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