Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
hiwin.c
Log Message:
Fix shape on pager zoom window (when composite is enabled).
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- hiwin.c 20 Jun 2006 23:00:58 -0000 1.18
+++ hiwin.c 12 Aug 2006 16:16:26 -0000 1.19
@@ -52,6 +52,25 @@
static ImageClass *hiwin_ic = NULL;
+/* TBD: Move elsewhere? */
+static EImage *
+EobjGetImage(EObj * eo, Drawable draw)
+{
+ EImage *im;
+ Pixmap mask;
+ int shaped;
+
+ mask = None;
+ shaped = EShapeCheck(EobjGetWin(eo));
+ if (shaped)
+ mask = EWindowGetShapePixmap(EobjGetWin(eo));
+ im = EImageGrabDrawable(draw, mask, 0, 0, EobjGetW(eo), EobjGetH(eo), 0);
+ if (mask)
+ EFreePixmap(mask);
+
+ return im;
+}
+
static void
HiwinRenderImageInit(Hiwin * phi)
{
@@ -61,20 +80,19 @@
pmap = EoGetPixmap(ewin);
if (pmap)
{
- phi->im = EImageGrabDrawable(pmap, None, 0, 0,
- EoGetW(ewin), EoGetH(ewin), 0);
+ phi->im = EobjGetImage(EoObj(ewin), pmap);
/* Skip zoom effect if composite is active */
phi->animate = 0;
}
else if (phi->zoom > 2 && EwinIsOnScreen(ewin))
{
- phi->im = EImageGrabDrawable(EoGetXwin(ewin), None, 0, 0,
- EoGetW(ewin), EoGetH(ewin), 0);
+ phi->im = EobjGetImage(EoObj(ewin), EoGetXwin(ewin));
}
else
{
- phi->im = EImageGrabDrawable(ewin->mini_pmm.pmap, None, 0, 0,
- ewin->mini_w, ewin->mini_h, 0);
+ phi->im =
+ EImageGrabDrawable(ewin->mini_pmm.pmap, ewin->mini_pmm.mask, 0, 0,
+ ewin->mini_w, ewin->mini_h, 0);
}
ESetWindowBackgroundPixmap(EoGetWin(phi), None);
@@ -85,10 +103,23 @@
}
static void
-HiwinRenderImageDrawX(Hiwin * phi, Drawable draw)
+HiwinRenderImageDrawX(Hiwin * phi, Drawable draw __UNUSED__)
{
+#if 0
EImageRenderOnDrawable(phi->im, EoGetWin(phi), draw, 0, 0,
EoGetW(phi), EoGetH(phi), 0);
+#else
+ Pixmap pmap, mask;
+
+ EImageRenderPixmaps(phi->im, EoGetWin(phi), &pmap, &mask,
+ EoGetW(phi), EoGetH(phi));
+ ESetWindowBackgroundPixmap(EoGetWin(phi), pmap);
+ if (mask)
+ EShapeCombineMask(EoGetWin(phi), ShapeBounding, 0, 0, mask, ShapeSet);
+ EImagePixmapFree(pmap);
+ EClearWindow(EoGetWin(phi));
+ EoShapeUpdate(phi, 0);
+#endif
}
static void
@@ -100,16 +131,8 @@
static void
HiwinRenderImageFini(Hiwin * phi, int shown)
{
- Pixmap pmap;
-
if (shown)
- {
- pmap = ECreatePixmap(EoGetWin(phi), EoGetW(phi), EoGetH(phi), 0);
- ESetWindowBackgroundPixmap(EoGetWin(phi), pmap);
- HiwinRenderImageDrawX(phi, pmap);
- EFreePixmap(pmap);
- EClearWindow(EoGetWin(phi));
- }
+ HiwinRenderImageDraw(phi);
EImageDecache(phi->im);
phi->im = NULL;
}
@@ -125,10 +148,8 @@
if (pmap == None)
return;
- phi->im = EImageGrabDrawable(pmap, None, 0, 0,
- EoGetW(ewin), EoGetH(ewin), 0);
- ESetWindowBackgroundPixmap(EoGetWin(phi), None);
- HiwinRenderImageDrawX(phi, EoGetXwin(phi));
+ phi->im = EobjGetImage(EoObj(ewin), pmap);
+ HiwinRenderImageDraw(phi);
EImageDecache(phi->im);
phi->im = NULL;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
