xserver: Branch 'master'

[GitLab Mirror]

 Xext/shm.c            |    4 ++--
 composite/compalloc.c |    9 +++++----
 dbe/midbe.c           |   23 ++++++++++++-----------
 dix/pixmap.c          |   12 +++++++++---
 4 files changed, 28 insertions(+), 20 deletions(-)

New commits:
commit c4481fc20fd4da1e89aa4f41a7dca1d563d00cee
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Aug 27 20:08:02 2024 +0200

    treewide: fix indentions got broke by recent commit
    
    Commit f26f17c66a714a226d83dd45bd760288eff3de32 broke some indentions,
    fixing them now.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1662>

diff --git a/Xext/shm.c b/Xext/shm.c
index 9cface24d..091a95b50 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -482,8 +482,8 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
                                          PixmapBytePad(w, depth), data);
         if (!pPixmap)
             return;
-        (void) pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC, sx, sy, sw, sh, dx,
-                           dy);
+        (void) pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC,
+                                  sx, sy, sw, sh, dx, dy);
         FreeScratchPixmapHeader(pPixmap);
     }
     else {
diff --git a/composite/compalloc.c b/composite/compalloc.c
index 8e9891b9a..116b85022 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -553,10 +553,11 @@ compNewPixmap(WindowPtr pWin, int x, int y, int w, int h)
             ChangeGC(NullClient, pGC, GCSubwindowMode, &val);
             ValidateGC(&pPixmap->drawable, pGC);
             (void) (*pGC->ops->CopyArea) (&pParent->drawable,
-                                   &pPixmap->drawable,
-                                   pGC,
-                                   x - pParent->drawable.x,
-                                   y - pParent->drawable.y, w, h, 0, 0);
+                                          &pPixmap->drawable,
+                                          pGC,
+                                          x - pParent->drawable.x,
+                                          y - pParent->drawable.y,
+                                          w, h, 0, 0);
             FreeScratchGC(pGC);
         }
     }
diff --git a/dbe/midbe.c b/dbe/midbe.c
index 007f985c3..c97dac8de 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -276,9 +276,9 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
     case XdbeUntouched:
         ValidateGC((DrawablePtr) pDbeWindowPriv->pFrontBuffer, pGC);
         (void) (*pGC->ops->CopyArea) ((DrawablePtr) pWin,
-                               (DrawablePtr) pDbeWindowPriv->pFrontBuffer,
-                               pGC, 0, 0, pWin->drawable.width,
-                               pWin->drawable.height, 0, 0);
+                                      (DrawablePtr) pDbeWindowPriv->pFrontBuffer,
+                                      pGC, 0, 0, pWin->drawable.width,
+                                      pWin->drawable.height, 0, 0);
         break;
 
     case XdbeCopied:
@@ -294,8 +294,9 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
 
     ValidateGC((DrawablePtr) pWin, pGC);
     (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer,
-                           (DrawablePtr) pWin, pGC, 0, 0,
-                           pWin->drawable.width, pWin->drawable.height, 0, 0);
+                                  (DrawablePtr) pWin, pGC, 0, 0,
+                                  pWin->drawable.width,
+                                  pWin->drawable.height, 0, 0);
 
     /*
      **********************************************************************
@@ -621,9 +622,9 @@ miDbePositionWindow(WindowPtr pWin, int x, int y)
         /* Copy the contents of the old front pixmap to the new one. */
         if (pWin->bitGravity != ForgetGravity) {
             (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pFrontBuffer,
-				   (DrawablePtr) pFrontBuffer, pGC,
-				   sourcex, sourcey, savewidth, saveheight,
-                                   destx, desty);
+                                          (DrawablePtr) pFrontBuffer, pGC,
+                                          sourcex, sourcey, savewidth, saveheight,
+                                          destx, desty);
         }
 
         ValidateGC(&pBackBuffer->drawable, pGC);
@@ -634,9 +635,9 @@ miDbePositionWindow(WindowPtr pWin, int x, int y)
         /* Copy the contents of the old back pixmap to the new one. */
         if (pWin->bitGravity != ForgetGravity) {
             (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer,
-				   (DrawablePtr) pBackBuffer, pGC,
-                                   sourcex, sourcey, savewidth, saveheight,
-                                   destx, desty);
+                                          (DrawablePtr) pBackBuffer, pGC,
+                                          sourcex, sourcey, savewidth, saveheight,
+                                          destx, desty);
         }
 
         /* Destroy the old pixmaps, and point the DBE window priv to the new
diff --git a/dix/pixmap.c b/dix/pixmap.c
index a5db9c8bc..926adad37 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -278,9 +278,15 @@ PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src,
         w = dst_box.x2 - dst_box.x1;
         h = dst_box.y2 - dst_box.y1;
 
-        (void) pGC->ops->CopyArea(src, &dst->drawable, pGC,
-                           x + dst_box.x1, y + dst_box.y1, w, h,
-                           dst_x + dst_box.x1, dst_y + dst_box.y1);
+        (void) pGC->ops->CopyArea(src,
+                                  &dst->drawable,
+                                  pGC,
+                                  x + dst_box.x1,
+                                  y + dst_box.y1,
+                                  w,
+                                  h,
+                                  dst_x + dst_box.x1,
+                                  dst_y + dst_box.y1);
         b++;
     }
     FreeScratchGC(pGC);