Fix spelling/wording issues

Most (but not all) of these were found by using
  codespell --builtin clear,rare,usage,informal,code,names
but not everything reported by that was fixed.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2020-07-05 13:07:33 -07:00
parent b0413b6e99
commit 23e83724df
202 changed files with 389 additions and 395 deletions

View File

@ -19,7 +19,7 @@ Xorg mailing list:
https://lists.freedesktop.org/mailman/listinfo/xorg
The master development code repository can be found at:
The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/xserver

View File

@ -40,7 +40,7 @@ typedef struct {
int keySize;
} HtGenericHashSetupRec, *HtGenericHashSetupPtr;
/** @brief ht_create initalizes a hash table for a certain hash table
/** @brief ht_create initializes a hash table for a certain hash table
configuration
@param[out] ht The hash table structure to initialize

View File

@ -366,7 +366,7 @@ ScreenSaverFreeSuspend(void *value, XID id)
}
}
/* Reenable the screensaver if this was the last client suspending it. */
/* Re-enable the screensaver if this was the last client suspending it. */
if (screenSaverSuspended && suspendingClients == NULL) {
screenSaverSuspended = FALSE;
@ -1243,7 +1243,7 @@ ProcScreenSaverSuspend(ClientPtr client)
/*
* Allocate a suspension record for the client, and stop the screensaver
* if it isn't already suspended by another client. We attach a resource ID
* to the record, so the screensaver will be reenabled and the record freed
* to the record, so the screensaver will be re-enabled and the record freed
* if the client disconnects without reenabling it first.
*/
this = malloc(sizeof(ScreenSaverSuspensionRec));

View File

@ -303,8 +303,8 @@ ProcShmQueryVersion(ClientPtr client)
}
/*
* Simulate the access() system call for a shared memory segement,
* using the credentials from the client if available
* Simulate the access() system call for a shared memory segment,
* using the credentials from the client if available.
*/
static int
shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)

View File

@ -277,8 +277,8 @@ ProcVidModeGetModeLine(ClientPtr client)
/*
* Older servers sometimes had server privates that the VidMode
* extention made available. So to be compatiable pretend that
* there are no server privates to pass to the client
* extension made available. So to be compatible pretend that
* there are no server privates to pass to the client.
*/
rep.privsize = 0;

View File

@ -72,7 +72,7 @@ typedef struct {
HashTable visitedResources;
/* Used by AddSubResourceSizeSpec when AddResourceSizeValue is
handling crossreferences */
handling cross-references */
HashTable visitedSubResources;
/* used when ConstructResourceBytesCtx is passed to
@ -442,7 +442,7 @@ WillConstructMask(ClientPtr client, CARD32 mask,
client id spec
@param sendClient Which client wishes to receive this answer. Used for
byte endianess.
byte endianness.
@param client Which client are we considering.
@param mask The client id spec mask indicating which information
we want about this client.
@ -609,7 +609,7 @@ ProcXResQueryClientIds (ClientPtr client)
return rc;
}
/** @brief Swaps xXResResourceIdSpec endianess */
/** @brief Swaps xXResResourceIdSpec endianness */
static void
SwapXResResourceIdSpec(xXResResourceIdSpec *spec)
{
@ -617,7 +617,7 @@ SwapXResResourceIdSpec(xXResResourceIdSpec *spec)
swapl(&spec->type);
}
/** @brief Swaps xXResResourceSizeSpec endianess */
/** @brief Swaps xXResResourceSizeSpec endianness */
static void
SwapXResResourceSizeSpec(xXResResourceSizeSpec *size)
{
@ -627,7 +627,7 @@ SwapXResResourceSizeSpec(xXResResourceSizeSpec *size)
swapl(&size->useCount);
}
/** @brief Swaps xXResResourceSizeValue endianess */
/** @brief Swaps xXResResourceSizeValue endianness */
static void
SwapXResResourceSizeValue(xXResResourceSizeValue *rep)
{

View File

@ -57,9 +57,10 @@
#include "extinit.h"
/* XTest events are sent during request processing and may be interruped by
/* XTest events are sent during request processing and may be interrupted by
* a SIGIO. We need a separate event list to avoid events overwriting each
* other's memory */
* other's memory.
*/
static InternalEvent *xtest_evlist;
/**

View File

@ -425,7 +425,7 @@ XvdiDestroyVideoNotifyList(void *pn, XID id)
{
XvVideoNotifyPtr npn, cpn;
/* ACTUALLY DESTROY THE NOTITY LIST */
/* ACTUALLY DESTROY THE NOTIFY LIST */
cpn = (XvVideoNotifyPtr) pn;
@ -820,7 +820,7 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff)
tpn = tpn->next;
}
/* IF TUNNING OFF, THEN JUST RETURN */
/* IF TURNING OFF, THEN JUST RETURN */
if (!onoff)
return Success;

View File

@ -108,7 +108,7 @@ DeleteDeviceEvents(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
/***********************************************************************
*
* Walk througth the window tree, deleting event selections for this client
* Walk through the window tree, deleting event selections for this client
* from this device from all windows.
*
*/

View File

@ -653,7 +653,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
* Copies the CONTENT of the classes of device from into the classes in device
* to. From and to are identical after finishing.
*
* If to does not have classes from currenly has, the classes are stored in
* If to does not have classes from currently has, the classes are stored in
* to's devPrivates system. Later, we recover it again from there if needed.
* Saves a few memory allocations.
*/
@ -2667,7 +2667,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
return Success;
/* If the input focus is PointerRootWin, send the event to where
* the pointer is if possible, then perhaps propogate up to root. */
* the pointer is if possible, then perhaps propagate up to root. */
if (inputFocus == PointerRootWin)
inputFocus = GetCurrentRootWindow(d);

View File

@ -153,7 +153,7 @@ ProcXGrabDevice(ClientPtr client)
* set when XI starts up) and binary OR's the device's mask to whatever the
* event mask for the given event type was.
* If an error occurs, it is sent to the client. Errors are generated if
* - if the device given in the event classs is invalid
* - if the device given in the event class is invalid
* - if the device in the class list is not the device given as parameter (no
* error if parameter is NULL)
*

View File

@ -414,7 +414,7 @@ XIResetProperties(void)
* @param val The property value
* @param nelem_return The maximum number of elements to return.
* @param buf_return Pointer to an array of at least @nelem_return values.
* @return Success or the error code if an error occured.
* @return Success or the error code if an error occurred.
*/
_X_EXPORT int
XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
@ -484,7 +484,7 @@ XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
* @param val The property value
* @param nelem_return The maximum number of elements to return.
* @param buf_return Pointer to an array of at least @nelem_return values.
* @return Success or the error code if an error occured.
* @return Success or the error code if an error occurred.
*/
_X_EXPORT int
XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
@ -521,7 +521,7 @@ XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
/* Registers a new property handler on the given device and returns a unique
* identifier for this handler. This identifier is required to unregister the
* property handler again.
* @return The handler's identifier or 0 if an error occured.
* @return The handler's identifier or 0 if an error occurred.
*/
long
XIRegisterPropertyHandler(DeviceIntPtr dev,

View File

@ -453,7 +453,7 @@ compReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
compUnredirectOneSubwindow(pPriorParent, pWin);
compRedirectOneSubwindow(pWin->parent, pWin);
/*
* Add any implict redirect due to synthesized visual
* Add any implicit redirect due to synthesized visual
*/
if (compImplicitRedirect(pWin, pWin->parent))
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);

View File

@ -189,7 +189,7 @@ if test "x$ac_cv_func_getpeereid" = xno && test "x$ac_cv_func_getpeerucred" = xn
AC_DEFINE([NO_LOCAL_CLIENT_CRED], 1, [Define to 1 if no local socket credentials interface exists])
fi
dnl Find the math libary, then check for cbrt function in it.
dnl Find the math library, then check for cbrt function in it.
AC_CHECK_LIB(m, sqrt)
AC_CHECK_FUNCS([cbrt])

View File

@ -1127,7 +1127,7 @@ DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC)
* DbeExtensionInit().
*
* To make resource deletion simple, we do not do anything in this function
* and leave all resource deleteion to DbeWindowPrivDelete(), which will
* and leave all resource deletion to DbeWindowPrivDelete(), which will
* eventually be called or already has been called. Deletion functions are
* not guaranteed to be called in any particular order.
*
@ -1183,7 +1183,7 @@ DbeWindowPrivDelete(void *pDbeWinPriv, XID id)
}
else {
/* We are removing the last ID in the array, in which case, the
* assignement below is all that we need to do.
* assignment below is all that we need to do.
*/
}
pDbeWindowPriv->IDs[pDbeWindowPriv->nBufferIDs - 1] = DBE_FREE_ID_ELEMENT;

View File

@ -171,7 +171,7 @@ typedef struct _DbeWindowPrivRec {
typedef struct _DbeScreenPrivRec {
/* Wrapped functions
* It is the responsibilty of the DDX layer to wrap PositionWindow().
* It is the responsibility of the DDX layer to wrap PositionWindow().
* DbeExtensionInit wraps DestroyWindow().
*/
PositionWindowProcPtr PositionWindow;

2
dix/.gitignore vendored
View File

@ -1,2 +1,2 @@
# Add & Override for this directory and it's subdirectories
# Add & Override for this directory and its subdirectories
dix.O

View File

@ -1095,7 +1095,7 @@ AllocColor(ColormapPtr pmap,
/*
* FakeAllocColor -- fake an AllocColor request by
* returning a free pixel if availible, otherwise returning
* returning a free pixel if available, otherwise returning
* the closest matching pixel. This is used by the mi
* software sprite code to recolor cursors. A nice side-effect
* is that this routine will never return failure.
@ -2510,7 +2510,7 @@ _colormap_find_resource(void *value, XID id, void *cdata)
}
/* something has realloced the visuals, instead of breaking
ABI fix it up here - glx and compsite did this wrong */
ABI fix it up here - glx and composite did this wrong */
Bool
ResizeVisualArray(ScreenPtr pScreen, int new_visual_count, DepthPtr depth)
{

View File

@ -3864,7 +3864,7 @@ static int init_screen(ScreenPtr pScreen, int i, Bool gpu)
/*
* This loop gets run once for every Screen that gets added,
* but thats ok. If the ddx layer initializes the formats
* but that's ok. If the ddx layer initializes the formats
* one at a time calling AddScreen() after each, then each
* iteration will make it a little more accurate. Worst case
* we do this loop N * numPixmapFormats where N is # of screens.

View File

@ -1108,7 +1108,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
if (ClientIsAsleep(client)) {
/* Client has died, but we cannot bail out right now. We
need to clean up after the work we did when going to
sleep. Setting the drawable poiner to 0 makes this
sleep. Setting the drawable pointer to 0 makes this
happen without any attempts to render or perform other
unnecessary activities. */
c->pDraw = (DrawablePtr) 0;

View File

@ -130,7 +130,7 @@ PointerWin(DeviceIntPtr dev)
/**
* Search for the first window below 'win' that has a pointer directly within
* it's boundaries (excluding boundaries of its own descendants).
* its boundaries (excluding boundaries of its own descendants).
*
* @return The child window that has the pointer within its boundaries or
* NULL.
@ -150,7 +150,7 @@ FirstPointerChild(WindowPtr win)
/**
* Search for the first window below 'win' that has a focus directly within
* it's boundaries (excluding boundaries of its own descendants).
* its boundaries (excluding boundaries of its own descendants).
*
* @return The child window that has the pointer within its boundaries or
* NULL.

View File

@ -1508,7 +1508,7 @@ UpdateTouchesForGrab(DeviceIntPtr mouse)
* @param mouse The device to grab.
* @param grab The grab structure, needs to be setup.
* @param autoGrab True if the grab was caused by a button down event and not
* explicitely by a client.
* explicitly by a client.
*/
void
ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
@ -2764,7 +2764,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
}
/**
* Deliver event to a window and it's immediate parent. Used for most window
* Deliver event to a window and its immediate parent. Used for most window
* events (CreateNotify, ConfigureNotify, etc.). Not useful for events that
* propagate up the tree or extension events
*
@ -3977,7 +3977,7 @@ CheckPassiveGrabsOnWindow(WindowPtr pWin,
*
* If the event is a keyboard event, the ancestors of the focus window are
* traced down and tried to see if they have any passive grabs to be
* activated. If the focus window itself is reached and it's descendants
* activated. If the focus window itself is reached and its descendants
* contain the pointer, the ancestors of the window that the pointer is in
* are then traced down starting at the focus window, otherwise no grabs are
* activated.
@ -5398,7 +5398,7 @@ ProcSendEvent(ClientPtr client)
return Success;
/* If the input focus is PointerRootWin, send the event to where
the pointer is if possible, then perhaps propogate up to root. */
the pointer is if possible, then perhaps propagate up to root. */
if (inputFocus == PointerRootWin)
inputFocus = GetCurrentRootWindow(dev);

View File

@ -1328,7 +1328,7 @@ QueuePointerEvents(DeviceIntPtr device, int type,
* rescaled to match Sx/Sy for [n..m]. In the simplest example, x of (m/2-1)
* is the last coordinate on the first screen and must be rescaled for the
* event to be m. XI2 clients that do their own coordinate mapping would
* otherwise interpret the position of the device elsewere to the cursor.
* otherwise interpret the position of the device elsewhere to the cursor.
* However, this scaling leads to losses:
* if we have two ScreenRecs we scale from e.g. [0..44704] (Wacom I4) to
* [0..2048[. that gives us 2047.954 as desktop coord, or the per-screen
@ -1446,7 +1446,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
storeLastValuators(pDev, &mask, 0, 1, devx, devy);
/* Update the MD's co-ordinates, which are always in desktop space. */
/* Update the MD's coordinates, which are always in desktop space. */
if (!IsMaster(pDev) && !IsFloating(pDev)) {
DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER);
@ -1473,7 +1473,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
event->detail.button = buttons;
}
/* root_x and root_y must be in per-screen co-ordinates */
/* root_x and root_y must be in per-screen coordinates */
event_set_root_coordinates(event, screenx - scr->x, screeny - scr->y);
if (flags & POINTER_EMULATED) {
@ -1931,7 +1931,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
switch (type) {
case XI_TouchBegin:
event->type = ET_TouchBegin;
/* If we're starting a touch, we must have x & y co-ordinates. */
/* If we're starting a touch, we must have x & y coordinates. */
if (!mask_in ||
!valuator_mask_isset(mask_in, 0) ||
!valuator_mask_isset(mask_in, 1)) {
@ -1957,7 +1957,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
return 0;
}
/* Get our screen event co-ordinates (root_x/root_y/event_x/event_y):
/* Get our screen event coordinates (root_x/root_y/event_x/event_y):
* these come from the touchpoint in Absolute mode, or the sprite in
* Relative. */
if (t->mode == XIDirectTouch) {
@ -2003,7 +2003,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
if (emulate_pointer)
storeLastValuators(dev, &mask, 0, 1, devx, devy);
/* Update the MD's co-ordinates, which are always in desktop space. */
/* Update the MD's coordinates, which are always in desktop space. */
if (emulate_pointer && !IsMaster(dev) && !IsFloating(dev)) {
DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);

View File

@ -97,7 +97,7 @@ InitVelocityData(DeviceVelocityPtr vel)
{
memset(vel, 0, sizeof(DeviceVelocityRec));
vel->corr_mul = 10.0; /* dots per 10 milisecond should be usable */
vel->corr_mul = 10.0; /* dots per 10 millisecond should be usable */
vel->const_acceleration = 1.0; /* no acceleration/deceleration */
vel->reset_time = 300;
vel->use_softening = 1;
@ -519,7 +519,7 @@ DoGetDirection(int dx, int dy)
/* cache DoGetDirection().
* To avoid excessive use of direction calculation, cache the values for
* [-5..5] for both x/y. Anything outside of that is calcualted on the fly.
* [-5..5] for both x/y. Anything outside of that is calculated on the fly.
*
* @return A bitmask for N, NE, S, SE, etc. indicating the directions for
* this movement.
@ -597,7 +597,7 @@ CalcTracker(const MotionTracker * tracker, int cur_t)
/* find the most plausible velocity. That is, the most distant
* (in time) tracker which isn't too old, the movement vector was
* in the same octant, and where the velocity is within an
* acceptable range to the inital velocity.
* acceptable range to the initial velocity.
*
* @return The tracker's velocity or 0 if the above conditions are unmet
*/

View File

@ -1114,7 +1114,7 @@ QuickSortRects(BoxRec rects[], int numRects)
*
* Side Effects:
* The passed-in ``region'' may be modified.
* pOverlap set to TRUE if any retangles overlapped, else FALSE;
* pOverlap set to TRUE if any rectangles overlapped, else FALSE;
*
* Strategy:
* Step 1. Sort the rectangles into ascending order with primary key y1
@ -1123,7 +1123,7 @@ QuickSortRects(BoxRec rects[], int numRects)
* Step 2. Split the rectangles into the minimum number of proper y-x
* banded regions. This may require horizontally merging
* rectangles, and vertically coalescing bands. With any luck,
* this step in an identity tranformation (ala the Box widget),
* this step in an identity transformation (ala the Box widget),
* or a coalescing into 1 box (ala Menus).
*
* Step 3. Merge the separate regions down to a single region by calling

View File

@ -118,7 +118,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
nbytes = (toLast - to) << 2;
while (to < toLast) {
/* can't write "cpswapl(*from++, *to++)" because cpswapl is a macro
that evaulates its args more than once */
that evaluates its args more than once */
cpswapl(*from, *to);
from++;
to++;
@ -165,7 +165,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
nbytes = (toLast - to) << 1;
while (to < toLast) {
/* can't write "cpswaps(*from++, *to++)" because cpswaps is a macro
that evaulates its args more than once */
that evaluates its args more than once */
cpswaps(*from, *to);
from++;
to++;

View File

@ -44,7 +44,7 @@
/**
* Some documentation about touch points:
* The driver submits touch events with it's own (unique) touch point ID.
* The driver submits touch events with its own (unique) touch point ID.
* The driver may re-use those IDs, the DDX doesn't care. It just passes on
* the data to the DIX. In the server, the driver's ID is referred to as the
* DDX id anyway.
@ -63,7 +63,7 @@
/**
* Check which devices need a bigger touch event queue and grow their
* last.touches by half it's current size.
* last.touches by half its current size.
*
* @param client Always the serverClient
* @param closure Always NULL
@ -578,7 +578,7 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
* @param[in] button_event The respective button event (if any)
*
* @returns The number of converted events.
* @retval 0 An error occured
* @retval 0 An error occurred
* @retval 1 only the motion event is valid
* @retval 2 motion and button event are valid
*/

View File

@ -2274,8 +2274,8 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
if (!pParent)
return Success;
/* Figure out if the window should be moved. Doesnt
make the changes to the window if event sent */
/* Figure out if the window should be moved. Doesn't
make the changes to the window if event sent. */
if (mask & CWStackMode)
pSib = WhereDoIGoInTheStack(pWin, pSib, pParent->drawable.x + x,
@ -2547,7 +2547,7 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
if (pWin->prevSib)
pWin->prevSib->nextSib = pWin->nextSib;
/* insert at begining of pParent */
/* insert at beginning of pParent */
pWin->parent = pParent;
pPrev = RealChildHead(pParent);
if (pPrev) {

View File

@ -1238,7 +1238,7 @@ clients are drawing into their windows simultaneously.
If it allows one client to run until its request
queue is empty by ignoring isItTimeToYield, the client's queue may
in fact never empty and other clients will be blocked out.
On the other hand, if it switchs between different clients too quickly,
On the other hand, if it switches between different clients too quickly,
performance may suffer due to too much switching between contexts.
For example, if a graphics processor needs to be set up with drawing modes
before drawing, and two different clients are drawing with
@ -4624,7 +4624,7 @@ GC mode-dependent components: fgPixel (for fillStyle Solid); tile, patOrg
(for fillStyle Tile); stipple, patOrg, fgPixel (for fillStyle Stipple);
and stipple, patOrg, fgPixel and bgPixel (for fillStyle OpaqueStipple).</para>
<para>
PushPixels applys the foreground color, tile, or stipple from the pGC
PushPixels applies the foreground color, tile, or stipple from the pGC
through a stencil onto pDrawable. pBitMap points to a stencil (of
which we use an area dx wide by dy high), which is oriented over the
drawable at xOrg, yOrg. Where there is a 1 bit in the bitmap, the

View File

@ -58,7 +58,7 @@ DEALINGS IN THE SOFTWARE.
</para>
<para>
The provider was integrated into the X.Org git master repository
The provider was integrated into the X.Org code base
with Solaris 10 &amp; OpenSolaris support for the Xserver 1.4 release,
released in 2007 with X11R7.3. Support for DTrace on MacOS X
was added in Xserver 1.7.

View File

@ -497,7 +497,7 @@ static void
exaValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
{
/* fbValidateGC will do direct access to pixmaps if the tiling has changed.
* Do a few smart things so fbValidateGC can do it's work.
* Do a few smart things so fbValidateGC can do its work.
*/
ScreenPtr pScreen = pDrawable->pScreen;

View File

@ -140,7 +140,7 @@ typedef struct _ExaDriver {
/**
* The flags field is bitfield of boolean values controlling EXA's behavior.
*
* The flags in clude EXA_OFFSCREEN_PIXMAPS, EXA_OFFSCREEN_ALIGN_POT, and
* The flags include EXA_OFFSCREEN_PIXMAPS, EXA_OFFSCREEN_ALIGN_POT, and
* EXA_TWO_BITBLT_DIRECTIONS.
*/
int flags;

View File

@ -150,7 +150,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
* @param privdata private data for the save callback.
*
* Allocates offscreen memory from the device associated with pScreen. size
* and align deteremine where and how large the allocated area is, and locked
* and align determine where and how large the allocated area is, and locked
* will mark whether it should be held in card memory. privdata may be any
* pointer for the save callback when the area is removed.
*

View File

@ -119,7 +119,7 @@ typedef struct {
/* Hash table mapping from glyph sha1 to position in the glyph; we use
* open addressing with a hash table size determined based on size and large
* enough so that we always have a good amount of free space, so we can
* use linear probing. (Linear probing is preferrable to double hashing
* use linear probing. (Linear probing is preferable to double hashing
* here because it allows us to easily remove entries.)
*/
int *hashEntries;
@ -130,7 +130,7 @@ typedef struct {
PicturePtr picture; /* Where the glyphs of the cache are stored */
int yOffset; /* y location within the picture where the cache starts */
int columns; /* Number of columns the glyphs are layed out in */
int columns; /* Number of columns the glyphs are laid out in */
int evictionPosition; /* Next random position to evict a glyph */
} ExaGlyphCacheRec, *ExaGlyphCachePtr;

View File

@ -227,7 +227,7 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */
*/
dstS = dstX / dstBpp;
/*
* Compute shift constants for effective alignement
* Compute shift constants for effective alignment
*/
if (srcX >= dstS) {
leftShift = srcX - dstS;

View File

@ -101,7 +101,7 @@ fbSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
/*
* Given a list of formats for a screen, create a list
* of visuals and depths for the screen which coorespond to
* of visuals and depths for the screen which correspond to
* the set which can be used with this version of fb.
*/
Bool

View File

@ -1071,7 +1071,7 @@ glamor_shareable_fd_from_pixmap(ScreenPtr screen,
int ret;
/*
* The actual difference between a sharable and non sharable buffer
* The actual difference between a shareable and non-shareable buffer
* is decided 4 call levels deep in glamor_make_pixmap_exportable()
* based on pixmap->usage_hint == CREATE_PIXMAP_USAGE_SHARED
* 2 of those calls are also exported API, so we cannot just add a flag.

View File

@ -344,7 +344,7 @@ extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen,
* @scrn: Current screen info pointer.
* @fd: Current drm fd.
*
* This function creates and intialize EGL contexts.
* This function creates and initializes EGL contexts.
* Should be called from DDX's preInit function.
* Return TRUE if success, otherwise return FALSE.
* */

View File

@ -204,7 +204,7 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
* Refer to pixman radial gradient.
*
* The problem is given the two circles of c1 and c2 with the radius of r1 and
* r1, we need to caculate the t, which is used to do interpolate with stops,
* r1, we need to calculate the t, which is used to do interpolate with stops,
* using the fomula:
* length((1-t)*c1 + t*c2 - p) = (1-t)*r1 + t*r2
* expand the fomula with xy coond, get the following:
@ -428,11 +428,11 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
* |
*
* step 1: compute the distance of p, pt1 and pt2 in the slope direction.
* Caculate the distance on Y axis first and multiply cos_val to
* Calculate the distance on Y axis first and multiply cos_val to
* get the value on slope direction(pd, p1d and p2d represent the
* distance of p, pt1, and pt2 respectively).
*
* step 2: caculate the percentage of (pd - p1d)/(p2d - p1d).
* step 2: calculate the percentage of (pd - p1d)/(p2d - p1d).
* If (pd - p1d) > (p2d - p1d) or < 0, then sub or add (p2d - p1d)
* to make it in the range of [0, (p2d - p1d)].
*

View File

@ -744,7 +744,7 @@ glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
/*
* As transform and repeatpad mode.
* We may get a clipped result which in multipe regions.
* We may get a clipped result which in multiple regions.
* It's not easy to do a 2nd round clipping just as we do
* without transform/repeatPad. As it's not easy to reverse
* the 2nd round clipping result with a transform/repeatPad mode,

View File

@ -24,7 +24,7 @@
/**
* @file glamor_vbo.c
*
* Helpers for managing streamed vertex bufffers used in glamor.
* Helpers for managing streamed vertex buffers used in glamor.
*/
#include "glamor_priv.h"

View File

@ -251,7 +251,7 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId,
** Find the display list space that we want to share.
**
** NOTE: In a multithreaded X server, we would need to keep a reference
** count for each display list so that if one client detroyed a list that
** count for each display list so that if one client destroyed a list that
** another client was using, the list would not really be freed until it
** was no longer in use. Since this sample implementation has no support
** for multithreaded servers, we don't do this.

View File

@ -227,7 +227,7 @@ get_decode_index(const struct __glXDispatchInfo *dispatch_info, unsigned opcode)
child_index = (opcode & mask) >> next_remain;
index = tree[index + 1 + child_index];
/* If the next node is an empty leaf, the opcode is for a non-existant
/* If the next node is an empty leaf, the opcode is for a non-existent
* function. We're done.
*
* If the next node is a non-empty leaf, look up the function pointer

2
hw/dmx/.gitignore vendored
View File

@ -1,2 +1,2 @@
# Add & Override for this directory and it's subdirectories
# Add & Override for this directory and its subdirectories
Xdmx

View File

@ -1,4 +1,4 @@
# Add & Override for this directory and it's subdirectories
# Add & Override for this directory and its subdirectories
dmxtodmx
parser.c
parser.h

View File

@ -63,7 +63,7 @@ typedef struct DMXConfigListStruct {
struct DMXConfigListStruct *next;
} DMXConfigList, *DMXConfigListPtr;
/** This stucture stores the parsed configuration information. */
/** This structure stores the parsed configuration information. */
typedef struct DMXConfigCmdStruct {
const char *filename;
const char *config;

View File

@ -132,7 +132,7 @@ typedef struct _DMXConfigWall {
int width, height; /* dimensions of displays */
int xwall, ywall; /* dimensions of wall, in tiles */
/* Raw configuration informaiton */
/* Raw configuration information */
DMXConfigTokenPtr start;
DMXConfigPairPtr wallDim;
DMXConfigPairPtr displayDim;
@ -145,7 +145,7 @@ typedef struct _DMXConfigOption {
/* Summary information */
char *string;
/* Raw configuration informaiton */
/* Raw configuration information */
DMXConfigTokenPtr start;
DMXConfigStringPtr option;
DMXConfigTokenPtr end;

View File

@ -55,7 +55,7 @@
*
* Note 2: The default epoch for the year is 2000.
* To change the default epoch, change the DMX_VENDOR_RELEASE
* macro below, bumb the minor version number, and change
* macro below, bump the minor version number, and change
* xdpyinfo to key off the major/minor version to determine the
* new epoch. Remember to do this on January 1, 2100 and every
* 100 years thereafter.

View File

@ -33,7 +33,7 @@
/** \file
* This file implements the server-side part of the DMX protocol. A
* vector of fucntions is provided at extension initialization time, so
* vector of functions is provided at extension initialization time, so
* most all of the useful functions in this file are declared static and
* do not appear in the doxygen documentation.
*

View File

@ -193,7 +193,7 @@ dmxConnectionBlockCallback(void)
found[k] = TRUE;
}
else {
/* Screen #k is detatched, so it always succeeds */
/* Screen #k is detached, so it always succeeds */
found[k] = TRUE;
}
}

View File

@ -186,7 +186,7 @@ dmxWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{
DMXDBG3("dmxWarpCursor(%d,%d,%d)\n", pScreen->myNum, x, y);
#if 11 /*BP*/
/* This call is depracated. Replace with???? */
/* This call is deprecated. Replace with???? */
miPointerWarpCursor(pDev, pScreen, x, y);
#else
pScreen->SetCursorPosition(pDev, pScreen, x, y, FALSE);

View File

@ -959,7 +959,7 @@ dmxBECreateResources(void *value, XID id, RESTYPE type, void *n)
}
}
/** Create window hierachy on back-end server. The window tree is
/** Create window hierarchy on back-end server. The window tree is
* created in a special order (bottom most subwindow first) so that the
* #dmxCreateNonRootWindow() function does not need to recursively call
* itself to create each window's parents. This is required so that we
@ -1590,11 +1590,11 @@ dmxBEDestroyScratchGCs(int scrnNum)
dmxBEFreeGC(ppGC[i]);
}
/** Destroy window hierachy on back-end server. To ensure that all
/** Destroy window hierarchy on back-end server. To ensure that all
* XDestroyWindow() calls succeed, they must be performed in a bottom
* up order so that windows are not destroyed before their children.
* XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will
* destroy a window as well as all of it's children. */
* destroy a window as well as all of its children. */
static void
dmxBEDestroyWindowTree(int idx)
{

View File

@ -204,7 +204,7 @@ dmxLogCont(dmxLogLevel logLevel, const char *format, ...)
}
#ifndef DMX_LOG_STANDALONE
/** Log an informational message (at level #dmxInfo) related to ouput.
/** Log an informational message (at level #dmxInfo) related to output.
* The message prefix will contain backend information from \a
* dmxScreen. */
void

View File

@ -216,7 +216,7 @@ dmxScreenInit(ScreenPtr pScreen, int argc, char *argv[])
return FALSE;
/*
* Initalise the visual types. miSetVisualTypesAndMasks() requires
* Initialise the visual types. miSetVisualTypesAndMasks() requires
* that all of the types for each depth be collected together. It's
* intended for slightly different usage to what we would like here.
* Maybe a miAddVisualTypeAndMask() function will be added to make

View File

@ -146,7 +146,7 @@ dmxSyncInit(void)
* is TRUE, call XSync() immediately instead of waiting for the next
* XSync() batching point. Note that if XSync() batching was deselected
* with #dmxSyncActivate() before #dmxSyncInit() was called, then no
* XSync() batching is performed and this function always calles XSync()
* XSync() batching is performed and this function always calls XSync()
* immediately.
*
* (Note that this function uses TimerSet but works correctly in the

View File

@ -270,7 +270,7 @@ dmxCreateNonRootWindow(WindowPtr pWindow)
/** This function handles lazy window creation and realization. Window
* creation is handled by #dmxCreateNonRootWindow(). It also handles
* any stacking changes that have occured since the window was
* any stacking changes that have occurred since the window was
* originally created by calling #dmxDoRestackWindow(). If the window
* is shaped, the shape is set on the back-end server by calling
* #dmxDoSetShape(), and if the window has pictures (from RENDER)

View File

@ -287,7 +287,7 @@
On success, status will be 0 and physicalScreen will contain the new
screen number. On failure, status will be non-zero. The status
will be 1 if any of the following occured:
will be 1 if any of the following occurred:
* the -addremovescreens command-line option was not specified on
the Xdmx command line
* the value of physicalScreen is out of range
@ -419,7 +419,7 @@
layout. The valueMask and valueList specify which attributes are to
be changed. The possible values are:
Attriubute Type
Attribute Type
Width INT16
Height INT16

View File

@ -3307,10 +3307,10 @@ described above).
<title>Doxygen documentation</title>
<para>Doxygen is an open-source (GPL) documentation system for generating
browseable documentation from stylized comments in the source code. We
browsable documentation from stylized comments in the source code. We
have placed all of the Xdmx server and DMX protocol source code files
under Doxygen so that comprehensive documentation for the Xdmx source
code is available in an easily browseable format.
code is available in an easily browsable format.
</para>
</sect3>

View File

@ -1,4 +1,4 @@
# Add & Override for this directory and it's subdirectories
# Add & Override for this directory and its subdirectories
dmxaddinput
dmxaddscreen
dmxinfo

View File

@ -722,7 +722,7 @@ ChangeCurrentContext(__GLXclientState * cl, __GLXcontext * glxc,
}
/*
** Given a tag, and back-end screen number, retrives the current back-end
** Given a tag, and back-end screen number, retrieves the current back-end
** tag.
*/
int

View File

@ -752,7 +752,7 @@ __glXSwapRenderLarge(__GLXclientState * cl, GLbyte * pc)
/*
* call the command procedure to swap any arguments
* Note that we are assuming that all arguments that needs to be
* swaped are on the first req only !
* swapped are on the first req only !
*/
opcode = hdr->opcode;
if ((opcode >= __GLX_MIN_RENDER_OPCODE) &&

View File

@ -57,7 +57,7 @@
/*
* GetReqSingle - this is the equivalent of GetReq macro
* from Xlibint.h but it does not set the reqType field (the opcode).
* this is because the GL single opcodes has different naming convension
* this is because the GL single opcodes has different naming convention
* the other X opcodes (ie. X_GLsop_GetFloatv).
*/
#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)

View File

@ -56,7 +56,7 @@
/*
* GetReqVendorPrivate - this is the equivalent of GetReq macro
* from Xlibint.h but it does not set the reqType field (the opcode).
* this is because the GL single opcodes has different naming convension
* this is because the GL single opcodes has different naming convention
* the other X opcodes (ie. X_GLsop_GetFloatv).
*/
#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)

View File

@ -72,7 +72,7 @@
* Set2 sends a makecode for keypress, and the same code prefixed by a
* F0 for keyrelease. This is a little bit ugly to handle. Thus we use
* here for X386 the PC/XT compatible Set1. This set uses 8bit scancodes.
* Bit 7 ist set if the key is released. The code E0 switches to a
* Bit 7 is set if the key is released. The code E0 switches to a
* different meaning to add the new MF cursorkeys, while not breaking old
* applications. E1 is another special prefix. Since I assume that there
* will be further versions of PC/XT scancode compatible keyboards, we
@ -180,7 +180,7 @@
#define KEY_F12 /* F12 0x58 */ 88
#define KEY_Prefix0 /* special 0x60 */ 96
#define KEY_Prefix1 /* specail 0x61 */ 97
#define KEY_Prefix1 /* special 0x61 */ 97
/*
* The 'scancodes' below are generated by the server, because the MF101/102

View File

@ -429,7 +429,7 @@ dmxBackendCollectEvents(DevicePtr pDev,
continue;
if (!(dmxScreen = dmxBackendFindWindow(priv, X.xmotion.window)))
dmxLog(dmxFatal,
" Event on non-existant window %lu\n",
" Event on non-existent window %lu\n",
X.xmotion.window);
if (!priv->relative || dmxInput->console) {
int newX = X.xmotion.x - dmxScreen->rootX;

View File

@ -433,7 +433,7 @@ dmxConsoleMoveRelative(myPrivate * priv, int x, int y,
}
/** This routine gets called from #dmxCoreMotion for each motion. This
* allows the console's notion of the cursor postion to change when
* allows the console's notion of the cursor position to change when
* another input device actually caused the change. */
void
dmxConsoleUpdatePosition(void *private, int x, int y)
@ -475,7 +475,7 @@ dmxConsoleUpdatePosition(void *private, int x, int y)
}
}
/** Collect all pending events from the console's display. Plase these
/** Collect all pending events from the console's display. Place these
* events on the server event queue using the \a motion and \a enqueue
* routines. The \a checkspecial routine is used to check for special
* keys that need handling. \a block tells if signals should be blocked

View File

@ -32,7 +32,7 @@
*/
/** \file
* Provide support and helper functions for enqueing events received by
* Provide support and helper functions for enqueuing events received by
* the low-level input drivers. */
#ifdef HAVE_DMX_CONFIG_H

View File

@ -256,7 +256,7 @@ typedef struct _DMXLocalInputInfo {
long deviceId; /**< device id on remote side,
* if any */
const char *deviceName; /**< devive name on remote
const char *deviceName; /**< device name on remote
* side, if any */
} DMXLocalInputInfoRec;

View File

@ -278,7 +278,7 @@ This option disables the RENDER extension.
.sp
.TP 8
.BI "-noglxproxy"
This option disables GLX proxy -- the build-in GLX extension
This option disables GLX proxy -- the built-in GLX extension
implementation that is DMX aware.
.sp
.TP 8

View File

@ -7,7 +7,7 @@ What Is It ?
Xephyr is a a kdrive server that outputs to a window on a pre-existing
'host' X display. Think Xnest but with support for modern extensions
like composite, damage and randr.
like composite, damage and randr.
Unlike Xnest which is an X proxy, i.e. limited to the
capabilities of the host X server, Xephyr is a real X server which
@ -17,7 +17,7 @@ It also has support for 'visually' debugging what the server is
painting.
How To Use
How To Use
==========
You probably want to run like;
@ -26,48 +26,46 @@ Xephyr :1 -ac -screen 800x600 &
Then set DISPLAY=:1 and run whatever X apps you like.
Use 'xrandr' to change to orientation/size.
Use 'xrandr' to change to orientation/size.
There is a '-parent' switch which works just like Xnests ( for use
There is a '-parent' switch which works just like Xnest's ( for use
with things like matchbox-nest - http://matchbox.handhelds.org ).
There is also a '-host-cursor' switch to set 'cursor acceleration' -
The host's cursor is reused. This is only really there to aid
debugging by avoiding server paints for the cursor. Performance
improvement is negiable.
improvement is negligible.
Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to
toggle the debugging mode. In this mode red rectangles are painted to
screen areas getting painted before painting the actual content. The
delay between this can be altered by setting a XEPHYR_PAUSE env var to
a value in micro seconds.
a value in microseconds.
Caveats
=======
- Depth is limited to being the same as the host.
*Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp
- Depth is limited to being the same as the host.
*Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp
on 24bpp host.
- Rotated displays are currently updated via full blits. This
is slower than a normal oprientated display. Debug mode will
therefor not be of much use rotated.
therefore not be of much use rotated.
- The '-host-cursor' cursor is static in its appearence.
- The '-host-cursor' cursor is static in its appearance.
- The build gets a warning about 'nanosleep'. I think the various '-D'
build flags are causing this. I havn't figured as yet how to work
round it. It doesn't appear to break anything however.
build flags are causing this. I haven't figured as yet how to work
around it. It doesn't appear to break anything however.
- Keyboard handling is basic but works.
- Keyboard handling is basic but works.
- Mouse button 5 probably wont work.
- Mouse button 5 probably won't work.
Matthew Allum <mallum@o-hand.com> 2004
Matthew Allum <mallum@o-hand.com> 2004

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2004 Nokia
@ -219,7 +219,7 @@ ephyrMapFramebuffer(KdScreenInfo * screen)
/*
* Use the rotation last applied to ourselves (in the Xephyr case the fb
* coordinate system moves independently of the pointer coordiante system).
* coordinate system moves independently of the pointer coordinate system).
*/
KdComputePointerMatrix(&m, ephyrRandr, screen->width, screen->height);
KdSetPointerMatrix(&m);
@ -294,7 +294,7 @@ ephyrShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf)
EPHYR_LOG("slow paint");
/* FIXME: Slow Rotated/Reflected updates could be much
* much faster efficiently updating via tranforming
* much faster efficiently updating via transforming
* pBuf->pDamage regions
*/
shadowUpdateRotatePacked(pScreen, pBuf);
@ -777,8 +777,7 @@ ephyrUpdateModifierState(unsigned int state)
for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
int key;
/* Modifier is down, but shouldn't be
*/
/* Modifier is down, but shouldn't be */
if ((xkb_state & mask) && !(state & mask)) {
int count = keyc->modifierKeyCount[i];
@ -796,8 +795,7 @@ ephyrUpdateModifierState(unsigned int state)
}
}
/* Modifier shoud be down, but isn't
*/
/* Modifier should be down, but isn't */
if (!(xkb_state & mask) && (state & mask))
for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) {

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@o-hand.com>
*
* Copyright © 2004 Nokia

View File

@ -42,7 +42,7 @@
#include <X11/Xproto.h>
/* until we need geometry shaders GL3.1 should suffice. */
/* Xephyr has it's own copy of this for build reasons */
/* Xephyr has its own copy of this for build reasons */
#define GLAMOR_GL_CORE_VER_MAJOR 3
#define GLAMOR_GL_CORE_VER_MINOR 1
/** @{

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@o-hand.com>
*
* Copyright © 2004 Nokia

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2007 OpenedHand Ltd

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@openedhand.com>
*
* Copyright © 2007 OpenedHand Ltd

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@o-hand.com>
*
* Copyright © 2004 Nokia

View File

@ -1,5 +1,5 @@
/*
* Xephyr - A kdrive X server thats runs in a host X window.
* Xephyr - A kdrive X server that runs in a host X window.
* Authored by Matthew Allum <mallum@o-hand.com>
*
* Copyright © 2004 Nokia

View File

@ -423,7 +423,7 @@ KdXVInitAdaptors(ScreenPtr pScreen, KdVideoAdaptorPtr infoPtr, int number)
client clip from the GC when the video is initialized. We then
use KdXVUpdateCompositeClip to calculate the new composite clip
when we need it. This is different from what DEC did. They saved
the GC and used it's clip list when they needed to reclip the window,
the GC and used its clip list when they needed to reclip the window,
even if the client clip was different from the one the video was
initialized with. If the original GC was destroyed, they had to stop
the video. I like the new method better (MArk).

View File

@ -1,3 +1,3 @@
# Add & Override for this directory and it's subdirectories
# Add & Override for this directory and its subdirectories
xf86Build.h
xf86DefModeSet.c

View File

@ -131,7 +131,7 @@ xf86BusConfig(void)
/*
* 2. If no Screens were found, call each drivers probe function with
* ignorePrimary = TRUE, to ensure that we do actually get a
* Screen if there is atleast one supported video card.
* Screen if there is at least one supported video card.
*/
if (xf86NumScreens == 0) {
xf86ProbeIgnorePrimary = TRUE;
@ -403,7 +403,7 @@ xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
/*
* xf86ClearEntityListForScreen() - called when a screen is deleted
* to mark it's entities unused. Called by xf86DeleteScreen().
* to mark its entities unused. Called by xf86DeleteScreen().
*/
void
xf86ClearEntityListForScreen(ScrnInfoPtr pScrn)

View File

@ -137,8 +137,8 @@ xf86PointerMoved(ScrnInfoPtr pScr, int x, int y)
Bool frameChanged = FALSE;
/*
* check wether (x,y) belongs to the visual part of the screen
* if not, change the base of the displayed frame accoring
* check whether (x,y) belongs to the visual part of the screen
* if not, change the base of the displayed frame occurring
*/
if (pScr->frameX0 > x) {
pScr->frameX0 = x;

View File

@ -280,12 +280,12 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
/*
* Hmm... here is the biggest hack of every time !
* It may be possible that a switch-vt procedure has finished BEFORE
* you released all keys neccessary to do this. That peculiar behavior
* you released all keys necessary to do this. That peculiar behavior
* can fool the X-server pretty much, cause it assumes that some keys
* were not released. TWM may stuck alsmost completly....
* were not released. TWM may stuck almost completely....
* OK, what we are doing here is after returning from the vt-switch
* exeplicitely unrelease all keyboard keys before the input-devices
* are reenabled.
* explicitly unrelease all keyboard keys before the input-devices
* are re-enabled.
*/
for (i = keyc->xkbInfo->desc->min_key_code;

View File

@ -811,8 +811,8 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
scrp->gamma.red = SET_GAMMA(DDC->features.gamma);
scrp->gamma.green = SET_GAMMA(DDC->features.gamma);
scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);
/* EDID structure version 2 gives optional seperate red, green & blue gamma values
* in bytes 0x57-0x59 */
/* EDID structure version 2 gives optional separate red, green & blue
* gamma values in bytes 0x57-0x59 */
#endif
}
else if (TEST_GAMMA(gamma)) {

View File

@ -1186,7 +1186,7 @@ LCM(unsigned int x, unsigned int y)
/*
* Given various screen attributes, determine the minimum scanline width such
* that each scanline is server and DDX padded and any pixels with imbedded
* that each scanline is server and DDX padded and any pixels with embedded
* bank boundaries are off-screen. This function returns -1 if such a width
* cannot exist.
*/
@ -1223,7 +1223,7 @@ scanLineWidth(unsigned int xsize, /* pixels */
/*
* Scanlines will be server-pad aligned at this point. They will also be
* a multiple of nWidthUnit bits long. Ensure that pixels with imbedded
* a multiple of nWidthUnit bits long. Ensure that pixels with embedded
* bank boundaries are off-screen.
*
* It seems reasonable to limit total frame buffer size to 1/16 of the

View File

@ -92,7 +92,7 @@ typedef enum {
LDR_NOENT, /* Module file does not exist */
LDR_NOLOAD, /* type specific loader failed */
LDR_ONCEONLY, /* Module should only be loaded once (not an error) */
LDR_MISMATCH, /* the module didn't match the spec'd requirments */
LDR_MISMATCH, /* the module didn't match the spec'd requirements */
LDR_BADUSAGE, /* LoadModule is called with bad arguments */
LDR_INVALID, /* The module doesn't have a valid ModuleData object */
LDR_BADOS, /* The module doesn't support the OS */

View File

@ -1476,7 +1476,7 @@ xf86FirstLocalDevice(void)
*
* This function is the same for X or Y coordinates.
* You may have to reverse the high and low values to compensate for
* different orgins on the touch screen vs X.
* different origins on the touch screen vs X.
*
* e.g. to scale from device coordinates into screen coordinates, call
* xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);

View File

@ -382,7 +382,7 @@ AllocateArea(FBManagerPtr offman,
break;
}
/* try to boot a removeable one out if we are not expendable ourselves */
/* try to boot a removable one out if we are not expendable ourselves */
if (!area && !removeCB) {
link = offman->UsedAreas;
@ -1056,7 +1056,7 @@ localResizeOffscreenLinear(FBLinearPtr resize, int length)
return FALSE;
}
/* This could actually be alot smarter and try to move allocations
/* This could actually be a lot smarter and try to move allocations
from XY to linear when available. For now if it was XY, we keep
it XY */

View File

@ -633,7 +633,7 @@ struct Inst {
* \param devList List of Device sections parsed from the config file.
* \param numDevs Number of entries in \c devList.
* \param drvp Pointer the driver's control structure.
* \param foundEntities Returned list of entity indicies associated with the
* \param foundEntities Returned list of entity indices associated with the
* driver.
*
* \returns

View File

@ -534,7 +534,7 @@ xf86platformProbeDev(DriverPtr drvp)
const unsigned numDevs = xf86MatchDevice(drvp->driverName, &devList);
int i, j;
/* find the main device or any device specificed in xorg.conf */
/* find the main device or any device specified in xorg.conf */
for (i = 0; i < numDevs; i++) {
const char *devpath;

View File

@ -544,7 +544,7 @@ xf86XVInitAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr * infoPtr, int number)
client clip from the GC when the video is initialized. We then
use xf86XVUpdateCompositeClip to calculate the new composite clip
when we need it. This is different from what DEC did. They saved
the GC and used it's clip list when they needed to reclip the window,
the GC and used its clip list when they needed to reclip the window,
even if the client clip was different from the one the video was
initialized with. If the original GC was destroyed, they had to stop
the video. I like the new method better (MArk).

View File

@ -155,7 +155,7 @@ XisbTrace(XISBuffer * b, int trace)
* will use check to select for data and prevent a block.
* It is the caller's responsibility to set the block_duration to -1 if it
* knows that there is data to read (because the main select loop triggered
* the read) and want's to avoid the unnecessary overhead of the select call
* the read) and wants to avoid the unnecessary overhead of the select call
*
* a zero or positive block duration will cause the select to block for the
* give duration in usecs.

View File

@ -164,7 +164,7 @@
#define T2 GET(E_T2)
#define T_MANU GET(E_TMANU)
/* extract information from estabished timing section */
/* extract information from established timing section */
#define _VALID_TIMING(x) !(((x[0] == 0x01) && (x[1] == 0x01)) \
|| ((x[0] == 0x00) && (x[1] == 0x00)) \
|| ((x[0] == 0x20) && (x[1] == 0x20)) )

View File

@ -143,7 +143,7 @@ print_dpms_features(int scrnIndex, struct disp_features *c,
if (!c->input_type) { /* analog */
switch (c->display_type) {
case DISP_MONO:
xf86ErrorF("; Monochorome/GrayScale Display\n");
xf86ErrorF("; Monochrome/GrayScale Display\n");
break;
case DISP_RGB:
xf86ErrorF("; RGB/Color Display\n");

View File

@ -54,7 +54,7 @@ refresh rate.
As hardware often limits possible configuration combinations, each output
knows the set of CRTCs that it can be connected to as well as the set of
other outputs which can be simutaneously connected to a CRTC.
other outputs which can be simultaneously connected to a CRTC.
2.1.2 CRTC overview

View File

@ -511,7 +511,7 @@ mechanism for this.
<para>
If a device is capable of disabling this decoding the resource is
called sharable. For PCI devices a generic method is provided to
called shareable. For PCI devices a generic method is provided to
control resource decoding. Other devices will have to provide a
device specific function to control decoding.
</para>
@ -1065,7 +1065,7 @@ Here is what <function>InitOutput()</function> does:
against the expected number (most drivers expect only one). The
entity information for each of them should be retrieved (with
<function>xf86GetEntityInfo()</function>) and checked for the correct
bus type and that none of the sharable resources registered during
bus type and that none of the shareable resources registered during
the Probe phase was rejected.
</para>
@ -1373,7 +1373,7 @@ Here is what <function>InitOutput()</function> does:
<orderedlist>
<listitem><para>
The sharable resources registered by each entity are compared.
The shareable resources registered by each entity are compared.
If a resource is registered by more than one entity the entity
will be marked to indicate that it needs to share this resources
type (IO or MEM).
@ -2193,7 +2193,7 @@ giving up the VT.
<para>
In <function>PreInit()</function> phase each driver should check if any
sharable resources it has registered during <function>Probe()</function> has
shareable resources it has registered during <function>Probe()</function> has
been denied and take appropriate action which could simply be to fail.
If it needs to access resources it has disabled during
<function>EntitySetup()</function> it can do so provided it has registered
@ -2226,7 +2226,7 @@ rules:
<orderedlist>
<listitem><para>
The sharable resources registered by each entity are compared. If
The shareable resources registered by each entity are compared. If
a resource is registered by more than one entity the entity will be
marked to need to share this resources type (<constant>IO</constant> or
<constant>MEM</constant>).
@ -4704,7 +4704,7 @@ typedef struct {
<varlistentry>
<term><structfield>depth</structfield></term>
<listitem><para>
The significant bits per pixel in RGB formats (analgous to the
The significant bits per pixel in RGB formats (analogous to the
depth of a pixmap format).
</para></listitem></varlistentry>

View File

@ -1736,7 +1736,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
return;
}
/* usefull for debugging, just print out after n context switches */
/* useful for debugging, just print out after n context switches */
if (!count || !(count % 1)) {
DRIDrvMsg(pScreen->myNum, X_INFO,
"[DRI] Context switch %5d from %p/0x%08x (%d)\n",

View File

@ -169,7 +169,7 @@ typedef void (*DRI2InvalidateProcPtr) (DrawablePtr pDraw, void *data, XID id);
* support other swap_limits it has to implement supported limits with this
* callback.
*
* \param pDraw drawable whos swap_limit is going to be changed
* \param pDraw drawable whose swap_limit is going to be changed
* \param swap_limit new swap_limit that going to be set
* \return TRUE if limit is support, FALSE if not.
*/
@ -299,13 +299,13 @@ extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
* the \c XF86ModuleData from a layered module, such a module will fail to
* load (due to an unresolved symbol) if the DRI2 extension is not loaded.
*
* \param major Location to store the major verion of the DRI2 extension
* \param minor Location to store the minor verion of the DRI2 extension
* \param major Location to store the major version of the DRI2 extension
* \param minor Location to store the minor version of the DRI2 extension
*
* \note
* This interface was added some time after the initial release of the DRI2
* module. Layered modules that wish to use this interface must first test
* its existance by calling \c xf86LoaderCheckSymbol.
* its existence by calling \c xf86LoaderCheckSymbol.
*/
extern _X_EXPORT void DRI2Version(int *major, int *minor);

View File

@ -344,7 +344,7 @@ ProcDRI2CopyRegion(ClientPtr client)
/* CopyRegion needs to be a round trip to make sure the X server
* queues the swap buffer rendering commands before the DRI client
* continues rendering. The reply has a bitmask to signal the
* presense of optional return values as well, but we're not using
* presence of optional return values as well, but we're not using
* that yet.
*/

View File

@ -1267,7 +1267,7 @@ msEnableSharedPixmapFlipping(RRCrtcPtr crtc, PixmapPtr front, PixmapPtr back)
return FALSE;
/* EVDI uses USB transport but is platform device, not usb.
* Blacklist it explicitly */
* Exclude it explicitly. */
if (syspath && strstr(syspath, "evdi"))
return FALSE;
}
@ -1691,7 +1691,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
/* If pageflip is enabled hook the screen's cursor-sprite (swcursor) funcs.
* So that we can disabe page-flipping on fallback to a swcursor. */
* So that we can disable page-flipping on fallback to a swcursor. */
if (ms->drmmode.pageflip) {
miPointerScreenPtr PointPriv =
dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);

Some files were not shown because too many files have changed in this diff Show More