X11rdp: use lossy compression in more places

3 files changed, 23 insertions, 14 deletions

diff --git a/xorg/X11R7.6/rdp/rdpPolyFillRect.c b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
index 1043a5d9..af68e83f 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillRect.c
+++ b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
@@ -108,7 +108,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                 LLOGLN(10, ("rdpPolyFillRect: getting dirty"));
                 g_screenPriv.is_dirty = 1;
                 pDirtyPriv = &g_screenPriv;
-                dirty_type = RDI_IMGLL;
+                dirty_type = (FillTiled == pGC->fillStyle) ?
+                                    RDI_IMGLY : RDI_IMGLL;
             }
             else
             {
@@ -125,7 +126,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                 LLOGLN(10, ("rdpPolyFillRect: getting dirty"));
                 pDstPriv->is_dirty = 1;
                 pDirtyPriv = pDstPriv;
-                dirty_type = RDI_FILL;
+                dirty_type = (FillTiled == pGC->fillStyle) ?
+                                    RDI_IMGLY : RDI_IMGLL;
             }
             else
             {
@@ -151,7 +153,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                     LLOGLN(10, ("rdpPolyFillRect: getting dirty"));
                     g_screenPriv.is_dirty = 1;
                     pDirtyPriv = &g_screenPriv;
-                    dirty_type = RDI_IMGLL;
+                    dirty_type = (FillTiled == pGC->fillStyle) ?
+                                        RDI_IMGLY : RDI_IMGLL;
                 }
                 else
                 {
@@ -192,7 +195,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
             }
             else
             {
-                draw_item_add_img_region(pDirtyPriv, fill_reg, GXcopy, RDI_IMGLL, 2);
+                draw_item_add_img_region(pDirtyPriv, fill_reg, GXcopy,
+                                         dirty_type, 2);
             }
         }
         else if (got_id)
@@ -214,7 +218,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                 for (j = REGION_NUM_RECTS(fill_reg) - 1; j >= 0; j--)
                 {
                     box = REGION_RECTS(fill_reg)[j];
-                    rdpup_fill_rect(box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+                    rdpup_fill_rect(box.x1, box.y1,
+                                    box.x2 - box.x1, box.y2 - box.y1);
                 }
 
                 rdpup_set_opcode(GXcopy);
@@ -251,13 +256,15 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                          pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
                 {
                     LLOGLN(10, ("rdpPolyFillRect: 3"));
-                    draw_item_add_fill_region(pDirtyPriv, &clip_reg, pGC->fgPixel,
+                    draw_item_add_fill_region(pDirtyPriv, &clip_reg,
+                                              pGC->fgPixel,
                                               pGC->alu);
                 }
                 else
                 {
                     LLOGLN(10, ("rdpPolyFillRect: 4"));
-                    draw_item_add_img_region(pDirtyPriv, &clip_reg, GXcopy, RDI_IMGLL, 2);
+                    draw_item_add_img_region(pDirtyPriv, &clip_reg, GXcopy,
+                                             dirty_type, 2);
                 }
             }
             else if (got_id)
@@ -281,7 +288,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                     for (j = num_clips - 1; j >= 0; j--)
                     {
                         box = REGION_RECTS(&clip_reg)[j];
-                        rdpup_fill_rect(box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+                        rdpup_fill_rect(box.x1, box.y1,
+                                        box.x2 - box.x1, box.y2 - box.y1);
                     }
 
                     rdpup_set_opcode(GXcopy);
@@ -291,7 +299,8 @@ rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
                     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);
+                        rdpup_send_area(&id, box.x1, box.y1,
+                                        box.x2 - box.x1, box.y2 - box.y1);
                     }
                 }
 
diff --git a/xorg/X11R7.6/rdp/rdpPutImage.c b/xorg/X11R7.6/rdp/rdpPutImage.c
index ffc179d5..050f5f5f 100644
--- a/xorg/X11R7.6/rdp/rdpPutImage.c
+++ b/xorg/X11R7.6/rdp/rdpPutImage.c
@@ -135,7 +135,7 @@ rdpPutImage(DrawablePtr pDst, GCPtr pGC, int depth, int x, int y,
                     LLOGLN(10, ("rdpPutImage: getting dirty"));
                     g_screenPriv.is_dirty = 1;
                     pDirtyPriv = &g_screenPriv;
-                    dirty_type = RDI_IMGLL;
+                    dirty_type = RDI_IMGLY;
                 }
                 else
                 {
diff --git a/xorg/X11R7.6/rdp/rdpdraw.c b/xorg/X11R7.6/rdp/rdpdraw.c
index f9dff80a..2bb6ccc4 100644
--- a/xorg/X11R7.6/rdp/rdpdraw.c
+++ b/xorg/X11R7.6/rdp/rdpdraw.c
@@ -827,7 +827,7 @@ xrdp_is_os(PixmapPtr pix, rdpPixmapPtr priv)
                         LLOGLN(10, ("xrdp_is_os: queuing invalidating all"));
                         draw_item_remove_all(priv);
                         RegionInit(&reg1, &box, 0);
-                        draw_item_add_img_region(priv, &reg1, GXcopy, RDI_IMGLL, 16);
+                        draw_item_add_img_region(priv, &reg1, GXcopy, RDI_IMGLY, 16);
                         RegionUninit(&reg1);
                         priv->is_dirty = 1;
                         priv->con_number = g_con_number;
@@ -1212,7 +1212,7 @@ rdpClearToBackground(WindowPtr pWin, int x, int y, int w, int h,
 
         if (g_do_dirty_ons)
         {
-            draw_item_add_img_region(&g_screenPriv, &reg, GXcopy, RDI_IMGLL, 16);
+            draw_item_add_img_region(&g_screenPriv, &reg, GXcopy, RDI_IMGLY, 16);
         }
         else
         {
@@ -1250,7 +1250,7 @@ rdpRestoreAreas(WindowPtr pWin, RegionPtr prgnExposed)
 
     if (g_do_dirty_ons)
     {
-        draw_item_add_img_region(&g_screenPriv, &reg, GXcopy, RDI_IMGLL, 16);
+        draw_item_add_img_region(&g_screenPriv, &reg, GXcopy, RDI_IMGLY, 16);
     }
     else
     {
@@ -1415,7 +1415,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
                     LLOGLN(10, ("rdpComposite: getting dirty"));
                     g_screenPriv.is_dirty = 1;
                     pDirtyPriv = &g_screenPriv;
-                    dirty_type = RDI_IMGLL;
+                    dirty_type = g_doing_font ? RDI_IMGLL : RDI_IMGLY;
                 }
                 else
                 {