frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: fix indentions got broke by recent commit 

Commit f26f17c66a broke some indentions,
fixing them now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1662>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-27 20:08:02 +02:00
parent 720651ebf3
commit c4481fc20f
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/shm.c
View File

@ -482,8 +482,8 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
PixmapBytePad(w, depth), data); PixmapBytePad(w, depth), data);
if (!pPixmap) if (!pPixmap)
return; return;
(void) pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC, sx, sy, sw, sh, dx, (void) pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC,
dy); sx, sy, sw, sh, dx, dy);
FreeScratchPixmapHeader(pPixmap); FreeScratchPixmapHeader(pPixmap);
} }
else { else {

9
composite/compalloc.c
View File

@ -553,10 +553,11 @@ compNewPixmap(WindowPtr pWin, int x, int y, int w, int h)
ChangeGC(NullClient, pGC, GCSubwindowMode, &val); ChangeGC(NullClient, pGC, GCSubwindowMode, &val);
ValidateGC(&pPixmap->drawable, pGC); ValidateGC(&pPixmap->drawable, pGC);
(void) (*pGC->ops->CopyArea) (&pParent->drawable, (void) (*pGC->ops->CopyArea) (&pParent->drawable,
&pPixmap->drawable, &pPixmap->drawable,
pGC, pGC,
x - pParent->drawable.x, x - pParent->drawable.x,
y - pParent->drawable.y, w, h, 0, 0); y - pParent->drawable.y,
w, h, 0, 0);
FreeScratchGC(pGC); FreeScratchGC(pGC);
} }
} }

23
dbe/midbe.c
View File

@ -276,9 +276,9 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
case XdbeUntouched: case XdbeUntouched:
ValidateGC((DrawablePtr) pDbeWindowPriv->pFrontBuffer, pGC); ValidateGC((DrawablePtr) pDbeWindowPriv->pFrontBuffer, pGC);
(void) (*pGC->ops->CopyArea) ((DrawablePtr) pWin, (void) (*pGC->ops->CopyArea) ((DrawablePtr) pWin,
(DrawablePtr) pDbeWindowPriv->pFrontBuffer, (DrawablePtr) pDbeWindowPriv->pFrontBuffer,
pGC, 0, 0, pWin->drawable.width, pGC, 0, 0, pWin->drawable.width,
pWin->drawable.height, 0, 0); pWin->drawable.height, 0, 0);
break; break;
case XdbeCopied: case XdbeCopied:
@ -294,8 +294,9 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo)
ValidateGC((DrawablePtr) pWin, pGC); ValidateGC((DrawablePtr) pWin, pGC);
(void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer, (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer,
(DrawablePtr) pWin, pGC, 0, 0, (DrawablePtr) pWin, pGC, 0, 0,
pWin->drawable.width, pWin->drawable.height, 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. */ /* Copy the contents of the old front pixmap to the new one. */
if (pWin->bitGravity != ForgetGravity) { if (pWin->bitGravity != ForgetGravity) {
(void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pFrontBuffer, (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pFrontBuffer,
(DrawablePtr) pFrontBuffer, pGC, (DrawablePtr) pFrontBuffer, pGC,
sourcex, sourcey, savewidth, saveheight, sourcex, sourcey, savewidth, saveheight,
destx, desty); destx, desty);
} }
ValidateGC(&pBackBuffer->drawable, pGC); 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. */ /* Copy the contents of the old back pixmap to the new one. */
if (pWin->bitGravity != ForgetGravity) { if (pWin->bitGravity != ForgetGravity) {
(void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer, (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer,
(DrawablePtr) pBackBuffer, pGC, (DrawablePtr) pBackBuffer, pGC,
sourcex, sourcey, savewidth, saveheight, sourcex, sourcey, savewidth, saveheight,
destx, desty); destx, desty);
} }
/* Destroy the old pixmaps, and point the DBE window priv to the new /* Destroy the old pixmaps, and point the DBE window priv to the new

12
dix/pixmap.c
View File

@ -278,9 +278,15 @@ PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src,
w = dst_box.x2 - dst_box.x1; w = dst_box.x2 - dst_box.x1;
h = dst_box.y2 - dst_box.y1; h = dst_box.y2 - dst_box.y1;
(void) pGC->ops->CopyArea(src, &dst->drawable, pGC, (void) pGC->ops->CopyArea(src,
x + dst_box.x1, y + dst_box.y1, w, h, &dst->drawable,
dst_x + dst_box.x1, dst_y + dst_box.y1); pGC,
x + dst_box.x1,
y + dst_box.y1,
w,
h,
dst_x + dst_box.x1,
dst_y + dst_box.y1);
b++; b++;
} }
FreeScratchGC(pGC); FreeScratchGC(pGC);