1 files changed, 201 insertions, 183 deletions

diff --git a/xorg/X11R7.6/rdp/rdpPolyFillRect.c b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
index 5dda6b7e..7a860623 100644
--- a/xorg/X11R7.6/rdp/rdpPolyFillRect.c
+++ b/xorg/X11R7.6/rdp/rdpPolyFillRect.c
@@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define LOG_LEVEL 1
 #define LLOG(_level, _args) \
-  do { if (_level < LOG_LEVEL) { ErrorF _args ; } } while (0)
+    do { if (_level < LOG_LEVEL) { ErrorF _args ; } } while (0)
 #define LLOGLN(_level, _args) \
-  do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
+    do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
 
 extern rdpScreenInfoRec g_rdpScreen; /* from rdpmain.c */
 extern DevPrivateKeyRec g_rdpGCIndex; /* from rdpmain.c */
@@ -46,210 +46,228 @@ extern int g_con_number; /* in rdpup.c */
 /******************************************************************************/
 static void
 rdpPolyFillRectOrg(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
-                   xRectangle* prectInit)
+                   xRectangle *prectInit)
 {
-  rdpGCPtr priv;
-  GCFuncs* oldFuncs;
+    rdpGCPtr priv;
+    GCFuncs *oldFuncs;
 
-  GC_OP_PROLOGUE(pGC);
-  pGC->ops->PolyFillRect(pDrawable, pGC, nrectFill, prectInit);
-  GC_OP_EPILOGUE(pGC);
+    GC_OP_PROLOGUE(pGC);
+    pGC->ops->PolyFillRect(pDrawable, pGC, nrectFill, prectInit);
+    GC_OP_EPILOGUE(pGC);
 }
 
 /******************************************************************************/
 void
 rdpPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill,
-                xRectangle* prectInit)
+                xRectangle *prectInit)
 {
-  int j;
-  int cd;
-  int num_clips;
-  RegionRec clip_reg;
-  RegionPtr fill_reg;
-  BoxRec box;
-
-  int got_id;
-  int dirty_type;
-  int post_process;
-  int reset_surface;
-
-  struct image_data id;
-  WindowPtr pDstWnd;
-  PixmapPtr pDstPixmap;
-  rdpPixmapRec* pDstPriv;
-  rdpPixmapRec* pDirtyPriv;
-
-  LLOGLN(10, ("rdpPolyFillRect:"));
-
-  /* make a copy of rects */
-  fill_reg = RegionFromRects(nrectFill, prectInit, CT_NONE);
-
-  /* do original call */
-  rdpPolyFillRectOrg(pDrawable, pGC, nrectFill, prectInit);
-
-  dirty_type = 0;
-  pDirtyPriv = 0;
-  post_process = 0;
-  reset_surface = 0;
-  if (pDrawable->type == DRAWABLE_PIXMAP)
-  {
-    pDstPixmap = (PixmapPtr)pDrawable;
-    pDstPriv = GETPIXPRIV(pDstPixmap);
-    if (XRDP_IS_OS(pDstPriv))
+    int j;
+    int cd;
+    int num_clips;
+    RegionRec clip_reg;
+    RegionPtr fill_reg;
+    BoxRec box;
+
+    int got_id;
+    int dirty_type;
+    int post_process;
+    int reset_surface;
+
+    struct image_data id;
+    WindowPtr pDstWnd;
+    PixmapPtr pDstPixmap;
+    rdpPixmapRec *pDstPriv;
+    rdpPixmapRec *pDirtyPriv;
+
+    LLOGLN(10, ("rdpPolyFillRect:"));
+
+    /* make a copy of rects */
+    fill_reg = RegionFromRects(nrectFill, prectInit, CT_NONE);
+
+    /* do original call */
+    rdpPolyFillRectOrg(pDrawable, pGC, nrectFill, prectInit);
+
+    dirty_type = 0;
+    pDirtyPriv = 0;
+    post_process = 0;
+    reset_surface = 0;
+
+    if (pDrawable->type == DRAWABLE_PIXMAP)
     {
-      post_process = 1;
-      if (g_do_dirty_os)
-      {
-        pDstPriv->is_dirty = 1;
-        pDirtyPriv = pDstPriv;
-        dirty_type = RDI_FILL;
-      }
-      else
-      {
-        rdpup_switch_os_surface(pDstPriv->rdpindex);
-        reset_surface = 1;
-        rdpup_get_pixmap_image_rect(pDstPixmap, &id);
-        got_id = 1;
-      }
+        pDstPixmap = (PixmapPtr)pDrawable;
+        pDstPriv = GETPIXPRIV(pDstPixmap);
+
+        if (XRDP_IS_OS(pDstPriv))
+        {
+            post_process = 1;
+
+            if (g_do_dirty_os)
+            {
+                pDstPriv->is_dirty = 1;
+                pDirtyPriv = pDstPriv;
+                dirty_type = RDI_FILL;
+            }
+            else
+            {
+                rdpup_switch_os_surface(pDstPriv->rdpindex);
+                reset_surface = 1;
+                rdpup_get_pixmap_image_rect(pDstPixmap, &id);
+                got_id = 1;
+            }
+        }
     }
-  }
-  else
-  {
-    if (pDrawable->type == DRAWABLE_WINDOW)
+    else
     {
-      pDstWnd = (WindowPtr)pDrawable;
-      if (pDstWnd->viewable)
-      {
-        post_process = 1;
-        rdpup_get_screen_image_rect(&id);
-        got_id = 1;
-      }
+        if (pDrawable->type == DRAWABLE_WINDOW)
+        {
+            pDstWnd = (WindowPtr)pDrawable;
+
+            if (pDstWnd->viewable)
+            {
+                post_process = 1;
+                rdpup_get_screen_image_rect(&id);
+                got_id = 1;
+            }
+        }
     }
-  }
-  if (!post_process)
-  {
-    RegionDestroy(fill_reg);
-    return;
-  }
-  RegionTranslate(fill_reg, pDrawable->x, pDrawable->y);
-  RegionInit(&clip_reg, NullBox, 0);
-  cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
-  if (cd == 1) /* no clip */
-  {
-    if (dirty_type != 0)
+
+    if (!post_process)
     {
-      if (pGC->fillStyle == 0 && /* solid fill */
-          (pGC->alu == GXclear ||
-           pGC->alu == GXset ||
-           pGC->alu == GXinvert ||
-           pGC->alu == GXnoop ||
-           pGC->alu == GXand ||
-           pGC->alu == GXcopy /*||
-           pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
-      {
-        draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
-                                  pGC->alu);
-      }
-      else
-      {
-        draw_item_add_img_region(pDirtyPriv, fill_reg, GXcopy, RDI_IMGLL);
-      }
+        RegionDestroy(fill_reg);
+        return;
     }
-    else if (got_id)
+
+    RegionTranslate(fill_reg, pDrawable->x, pDrawable->y);
+    RegionInit(&clip_reg, NullBox, 0);
+    cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
+
+    if (cd == 1) /* no clip */
     {
-      rdpup_begin_update();
-      if (pGC->fillStyle == 0 && /* solid fill */
-          (pGC->alu == GXclear ||
-           pGC->alu == GXset ||
-           pGC->alu == GXinvert ||
-           pGC->alu == GXnoop ||
-           pGC->alu == GXand ||
-           pGC->alu == GXcopy /*||
-           pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
-      {
-        rdpup_set_fgcolor(pGC->fgPixel);
-        rdpup_set_opcode(pGC->alu);
-        for (j = REGION_NUM_RECTS(fill_reg) - 1; j >= 0; j--)
+        if (dirty_type != 0)
         {
-          box = REGION_RECTS(fill_reg)[j];
-          rdpup_fill_rect(box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1);
+            if (pGC->fillStyle == 0 && /* solid fill */
+                    (pGC->alu == GXclear ||
+                     pGC->alu == GXset ||
+                     pGC->alu == GXinvert ||
+                     pGC->alu == GXnoop ||
+                     pGC->alu == GXand ||
+                     pGC->alu == GXcopy /*||
+           pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+            {
+                draw_item_add_fill_region(pDirtyPriv, fill_reg, pGC->fgPixel,
+                                          pGC->alu);
+            }
+            else
+            {
+                draw_item_add_img_region(pDirtyPriv, fill_reg, GXcopy, RDI_IMGLL);
+            }
         }
-        rdpup_set_opcode(GXcopy);
-      }
-      else /* non solid fill */
-      {
-        for (j = REGION_NUM_RECTS(fill_reg) - 1; j >= 0; j--)
+        else if (got_id)
         {
-          box = REGION_RECTS(fill_reg)[j];
-          rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1,
-                          box.y2 - box.y1);
+            rdpup_begin_update();
+
+            if (pGC->fillStyle == 0 && /* solid fill */
+                    (pGC->alu == GXclear ||
+                     pGC->alu == GXset ||
+                     pGC->alu == GXinvert ||
+                     pGC->alu == GXnoop ||
+                     pGC->alu == GXand ||
+                     pGC->alu == GXcopy /*||
+           pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+            {
+                rdpup_set_fgcolor(pGC->fgPixel);
+                rdpup_set_opcode(pGC->alu);
+
+                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_set_opcode(GXcopy);
+            }
+            else /* non solid fill */
+            {
+                for (j = REGION_NUM_RECTS(fill_reg) - 1; j >= 0; j--)
+                {
+                    box = REGION_RECTS(fill_reg)[j];
+                    rdpup_send_area(&id, box.x1, box.y1, box.x2 - box.x1,
+                                    box.y2 - box.y1);
+                }
+            }
+
+            rdpup_end_update();
         }
-      }
-      rdpup_end_update();
     }
-  }
-  else if (cd == 2) /* clip */
-  {
-    RegionIntersect(&clip_reg, &clip_reg, fill_reg);
-    num_clips = REGION_NUM_RECTS(&clip_reg);
-    if (num_clips > 0)
+    else if (cd == 2) /* clip */
     {
-      if (dirty_type != 0)
-      {
-        if (pGC->fillStyle == 0 && /* solid fill */
-            (pGC->alu == GXclear ||
-             pGC->alu == GXset ||
-             pGC->alu == GXinvert ||
-             pGC->alu == GXnoop ||
-             pGC->alu == GXand ||
-             pGC->alu == GXcopy /*||
-             pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
-        {
-          draw_item_add_fill_region(pDirtyPriv, &clip_reg, pGC->fgPixel,
-                                    pGC->alu);
-        }
-        else
+        RegionIntersect(&clip_reg, &clip_reg, fill_reg);
+        num_clips = REGION_NUM_RECTS(&clip_reg);
+
+        if (num_clips > 0)
         {
-          draw_item_add_img_region(pDirtyPriv, &clip_reg, GXcopy, RDI_IMGLL);
-        }
-      }
-      else if (got_id)
-      {
-        rdpup_begin_update();
-        if (pGC->fillStyle == 0 && /* solid fill */
-            (pGC->alu == GXclear ||
-             pGC->alu == GXset ||
-             pGC->alu == GXinvert ||
-             pGC->alu == GXnoop ||
-             pGC->alu == GXand ||
-             pGC->alu == GXcopy /*||
+            if (dirty_type != 0)
+            {
+                if (pGC->fillStyle == 0 && /* solid fill */
+                        (pGC->alu == GXclear ||
+                         pGC->alu == GXset ||
+                         pGC->alu == GXinvert ||
+                         pGC->alu == GXnoop ||
+                         pGC->alu == GXand ||
+                         pGC->alu == GXcopy /*||
              pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
-        {
-          rdpup_set_fgcolor(pGC->fgPixel);
-          rdpup_set_opcode(pGC->alu);
-          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_set_opcode(GXcopy);
-        }
-        else /* non solid fill */
-        {
-          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);
-          }
+                {
+                    draw_item_add_fill_region(pDirtyPriv, &clip_reg, pGC->fgPixel,
+                                              pGC->alu);
+                }
+                else
+                {
+                    draw_item_add_img_region(pDirtyPriv, &clip_reg, GXcopy, RDI_IMGLL);
+                }
+            }
+            else if (got_id)
+            {
+                rdpup_begin_update();
+
+                if (pGC->fillStyle == 0 && /* solid fill */
+                        (pGC->alu == GXclear ||
+                         pGC->alu == GXset ||
+                         pGC->alu == GXinvert ||
+                         pGC->alu == GXnoop ||
+                         pGC->alu == GXand ||
+                         pGC->alu == GXcopy /*||
+             pGC->alu == GXxor*/)) /* todo, why dosen't xor work? */
+                {
+                    rdpup_set_fgcolor(pGC->fgPixel);
+                    rdpup_set_opcode(pGC->alu);
+
+                    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_set_opcode(GXcopy);
+                }
+                else /* non solid fill */
+                {
+                    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_end_update();
+            }
         }
-        rdpup_end_update();
-      }
     }
-  }
-  RegionUninit(&clip_reg);
-  RegionDestroy(fill_reg);
-  if (reset_surface)
-  {
-    rdpup_switch_os_surface(-1);
-  }
+
+    RegionUninit(&clip_reg);
+    RegionDestroy(fill_reg);
+
+    if (reset_surface)
+    {
+        rdpup_switch_os_surface(-1);
+    }
 }