o moved from GNU General Public License to Apache License, Version 2.0

o applied new coding standards to all .c files
o moved some files around

1 files changed, 156 insertions, 144 deletions

diff --git a/xorg/X11R7.6/rdp/rdpCopyPlane.c b/xorg/X11R7.6/rdp/rdpCopyPlane.c
index 389dc6e1..aa0e2c29 100644
--- a/xorg/X11R7.6/rdp/rdpCopyPlane.c
+++ b/xorg/X11R7.6/rdp/rdpCopyPlane.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 */
@@ -49,15 +49,15 @@ rdpCopyPlaneOrg(DrawablePtr pSrc, DrawablePtr pDst,
                 GCPtr pGC, int srcx, int srcy, int w, int h,
                 int dstx, int dsty, unsigned long bitPlane)
 {
-  RegionPtr rv;
-  rdpGCPtr priv;
-  GCFuncs* oldFuncs;
-
-  GC_OP_PROLOGUE(pGC);
-  rv = pGC->ops->CopyPlane(pSrc, pDst, pGC, srcx, srcy,
-                           w, h, dstx, dsty, bitPlane);
-  GC_OP_EPILOGUE(pGC);
-  return rv;
+    RegionPtr rv;
+    rdpGCPtr priv;
+    GCFuncs *oldFuncs;
+
+    GC_OP_PROLOGUE(pGC);
+    rv = pGC->ops->CopyPlane(pSrc, pDst, pGC, srcx, srcy,
+                             w, h, dstx, dsty, bitPlane);
+    GC_OP_EPILOGUE(pGC);
+    return rv;
 }
 
 /******************************************************************************/
@@ -66,151 +66,163 @@ rdpCopyPlane(DrawablePtr pSrc, DrawablePtr pDst,
              GCPtr pGC, int srcx, int srcy, int w, int h,
              int dstx, int dsty, unsigned long bitPlane)
 {
-  RegionPtr rv;
-  RegionRec clip_reg;
-  RegionRec box_reg;
-  RegionRec reg1;
-  RegionRec reg2;
-  int cd;
-  int num_clips;
-  int j;
-  int got_id;
-  int dirty_type;
-  int post_process;
-  int reset_surface;
-  BoxRec box;
-  BoxPtr pbox;
-  struct image_data id;
-  WindowPtr pDstWnd;
-  PixmapPtr pDstPixmap;
-  rdpPixmapRec* pDstPriv;
-  rdpPixmapRec* pDirtyPriv;
-
-  LLOGLN(10, ("rdpCopyPlane:"));
-
-  /* do original call */
-  rv = rdpCopyPlaneOrg(pSrc, pDst, pGC, srcx, srcy, w, h,
-                       dstx, dsty, bitPlane);
-
-  dirty_type = 0;
-  pDirtyPriv = 0;
-  post_process = 0;
-  reset_surface = 0;
-  got_id = 0;
-  if (pDst->type == DRAWABLE_PIXMAP)
-  {
-    pDstPixmap = (PixmapPtr)pDst;
-    pDstPriv = GETPIXPRIV(pDstPixmap);
-    if (XRDP_IS_OS(pDstPriv))
+    RegionPtr rv;
+    RegionRec clip_reg;
+    RegionRec box_reg;
+    RegionRec reg1;
+    RegionRec reg2;
+    int cd;
+    int num_clips;
+    int j;
+    int got_id;
+    int dirty_type;
+    int post_process;
+    int reset_surface;
+    BoxRec box;
+    BoxPtr pbox;
+    struct image_data id;
+    WindowPtr pDstWnd;
+    PixmapPtr pDstPixmap;
+    rdpPixmapRec *pDstPriv;
+    rdpPixmapRec *pDirtyPriv;
+
+    LLOGLN(10, ("rdpCopyPlane:"));
+
+    /* do original call */
+    rv = rdpCopyPlaneOrg(pSrc, pDst, pGC, srcx, srcy, w, h,
+                         dstx, dsty, bitPlane);
+
+    dirty_type = 0;
+    pDirtyPriv = 0;
+    post_process = 0;
+    reset_surface = 0;
+    got_id = 0;
+
+    if (pDst->type == DRAWABLE_PIXMAP)
     {
-      post_process = 1;
-      if (g_do_dirty_os)
-      {
-        LLOGLN(10, ("rdpCopyPlane: 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;
-      }
+        pDstPixmap = (PixmapPtr)pDst;
+        pDstPriv = GETPIXPRIV(pDstPixmap);
+
+        if (XRDP_IS_OS(pDstPriv))
+        {
+            post_process = 1;
+
+            if (g_do_dirty_os)
+            {
+                LLOGLN(10, ("rdpCopyPlane: 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
-  {
-    if (pDst->type == DRAWABLE_WINDOW)
+    else
     {
-      pDstWnd = (WindowPtr)pDst;
-      if (pDstWnd->viewable)
-      {
-        post_process = 1;
-        rdpup_get_screen_image_rect(&id);
-        got_id = 1;
-      }
+        if (pDst->type == DRAWABLE_WINDOW)
+        {
+            pDstWnd = (WindowPtr)pDst;
+
+            if (pDstWnd->viewable)
+            {
+                post_process = 1;
+                rdpup_get_screen_image_rect(&id);
+                got_id = 1;
+            }
+        }
     }
-  }
-  if (!post_process)
-  {
-    return rv;
-  }
 
-  RegionInit(&clip_reg, NullBox, 0);
-  cd = rdp_get_clip(&clip_reg, pDst, pGC);
-  if (cd == 1)
-  {
-    if (dirty_type != 0)
+    if (!post_process)
     {
-      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);
+        return rv;
     }
-    else if (got_id)
+
+    RegionInit(&clip_reg, NullBox, 0);
+    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)
+    else if (cd == 2)
     {
-      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);
-        RegionInit(&reg2, NullBox, 0);
-        RegionCopy(&reg2, &clip_reg);
-        RegionIntersect(&reg1, &reg1, &reg2);
-        draw_item_add_img_region(pDirtyPriv, &reg1, GXcopy, dirty_type);
-        RegionUninit(&reg1);
-        RegionUninit(&reg2);
-      }
-      else if (got_id)
-      {
-        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
+
+        if (num_clips > 0)
         {
-          pbox = RegionExtents(&clip_reg);
-          rdpup_send_area(&id, pbox->x1, pbox->y1, pbox->x2 - pbox->x1,
-                          pbox->y2 - pbox->y1);
+            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);
+                RegionInit(&reg2, NullBox, 0);
+                RegionCopy(&reg2, &clip_reg);
+                RegionIntersect(&reg1, &reg1, &reg2);
+                draw_item_add_img_region(pDirtyPriv, &reg1, GXcopy, dirty_type);
+                RegionUninit(&reg1);
+                RegionUninit(&reg2);
+            }
+            else if (got_id)
+            {
+                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);
-  if (reset_surface)
-  {
-    rdpup_switch_os_surface(-1);
-  }
-  return rv;
+
+    RegionUninit(&clip_reg);
+
+    if (reset_surface)
+    {
+        rdpup_switch_os_surface(-1);
+    }
+
+    return rv;
 }