Merge ../../neutrinolabs/xrdp into fastpath

Conflicts:
	libxrdp/libxrdp.c
	libxrdp/libxrdp.h
	libxrdp/xrdp_iso.c
	libxrdp/xrdp_sec.c
	libxrdp/xrdp_tcp.c
	xrdp/xrdp.ini

1 files changed, 45 insertions, 1 deletions

diff --git a/xorg/server/module/rdpPolyFillArc.c b/xorg/server/module/rdpPolyFillArc.c
index 62d16675..437929ae 100644
--- a/xorg/server/module/rdpPolyFillArc.c
+++ b/xorg/server/module/rdpPolyFillArc.c
@@ -32,13 +32,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "rdp.h"
 #include "rdpDraw.h"
+#include "rdpClientCon.h"
+#include "rdpReg.h"
 
 #define LOG_LEVEL 1
 #define LLOGLN(_level, _args) \
     do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
 
 /******************************************************************************/
-void
+static void
 rdpPolyFillArcOrg(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
 {
     GC_OP_VARS;
@@ -52,7 +54,49 @@ rdpPolyFillArcOrg(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
 void
 rdpPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs)
 {
+    rdpPtr dev;
+    BoxRec box;
+    int index;
+    int cd;
+    int lw;
+    int extra;
+    RegionRec clip_reg;
+    RegionRec reg;
+
     LLOGLN(10, ("rdpPolyFillArc:"));
+    dev = rdpGetDevFromScreen(pGC->pScreen);
+    dev->counts.rdpPolyFillArcCallCount++;
+    rdpRegionInit(&reg, NullBox, 0);
+    if (narcs > 0)
+    {
+        lw = pGC->lineWidth;
+        if (lw == 0)
+        {
+            lw = 1;
+        }
+        extra = lw / 2;
+        for (index = 0; index < narcs; index++)
+        {
+            box.x1 = (parcs[index].x - extra) + pDrawable->x;
+            box.y1 = (parcs[index].y - extra) + pDrawable->y;
+            box.x2 = box.x1 + parcs[index].width + lw;
+            box.y2 = box.y1 + parcs[index].height + lw;
+            rdpRegionUnionRect(&reg, &box);
+        }
+    }
+    rdpRegionInit(&clip_reg, NullBox, 0);
+    cd = rdpDrawGetClip(dev, &clip_reg, pDrawable, pGC);
+    LLOGLN(10, ("rdpPolyFillArc: cd %d", cd));
+    if (cd == XRDP_CD_CLIP)
+    {
+        rdpRegionIntersect(&reg, &clip_reg, &reg);
+    }
     /* do original call */
     rdpPolyFillArcOrg(pDrawable, pGC, narcs, parcs);
+    if (cd != XRDP_CD_NODRAW)
+    {
+        rdpClientConAddAllReg(dev, &reg, pDrawable);
+    }
+    rdpRegionUninit(&clip_reg);
+    rdpRegionUninit(&reg);
 }