o Previous merge had too many issues. Hence all files in .../xorg/X11R7.6/rdp were copied

  from master branch and then astyle was run on the files

1 files changed, 23 insertions, 9 deletions

diff --git a/xorg/X11R7.6/rdp/rdpPolyRectangle.c b/xorg/X11R7.6/rdp/rdpPolyRectangle.c
index 3512bf58..8de1e43f 100644
--- a/xorg/X11R7.6/rdp/rdpPolyRectangle.c
+++ b/xorg/X11R7.6/rdp/rdpPolyRectangle.c
@@ -109,22 +109,25 @@ rdpPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects,
 
     if (pDrawable->type == DRAWABLE_PIXMAP)
     {
-        pDstWnd = (WindowPtr)pDrawable;
+        pDstPixmap = (PixmapPtr)pDrawable;
+        pDstPriv = GETPIXPRIV(pDstPixmap);
 
-        if (pDstWnd->viewable)
+        if (XRDP_IS_OS(pDstPriv))
         {
             post_process = 1;
 
-            if (g_do_dirty_ons)
+            if (g_do_dirty_os)
             {
-                LLOGLN(0, ("rdpPolyRectangle: gettig dirty"));
-                g_screenPriv.is_dirty = 1;
-                pDirtyPriv = &g_screenPriv;
+                LLOGLN(10, ("rdpPolyRectangle: gettig dirty"));
+                pDstPriv->is_dirty = 1;
+                pDirtyPriv = pDstPriv;
                 dirty_type = RDI_IMGLL;
             }
             else
             {
-                rdpup_get_screen_image_rect(&id);
+                rdpup_switch_os_surface(pDstPriv->rdpindex);
+                reset_surface = 1;
+                rdpup_get_pixmap_image_rect(pDstPixmap, &id);
                 got_id = 1;
             }
         }
@@ -138,8 +141,19 @@ rdpPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects,
             if (pDstWnd->viewable)
             {
                 post_process = 1;
-                rdpup_get_screen_image_rect(&id);
-                got_id = 1;
+
+                if (g_do_dirty_ons)
+                {
+                    LLOGLN(0, ("rdpPolyRectangle: gettig dirty"));
+                    g_screenPriv.is_dirty = 1;
+                    pDirtyPriv = &g_screenPriv;
+                    dirty_type = RDI_IMGLL;
+                }
+                else
+                {
+                    rdpup_get_screen_image_rect(&id);
+                    got_id = 1;
+                }
             }
         }
     }