Merge branch 'master' of git://github.com/FreeRDP/xrdp

1 files changed, 63 insertions, 56 deletions

diff --git a/xorg/X11R7.6/rdp/rdpFillSpans.c b/xorg/X11R7.6/rdp/rdpFillSpans.c
index 1f655d01..b5a13a13 100644
--- a/xorg/X11R7.6/rdp/rdpFillSpans.c
+++ b/xorg/X11R7.6/rdp/rdpFillSpans.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 */
@@ -45,70 +45,77 @@ extern int g_con_number; /* in rdpup.c */
 /******************************************************************************/
 static void
 rdpFillSpansOrg(DrawablePtr pDrawable, GCPtr pGC, int nInit,
-                DDXPointPtr pptInit, int* pwidthInit, int fSorted)
+                DDXPointPtr pptInit, int *pwidthInit, int fSorted)
 {
-  rdpGCPtr priv;
-  GCFuncs* oldFuncs;
+    rdpGCPtr priv;
+    GCFuncs *oldFuncs;
 
-  GC_OP_PROLOGUE(pGC);
-  pGC->ops->FillSpans(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
-  GC_OP_EPILOGUE(pGC);
+    GC_OP_PROLOGUE(pGC);
+    pGC->ops->FillSpans(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+    GC_OP_EPILOGUE(pGC);
 }
 
 /******************************************************************************/
 void
 rdpFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nInit,
-             DDXPointPtr pptInit, int* pwidthInit, int fSorted)
+             DDXPointPtr pptInit, int *pwidthInit, int fSorted)
 {
-  RegionRec clip_reg;
-  int cd;
-  int got_id;
-  struct image_data id;
-  WindowPtr pDstWnd;
-  PixmapPtr pDstPixmap;
-  rdpPixmapRec* pDstPriv;
-
-  LLOGLN(0, ("rdpFillSpans: todo"));
-
-  /* do original call */
-  rdpFillSpansOrg(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
-
-  got_id = 0;
-  if (pDrawable->type == DRAWABLE_PIXMAP)
-  {
-    pDstPixmap = (PixmapPtr)pDrawable;
-    pDstPriv = GETPIXPRIV(pDstPixmap);
-    if (XRDP_IS_OS(pDstPriv))
+    RegionRec clip_reg;
+    int cd;
+    int got_id;
+    struct image_data id;
+    WindowPtr pDstWnd;
+    PixmapPtr pDstPixmap;
+    rdpPixmapRec *pDstPriv;
+
+    LLOGLN(0, ("rdpFillSpans: todo"));
+
+    /* do original call */
+    rdpFillSpansOrg(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted);
+
+    got_id = 0;
+
+    if (pDrawable->type == DRAWABLE_PIXMAP)
+    {
+        pDstPixmap = (PixmapPtr)pDrawable;
+        pDstPriv = GETPIXPRIV(pDstPixmap);
+
+        if (XRDP_IS_OS(pDstPriv))
+        {
+            rdpup_switch_os_surface(pDstPriv->rdpindex);
+            rdpup_get_pixmap_image_rect(pDstPixmap, &id);
+            got_id = 1;
+        }
+    }
+    else
+    {
+        if (pDrawable->type == DRAWABLE_WINDOW)
+        {
+            pDstWnd = (WindowPtr)pDrawable;
+
+            if (pDstWnd->viewable)
+            {
+                rdpup_get_screen_image_rect(&id);
+                got_id = 1;
+            }
+        }
+    }
+
+    if (!got_id)
     {
-      rdpup_switch_os_surface(pDstPriv->rdpindex);
-      rdpup_get_pixmap_image_rect(pDstPixmap, &id);
-      got_id = 1;
+        return;
     }
-  }
-  else
-  {
-    if (pDrawable->type == DRAWABLE_WINDOW)
+
+    RegionInit(&clip_reg, NullBox, 0);
+    cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
+
+    if (cd == 1)
     {
-      pDstWnd = (WindowPtr)pDrawable;
-      if (pDstWnd->viewable)
-      {
-        rdpup_get_screen_image_rect(&id);
-        got_id = 1;
-      }
     }
-  }
-  if (!got_id)
-  {
-    return;
-  }
-  RegionInit(&clip_reg, NullBox, 0);
-  cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
-  if (cd == 1)
-  {
-  }
-  else if (cd == 2)
-  {
-  }
-  RegionUninit(&clip_reg);
-  rdpup_switch_os_surface(-1);
+    else if (cd == 2)
+    {
+    }
+
+    RegionUninit(&clip_reg);
+    rdpup_switch_os_surface(-1);
 }