1 files changed, 111 insertions, 97 deletions

diff --git a/xorg/X11R7.6/rdp/rdpSetSpans.c b/xorg/X11R7.6/rdp/rdpSetSpans.c
index ed9bc404..34d3ec84 100644
--- a/xorg/X11R7.6/rdp/rdpSetSpans.c
+++ b/xorg/X11R7.6/rdp/rdpSetSpans.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,107 +45,121 @@ extern int g_con_number; /* in rdpup.c */
 
 /******************************************************************************/
 void
-rdpSetSpansOrg(DrawablePtr pDrawable, GCPtr pGC, char* psrc,
-               DDXPointPtr ppt, int* pwidth, int nspans, int fSorted)
+rdpSetSpansOrg(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
+               DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
 {
-  rdpGCPtr priv;
-  GCFuncs* oldFuncs;
+    rdpGCPtr priv;
+    GCFuncs *oldFuncs;
 
-  GC_OP_PROLOGUE(pGC);
-  pGC->ops->SetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
-  GC_OP_EPILOGUE(pGC);
+    GC_OP_PROLOGUE(pGC);
+    pGC->ops->SetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
+    GC_OP_EPILOGUE(pGC);
 }
 
 /******************************************************************************/
 void
-rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char* psrc,
-            DDXPointPtr ppt, int* pwidth, int nspans, int fSorted)
+rdpSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc,
+            DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
 {
-  RegionRec clip_reg;
-  int cd;
-  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(0, ("rdpSetSpans: todo"));
-
-  /* do original call */
-  rdpSetSpansOrg(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
-
-  dirty_type = 0;
-  pDirtyPriv = 0;
-  post_process = 0;
-  reset_surface = 0;
-  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;
+    int dirty_type;
+    int post_process;
+    int reset_surface;
+    struct image_data id;
+    WindowPtr pDstWnd;
+    PixmapPtr pDstPixmap;
+    rdpPixmapRec *pDstPriv;
+    rdpPixmapRec *pDirtyPriv;
+
+    LLOGLN(0, ("rdpSetSpans: todo"));
+
+    /* do original call */
+    rdpSetSpansOrg(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
+
+    dirty_type = 0;
+    pDirtyPriv = 0;
+    post_process = 0;
+    reset_surface = 0;
+    got_id = 0;
+
+    if (pDrawable->type == DRAWABLE_PIXMAP)
     {
-      post_process = 1;
-      if (g_do_dirty_os)
-      {
-        LLOGLN(10, ("rdpSetSpans: gettig dirty"));
-        pDstPriv->is_dirty = 1;
-        pDirtyPriv = pDstPriv;
-        dirty_type = RDI_IMGLY;
-      }
-      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))
+        {
+            pDstPixmap = (PixmapPtr)pDrawable;
+            pDstPriv = GETPIXPRIV(pDstPixmap);
+
+            if (XRDP_IS_OS(pDstPriv))
+            {
+                post_process = 1;
+
+                if (g_do_dirty_os)
+                {
+                    LLOGLN(10, ("rdpSetSpans: gettig dirty"));
+                    pDstPriv->is_dirty = 1;
+                    pDirtyPriv = pDstPriv;
+                    dirty_type = RDI_IMGLY;
+                }
+                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)
+            {
+                pDstWnd = (WindowPtr)pDrawable;
+
+                if (pDstWnd->viewable)
+                {
+                    post_process = 1;
+                    rdpup_get_screen_image_rect(&id);
+                    got_id = 1;
+                }
+            }
+        }
+
+        if (!post_process)
+        {
+            return;
+        }
+
+        RegionInit(&clip_reg, NullBox, 0);
+        cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
+
+        if (cd == 1)
+        {
+            if (dirty_type != 0)
+            {
+            }
+            else if (got_id)
+            {
+            }
+        }
+        else if (cd == 2)
+        {
+            if (dirty_type != 0)
+            {
+            }
+            else if (got_id)
+            {
+            }
+        }
+
+        RegionUninit(&clip_reg);
+
+        if (reset_surface)
+        {
+            rdpup_switch_os_surface(-1);
+        }
     }
-  }
-  else
-  {
-    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)
-  {
-    return;
-  }
-  RegionInit(&clip_reg, NullBox, 0);
-  cd = rdp_get_clip(&clip_reg, pDrawable, pGC);
-  if (cd == 1)
-  {
-    if (dirty_type != 0)
-    {
-    }
-    else if (got_id)
-    {
-    }
-  }
-  else if (cd == 2)
-  {
-    if (dirty_type != 0)
-    {
-    }
-    else if (got_id)
-    {
-    }
-  }
-  RegionUninit(&clip_reg);
-  if (reset_surface)
-  {
-    rdpup_switch_os_surface(-1);
-  }
-}