aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/miext
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/miext')
-rw-r--r--xorg-server/miext/damage/damage.c2
-rw-r--r--xorg-server/miext/rootless/rootless.h2
-rw-r--r--xorg-server/miext/rootless/rootlessGC.c2
-rw-r--r--xorg-server/miext/rootless/rootlessValTree.c32
-rw-r--r--xorg-server/miext/rootless/rootlessWindow.c6
-rw-r--r--xorg-server/miext/shadow/shrotate.c2
-rw-r--r--xorg-server/miext/sync/misyncfd.c4
7 files changed, 25 insertions, 25 deletions
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index f303249e2..e3752084a 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -1591,7 +1591,7 @@ miDamageCreate(DamagePtr pDamage)
* Since we can't know if a GC has been validated against one of the affected
* children, just bump them all to be safe.
*/
-static int
+static int
damageRegisterVisit(WindowPtr pWin, void *data)
{
pWin->drawable.serialNumber = NEXT_SERIAL_NUMBER;
diff --git a/xorg-server/miext/rootless/rootless.h b/xorg-server/miext/rootless/rootless.h
index a3f38b633..1be61cdf3 100644
--- a/xorg-server/miext/rootless/rootless.h
+++ b/xorg-server/miext/rootless/rootless.h
@@ -319,7 +319,7 @@ typedef struct _RootlessFrameProcs {
Bool RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs);
/*
- * Return the frame ID for the physical window displaying the given window.
+ * Return the frame ID for the physical window displaying the given window.
*
* create If true and the window has no frame, attempt to create one
*/
diff --git a/xorg-server/miext/rootless/rootlessGC.c b/xorg-server/miext/rootless/rootlessGC.c
index 71eaa11d1..d8b964fee 100644
--- a/xorg-server/miext/rootless/rootlessGC.c
+++ b/xorg-server/miext/rootless/rootlessGC.c
@@ -300,7 +300,7 @@ RootlessCreateGC(GCPtr pGC)
* All the others just unwrap and call.
*/
-// GCFUNC_UNRAP assumes funcs have been wrapped and
+// GCFUNC_UNRAP assumes funcs have been wrapped and
// does not assume ops have been wrapped
#define GCFUNC_UNWRAP(pGC) \
RootlessGCRec *gcrec = (RootlessGCRec *) \
diff --git a/xorg-server/miext/rootless/rootlessValTree.c b/xorg-server/miext/rootless/rootlessValTree.c
index c7c2c9935..0f7b76cb6 100644
--- a/xorg-server/miext/rootless/rootlessValTree.c
+++ b/xorg-server/miext/rootless/rootlessValTree.c
@@ -29,19 +29,19 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
- * Copyright 1987, 1988, 1989 by
+ * Copyright 1987, 1988, 1989 by
* Digital Equipment Corporation, Maynard, Massachusetts,
- *
+ *
* All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted,
* provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
+ * both that copyright notice and this permission notice appear in
* supporting documentation, and that the name of Digital not be
* used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
+ * software without specific, written prior permission.
+ *
* DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
* DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
* WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
- *
+ *
******************************************************************/
/* The panoramix components contained the following notice */
@@ -80,7 +80,7 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
- /*
+ /*
* Aug '86: Susan Angebranndt -- original code
* July '87: Adam de Boor -- substantially modified and commented
* Summer '89: Joel McCormack -- so fast you wouldn't believe it possible.
@@ -456,9 +456,9 @@ RootlessTreeObscured(WindowPtr pParent)
*
*-----------------------------------------------------------------------
*/
-/*
+/*
Quartz version: used for validate from root in rootless mode.
- We need to make sure top-level windows don't clip each other,
+ We need to make sure top-level windows don't clip each other,
and that top-level windows aren't clipped to the root window.
*/
/*ARGSUSED*/
@@ -491,9 +491,9 @@ RootlessMiValidateTree(WindowPtr pRoot, /* Parent to validate */
ErrorF("ValidateTree: BUSTED!\n");
}
- /*
- * Recursively compute the clips for all children of the root.
- * They don't clip against each other or the root itself, so
+ /*
+ * Recursively compute the clips for all children of the root.
+ * They don't clip against each other or the root itself, so
* childClip is always reset to that child's size.
*/
@@ -520,7 +520,7 @@ RootlessMiValidateTree(WindowPtr pRoot, /* Parent to validate */
RegionUninit(&childClip);
- /* The root is never clipped by its children, so nothing on the root
+ /* The root is never clipped by its children, so nothing on the root
is ever exposed by moving or mapping its children. */
RegionNull(&pRoot->valdata->after.exposed);
RegionNull(&pRoot->valdata->after.borderExposed);
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c
index 7b9be2cfe..50cf7708e 100644
--- a/xorg-server/miext/rootless/rootlessWindow.c
+++ b/xorg-server/miext/rootless/rootlessWindow.c
@@ -134,7 +134,7 @@ RootlessNativeWindowMoved(WindowPtr pWin)
return;
}
- /* Don't want to do anything to the physical window (avoids
+ /* Don't want to do anything to the physical window (avoids
notification-response feedback loops) */
no_configure_window = TRUE;
@@ -483,7 +483,7 @@ RootlessRealizeWindow(WindowPtr pWin)
/*
* RootlessFrameForWindow
- * Returns the frame ID for the physical window displaying the given window.
+ * Returns the frame ID for the physical window displaying the given window.
* If CREATE is true and the window has no frame, attempt to create one.
*/
RootlessFrameID
@@ -565,7 +565,7 @@ RootlessReorderWindow(WindowPtr pWin)
RootlessStopDrawing(pWin, FALSE);
- /* Find the next window above this one that has a mapped frame.
+ /* Find the next window above this one that has a mapped frame.
* Only include cases where the windows are in the same category of
* hittability to ensure offscreen windows dont get restacked
* relative to onscreen ones (but that the offscreen ones maintain
diff --git a/xorg-server/miext/shadow/shrotate.c b/xorg-server/miext/shadow/shrotate.c
index 779a905d2..a0fc4ec4e 100644
--- a/xorg-server/miext/shadow/shrotate.c
+++ b/xorg-server/miext/shadow/shrotate.c
@@ -259,7 +259,7 @@ shadowUpdateRotatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
p = pixelsPerBits;
/*
* Build one word of output from multiple inputs
- *
+ *
* Note that for 90/270 rotations, this will walk
* down the shadow hitting each scanline once.
* This is probably not very efficient.
diff --git a/xorg-server/miext/sync/misyncfd.c b/xorg-server/miext/sync/misyncfd.c
index 93ff85fa8..92f3b2294 100644
--- a/xorg-server/miext/sync/misyncfd.c
+++ b/xorg-server/miext/sync/misyncfd.c
@@ -77,7 +77,7 @@ _X_EXPORT Bool miSyncFdScreenInit(ScreenPtr pScreen,
if (!miSyncSetup(pScreen))
return FALSE;
-
+
if (!dixPrivateKeyRegistered(&syncFdScreenPrivateKey)) {
if (!dixRegisterPrivateKey(&syncFdScreenPrivateKey, PRIVATE_SCREEN, 0))
return FALSE;
@@ -94,6 +94,6 @@ _X_EXPORT Bool miSyncFdScreenInit(ScreenPtr pScreen,
priv->funcs = *funcs;
dixSetPrivate(&pScreen->devPrivates, &syncFdScreenPrivateKey, priv);
-
+
return TRUE;
}