xorg: work on delayed/dirty updates

3 files changed, 96 insertions, 75 deletions

diff --git a/xorg/X11R7.6/rdp/rdpCopyArea.c b/xorg/X11R7.6/rdp/rdpCopyArea.c
index d9958e92..4b35d9fb 100644
--- a/xorg/X11R7.6/rdp/rdpCopyArea.c
+++ b/xorg/X11R7.6/rdp/rdpCopyArea.c
@@ -37,6 +37,8 @@ extern DevPrivateKeyRec g_rdpPixmapIndex; /* from rdpmain.c */
 extern int g_Bpp; /* from rdpmain.c */
 extern ScreenPtr g_pScreen; /* from rdpmain.c */
 extern Bool g_wrapPixmap; /* from rdpmain.c */
+extern int g_can_do_pix_to_pix; /* from rdpmain.c */
+extern int g_do_dirty_os; /* in rdpmain.c */
 
 extern GCOps g_rdpGCOps; /* from rdpdraw.c */
 
@@ -329,11 +331,15 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
   RegionPtr rv;
   RegionRec clip_reg;
   RegionRec box_reg;
+  RegionRec reg1;
   int num_clips;
   int cd;
   int j;
   int can_do_screen_blt;
   int got_id;
+  int dirty_type;
+  int post_process;
+  int reset_surface;
   struct image_data id;
   BoxRec box;
   BoxPtr pbox;
@@ -341,30 +347,12 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
   PixmapPtr pDstPixmap;
   rdpPixmapRec* pSrcPriv;
   rdpPixmapRec* pDstPriv;
+  rdpPixmapRec* pDirtyPriv;
   WindowPtr pDstWnd;
   WindowPtr pSrcWnd;
 
   LLOGLN(10, ("rdpCopyArea:"));
 
-  if (pSrc->type == DRAWABLE_PIXMAP)
-  {
-    pSrcPixmap = (PixmapPtr)pSrc;
-    pSrcPriv = GETPIXPRIV(pSrcPixmap);
-    if (XRDP_IS_OS(pSrcPriv))
-    {
-      rdpup_check_dirty(pSrcPixmap, pSrcPriv);
-    }
-  }
-  if (pDst->type == DRAWABLE_PIXMAP)
-  {
-    pDstPixmap = (PixmapPtr)pDst;
-    pDstPriv = GETPIXPRIV(pDstPixmap);
-    if (XRDP_IS_OS(pDstPriv))
-    {
-      rdpup_check_dirty(pDstPixmap, pDstPriv);
-    }
-  }
-
   if (pSrc->type == DRAWABLE_WINDOW)
   {
     pSrcWnd = (WindowPtr)pSrc;
@@ -392,6 +380,7 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
           can_do_screen_blt = pGC->alu == GXcopy;
           if (can_do_screen_blt)
           {
+            rdpup_check_dirty(pDstPixmap, pDstPriv);
             return rdpCopyAreaWndToPixmap(pSrcWnd, pDstPixmap, pDstPriv, pGC,
                                           srcx, srcy, w, h, dstx, dsty);
           }
@@ -410,6 +399,7 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
         pDstWnd = (WindowPtr)pDst;
         if (pDstWnd->viewable)
         {
+          rdpup_check_dirty(pSrcPixmap, pSrcPriv);
           return rdpCopyAreaPixmapToWnd(pSrcPixmap, pSrcPriv, pDstWnd, pGC,
                                         srcx, srcy, w, h, dstx, dsty);
         }
@@ -420,10 +410,15 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
         pDstPriv = GETPIXPRIV(pDstPixmap);
         if (XRDP_IS_OS(pDstPriv))
         {
-          return rdpCopyAreaPixmapToPixmap(pSrcPixmap, pSrcPriv,
-                                           pDstPixmap, pDstPriv,
-                                           pGC, srcx, srcy, w, h,
-                                           dstx, dsty);
+          if (g_can_do_pix_to_pix)
+          {
+            rdpup_check_dirty(pSrcPixmap, pSrcPriv);
+            rdpup_check_dirty(pDstPixmap, pDstPriv);
+            return rdpCopyAreaPixmapToPixmap(pSrcPixmap, pSrcPriv,
+                                             pDstPixmap, pDstPriv,
+                                             pGC, srcx, srcy, w, h,
+                                             dstx, dsty);
+          }
         }
       }
     }
@@ -432,6 +427,10 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
   /* do original call */
   rv = rdpCopyAreaOrg(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);
 
+  dirty_type = 0;
+  pDirtyPriv = 0;
+  post_process = 0;
+  reset_surface = 0;
   got_id = 0;
   if (pDst->type == DRAWABLE_PIXMAP)
   {
@@ -439,9 +438,21 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
     pDstPriv = GETPIXPRIV(pDstPixmap);
     if (XRDP_IS_OS(pDstPriv))
     {
-      rdpup_switch_os_surface(pDstPriv->rdpindex);
-      rdpup_get_pixmap_image_rect(pDstPixmap, &id);
-      got_id = 1;
+      post_process = 1;
+      if (g_do_dirty_os)
+      {
+        LLOGLN(10, ("rdpCopyArea: gettig dirty"));
+        pDstPriv->is_dirty = 1;
+        pDirtyPriv = pDstPriv;
+        dirty_type = RDI_IMGLL;
+      }
+      else
+      {
+        rdpup_switch_os_surface(pDstPriv->rdpindex);
+        reset_surface = 1;
+        rdpup_get_pixmap_image_rect(pDstPixmap, &id);
+        got_id = 1;
+      }
     }
   }
   else
@@ -451,12 +462,13 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
       pDstWnd = (WindowPtr)pDst;
       if (pDstWnd->viewable)
       {
+        post_process = 1;
         rdpup_get_screen_image_rect(&id);
         got_id = 1;
       }
     }
   }
-  if (!got_id)
+  if (!post_process)
   {
     return rv;
   }
@@ -465,43 +477,73 @@ rdpCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
   cd = rdp_get_clip(&clip_reg, pDst, pGC);
   if (cd == 1)
   {
-    rdpup_begin_update();
-    rdpup_send_area(&id, pDst->x + dstx, pDst->y + dsty, w, h);
-    rdpup_end_update();
+    if (dirty_type != 0)
+    {
+      box.x1 = pDst->x + dstx;
+      box.y1 = pDst->y + dsty;
+      box.x2 = box.x1 + w;
+      box.y2 = box.y1 + h;
+      RegionInit(&reg1, &box, 0);
+      draw_item_add_img_region(pDirtyPriv, &reg1, GXcopy, dirty_type);
+      RegionUninit(&reg1);
+    }
+    else if (got_id)
+    {
+      rdpup_begin_update();
+      rdpup_send_area(&id, pDst->x + dstx, pDst->y + dsty, w, h);
+      rdpup_end_update();
+    }
   }
   else if (cd == 2)
   {
     num_clips = REGION_NUM_RECTS(&clip_reg);
     if (num_clips > 0)
     {
-      rdpup_begin_update();
-      box.x1 = pDst->x + dstx;
-      box.y1 = pDst->y + dsty;
-      box.x2 = box.x1 + w;
-      box.y2 = box.y1 + h;
-      RegionInit(&box_reg, &box, 0);
-      RegionIntersect(&clip_reg, &clip_reg, &box_reg);
-      num_clips = REGION_NUM_RECTS(&clip_reg);
-      if (num_clips < 10)
+      if (dirty_type != 0)
       {
-        for (j = num_clips - 1; j >= 0; j--)
-        {
-          box = REGION_RECTS(&clip_reg)[j];
-          rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1,
-                          box.y2 - box.y1);
-        }
+        box.x1 = pDst->x + dstx;
+        box.y1 = pDst->y + dsty;
+        box.x2 = box.x1 + w;
+        box.y2 = box.y1 + h;
+        RegionInit(&box_reg, &box, 0);
+        RegionIntersect(&clip_reg, &clip_reg, &box_reg);
+        draw_item_add_img_region(pDirtyPriv, &clip_reg, GXcopy, dirty_type);
+        RegionUninit(&box_reg);
       }
-      else
+      else if (got_id)
       {
-        pbox = RegionExtents(&clip_reg);
-        rdpup_send_area(&id, pbox->x1, pbox->y1, pbox->x2 - pbox->x1,
-                        pbox->y2 - pbox->y1);
+        rdpup_begin_update();
+        box.x1 = pDst->x + dstx;
+        box.y1 = pDst->y + dsty;
+        box.x2 = box.x1 + w;
+        box.y2 = box.y1 + h;
+        RegionInit(&box_reg, &box, 0);
+        RegionIntersect(&clip_reg, &clip_reg, &box_reg);
+        num_clips = REGION_NUM_RECTS(&clip_reg);
+        if (num_clips < 10)
+        {
+          for (j = num_clips - 1; j >= 0; j--)
+          {
+            box = REGION_RECTS(&clip_reg)[j];
+            rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1,
+                            box.y2 - box.y1);
+          }
+        }
+        else
+        {
+          pbox = RegionExtents(&clip_reg);
+          rdpup_send_area(&id, pbox->x1, pbox->y1, pbox->x2 - pbox->x1,
+                          pbox->y2 - pbox->y1);
+        }
+        RegionUninit(&box_reg);
+        rdpup_end_update();
       }
-      RegionUninit(&box_reg);
-      rdpup_end_update();
     }
   }
   RegionUninit(&clip_reg);
-  rdpup_switch_os_surface(-1);
+  if (reset_surface)
+  {
+    rdpup_switch_os_surface(-1);
+  }
   return rv;
 }
diff --git a/xorg/X11R7.6/rdp/rdpCopyPlane.c b/xorg/X11R7.6/rdp/rdpCopyPlane.c
index 73f337cc..389dc6e1 100644
--- a/xorg/X11R7.6/rdp/rdpCopyPlane.c
+++ b/xorg/X11R7.6/rdp/rdpCopyPlane.c
@@ -86,30 +86,8 @@ rdpCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
   rdpPixmapRec* pDstPriv;
   rdpPixmapRec* pDirtyPriv;
 
-  PixmapPtr pSrcPixmap;
-  rdpPixmapRec* pSrcPriv;
-
   LLOGLN(10, ("rdpCopyPlane:"));
 
-  if (pSrc->type == DRAWABLE_PIXMAP)
-  {
-    pSrcPixmap = (PixmapPtr)pSrc;
-    pSrcPriv = GETPIXPRIV(pSrcPixmap);
-    if (XRDP_IS_OS(pSrcPriv))
-    {
-      rdpup_check_dirty(pSrcPixmap, pSrcPriv);
-    }
-  }
-  if (pDst->type == DRAWABLE_PIXMAP)
-  {
-    pDstPixmap = (PixmapPtr)pDst;
-    pDstPriv = GETPIXPRIV(pDstPixmap);
-    if (XRDP_IS_OS(pDstPriv))
-    {
-      rdpup_check_dirty(pDstPixmap, pDstPriv);
-    }
-  }
-
   /* do original call */
   rv = rdpCopyPlaneOrg(pSrc, pDst, pGC, srcx, srcy, w, h,
                        dstx, dsty, bitPlane);
@@ -200,7 +178,7 @@ rdpCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
         RegionUninit(&reg1);
         RegionUninit(&reg2);
       }
-      else
+      else if (got_id)
       {
         rdpup_begin_update();
         box.x1 = pDst->x + dstx;
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c
index 15a8993d..48f5a2e9 100644
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@@ -42,6 +42,7 @@ DevPrivateKeyRec g_rdpPixmapIndex;
 DeviceIntPtr g_pointer = 0;
 DeviceIntPtr g_keyboard = 0;
 
+int g_can_do_pix_to_pix = 1;
 int g_do_dirty_os = 1; /* delay remoting off screen bitmaps */
 Bool g_wrapWindow = 1;
 Bool g_wrapPixmap = 1;