xorg: work on xorg driver

5 files changed, 70 insertions, 17 deletions

diff --git a/xorg/server/module/rdpComposite.c b/xorg/server/module/rdpComposite.c
index 87a9364f..59ab93d0 100644
--- a/xorg/server/module/rdpComposite.c
+++ b/xorg/server/module/rdpComposite.c
@@ -35,8 +35,10 @@ composite(alpha blending) calls
 #include <picture.h>
 
 #include "rdp.h"
-#include "rdpComposite.h"
 #include "rdpDraw.h"
+#include "rdpClientCon.h"
+#include "rdpReg.h"
+#include "rdpComposite.h"
 
 /******************************************************************************/
 #define LOG_LEVEL 1
@@ -45,6 +47,17 @@ composite(alpha blending) calls
 
 /******************************************************************************/
 static void
+rdpCompositePre(rdpPtr dev, rdpClientCon *clientCon,
+                PictureScreenPtr ps, CARD8 op, PicturePtr pSrc,
+                PicturePtr pMask, PicturePtr pDst,
+                INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
+                INT16 xDst, INT16 yDst, CARD16 width, CARD16 height,
+                BoxPtr box)
+{
+}
+
+/******************************************************************************/
+static void
 rdpCompositeOrg(PictureScreenPtr ps, rdpPtr dev,
                 CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
                 INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
@@ -57,6 +70,30 @@ rdpCompositeOrg(PictureScreenPtr ps, rdpPtr dev,
 }
 
 /******************************************************************************/
+static void
+rdpCompositePost(rdpPtr dev, rdpClientCon *clientCon,
+                 PictureScreenPtr ps, CARD8 op, PicturePtr pSrc,
+                 PicturePtr pMask, PicturePtr pDst,
+                 INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
+                 INT16 xDst, INT16 yDst, CARD16 width, CARD16 height,
+                 BoxPtr box)
+{
+    RegionRec reg;
+
+    if (!XRDP_DRAWABLE_IS_VISIBLE(dev, pDst->pDrawable))
+    {
+        return;
+    }
+    rdpRegionInit(&reg, box, 0);
+    if (pDst->pCompositeClip != 0)
+    {
+        rdpRegionIntersect(&reg, pDst->pCompositeClip, &reg);
+    }
+    rdpClientConAddDirtyScreenReg(dev, clientCon, &reg);
+    RegionUninit(&reg);
+}
+
+/******************************************************************************/
 void
 rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
              INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst,
@@ -64,12 +101,35 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
 {
     ScreenPtr pScreen;
     rdpPtr dev;
+    rdpClientCon *clientCon;
     PictureScreenPtr ps;
+    BoxRec box;
 
     LLOGLN(10, ("rdpComposite:"));
     pScreen = pSrc->pDrawable->pScreen;
     dev = rdpGetDevFromScreen(pScreen);
+    box.x1 = xDst + pDst->pDrawable->x;
+    box.y1 = yDst + pDst->pDrawable->y;
+    box.x2 = box.x1 + width;
+    box.y2 = box.y1 + height;
     ps = GetPictureScreen(pScreen);
+    clientCon = dev->clientConHead;
+    while (clientCon != NULL)
+    {
+        rdpCompositePre(dev, clientCon, ps, op, pSrc, pMask, pDst,
+                        xSrc, ySrc, xMask, yMask, xDst, yDst,
+                        width, height, &box);
+        clientCon = clientCon->next;
+    }
+    /* do original call */
     rdpCompositeOrg(ps, dev, op, pSrc, pMask, pDst, xSrc, ySrc,
                     xMask, yMask, xDst, yDst, width, height);
+    clientCon = dev->clientConHead;
+    while (clientCon != NULL)
+    {
+        rdpCompositePost(dev, clientCon, ps, op, pSrc, pMask, pDst,
+                         xSrc, ySrc, xMask, yMask, xDst, yDst,
+                         width, height, &box);
+        clientCon = clientCon->next;
+    }
 }
diff --git a/xorg/server/module/rdpDraw.h b/xorg/server/module/rdpDraw.h
index c06f59d7..b471b4d2 100644
--- a/xorg/server/module/rdpDraw.h
+++ b/xorg/server/module/rdpDraw.h
@@ -27,6 +27,12 @@ misc draw calls
 #include <xorg-server.h>
 #include <xf86.h>
 
+/* true is drawable is window or pixmap is screen */
+#define XRDP_DRAWABLE_IS_VISIBLE(_dev, _drw) \
+(((_drw)->type == DRAWABLE_WINDOW && ((WindowPtr)(_drw))->viewable) || \
+ ((_drw)->type == DRAWABLE_PIXMAP && \
+                   ((PixmapPtr)(_drw))->devPrivate.ptr == (_dev)->pfbMemory))
+
 /******************************************************************************/
 #define GC_OP_VARS rdpPtr dev; rdpGCPtr priv; GCFuncs *oldFuncs
 
diff --git a/xorg/server/module/rdpImageText16.c b/xorg/server/module/rdpImageText16.c
index a4604433..60576bbb 100644
--- a/xorg/server/module/rdpImageText16.c
+++ b/xorg/server/module/rdpImageText16.c
@@ -69,19 +69,13 @@ rdpImageText16Post(rdpPtr dev, rdpClientCon *clientCon,
                    int x, int y, int count, unsigned short *chars,
                    BoxPtr box)
 {
-    WindowPtr pDstWnd;
     RegionRec reg;
 
     if (cd == 0)
     {
         return;
     }
-    if (pDrawable->type != DRAWABLE_WINDOW)
-    {
-        return;
-    }
-    pDstWnd = (WindowPtr) pDrawable;
-    if (pDstWnd->viewable == FALSE)
+    if (!XRDP_DRAWABLE_IS_VISIBLE(dev, pDrawable))
     {
         return;
     }
diff --git a/xorg/server/module/rdpPolyFillArc.c b/xorg/server/module/rdpPolyFillArc.c
index 62d16675..101ecdb0 100644
--- a/xorg/server/module/rdpPolyFillArc.c
+++ b/xorg/server/module/rdpPolyFillArc.c
@@ -52,7 +52,7 @@ rdpPolyFillArcOrg(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
 void
 rdpPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
 {
-    LLOGLN(10, ("rdpPolyFillArc:"));
+    LLOGLN(0, ("rdpPolyFillArc:"));
     /* do original call */
     rdpPolyFillArcOrg(pDrawable, pGC, narcs, parcs);
 }
diff --git a/xorg/server/module/rdpPolyFillRect.c b/xorg/server/module/rdpPolyFillRect.c
index 3f05896a..434fe504 100644
--- a/xorg/server/module/rdpPolyFillRect.c
+++ b/xorg/server/module/rdpPolyFillRect.c
@@ -65,18 +65,11 @@ rdpPolyFillRectPost(rdpPtr dev, rdpClientCon *clientCon,
                     int cd, RegionPtr clip_reg,
                     DrawablePtr pDrawable, GCPtr pGC, RegionPtr fill_reg)
 {
-    WindowPtr pDstWnd;
-
     if (cd == 0)
     {
         return;
     }
-    if (pDrawable->type != DRAWABLE_WINDOW)
-    {
-        return;
-    }
-    pDstWnd = (WindowPtr) pDrawable;
-    if (pDstWnd->viewable == FALSE)
+    if (!XRDP_DRAWABLE_IS_VISIBLE(dev, pDrawable))
     {
         return;
     }