From 23e83724df4809fd7857cc609c33ce7e8d3021a4 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 5 Jul 2020 13:07:33 -0700 Subject: [PATCH] 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 --- README.md | 2 +- Xext/hashtable.h | 2 +- Xext/saver.c | 4 +- Xext/shm.c | 4 +- Xext/vidmode.c | 4 +- Xext/xres.c | 10 ++--- Xext/xtest.c | 5 ++- Xext/xvmain.c | 4 +- Xi/closedev.c | 2 +- Xi/exevents.c | 4 +- Xi/grabdev.c | 2 +- Xi/xiproperty.c | 6 +-- composite/compwindow.c | 2 +- configure.ac | 2 +- dbe/dbe.c | 4 +- dbe/dbestruct.h | 2 +- dix/.gitignore | 2 +- dix/colormap.c | 4 +- dix/dispatch.c | 2 +- dix/dixfonts.c | 2 +- dix/enterleave.c | 4 +- dix/events.c | 8 ++-- dix/getevents.c | 12 +++--- dix/ptrveloc.c | 6 +-- dix/region.c | 4 +- dix/swaprep.c | 4 +- dix/touch.c | 6 +-- dix/window.c | 6 +-- doc/Xserver-spec.xml | 4 +- doc/dtrace/Xserver-DTrace.xml | 2 +- exa/exa.c | 2 +- exa/exa.h | 2 +- exa/exa_offscreen.c | 2 +- exa/exa_priv.h | 4 +- fb/fbbltone.c | 2 +- fb/fbcmap_mi.c | 2 +- glamor/glamor.c | 2 +- glamor/glamor.h | 2 +- glamor/glamor_gradient.c | 6 +-- glamor/glamor_largepixmap.c | 2 +- glamor/glamor_vbo.c | 2 +- glx/glxcmds.c | 2 +- glx/indirect_util.c | 2 +- hw/dmx/.gitignore | 2 +- hw/dmx/config/.gitignore | 2 +- hw/dmx/config/dmxconfig.c | 2 +- hw/dmx/config/dmxparse.h | 4 +- hw/dmx/dmx-config.h | 2 +- hw/dmx/dmx.c | 2 +- hw/dmx/dmxcb.c | 2 +- hw/dmx/dmxcursor.c | 2 +- hw/dmx/dmxextension.c | 6 +-- hw/dmx/dmxlog.c | 2 +- hw/dmx/dmxscrinit.c | 2 +- hw/dmx/dmxsync.c | 2 +- hw/dmx/dmxwindow.c | 2 +- hw/dmx/doc/DMXSpec.txt | 4 +- hw/dmx/doc/dmx.xml | 4 +- hw/dmx/examples/.gitignore | 2 +- hw/dmx/glxProxy/glxcmds.c | 2 +- hw/dmx/glxProxy/glxcmdsswap.c | 2 +- hw/dmx/glxProxy/glxsingle.c | 2 +- hw/dmx/glxProxy/glxvendor.c | 2 +- hw/dmx/input/atKeynames.h | 4 +- hw/dmx/input/dmxbackend.c | 2 +- hw/dmx/input/dmxconsole.c | 4 +- hw/dmx/input/dmxevents.c | 2 +- hw/dmx/input/dmxinputinit.h | 2 +- hw/dmx/man/Xdmx.man | 2 +- hw/kdrive/ephyr/README | 32 +++++++------- hw/kdrive/ephyr/ephyr.c | 12 +++--- hw/kdrive/ephyr/ephyr.h | 2 +- hw/kdrive/ephyr/ephyr_glamor_glx.c | 2 +- hw/kdrive/ephyr/ephyrinit.c | 2 +- hw/kdrive/ephyr/ephyrlog.h | 2 +- hw/kdrive/ephyr/ephyrvideo.c | 2 +- hw/kdrive/ephyr/hostx.c | 2 +- hw/kdrive/ephyr/hostx.h | 2 +- hw/kdrive/src/kxv.c | 2 +- hw/xfree86/common/.gitignore | 2 +- hw/xfree86/common/xf86Bus.c | 4 +- hw/xfree86/common/xf86Cursor.c | 4 +- hw/xfree86/common/xf86Events.c | 8 ++-- hw/xfree86/common/xf86Helper.c | 4 +- hw/xfree86/common/xf86Mode.c | 4 +- hw/xfree86/common/xf86Module.h | 2 +- hw/xfree86/common/xf86Xinput.c | 2 +- hw/xfree86/common/xf86fbman.c | 4 +- hw/xfree86/common/xf86pciBus.c | 2 +- hw/xfree86/common/xf86platformBus.c | 2 +- hw/xfree86/common/xf86xv.c | 2 +- hw/xfree86/common/xisb.c | 2 +- hw/xfree86/ddc/edid.h | 2 +- hw/xfree86/ddc/print_edid.c | 2 +- hw/xfree86/doc/README.modes | 2 +- hw/xfree86/doc/ddxDesign.xml | 12 +++--- hw/xfree86/dri/dri.c | 2 +- hw/xfree86/dri2/dri2.h | 8 ++-- hw/xfree86/dri2/dri2ext.c | 2 +- hw/xfree86/drivers/modesetting/driver.c | 4 +- .../drivers/modesetting/drmmode_display.c | 2 +- hw/xfree86/drivers/modesetting/pageflip.c | 6 +-- hw/xfree86/fbdevhw/fbdevhw.c | 4 +- hw/xfree86/fbdevhw/fbpriv.h | 2 +- hw/xfree86/i2c/xf86i2c.c | 10 ++--- hw/xfree86/int10/INT10.HOWTO | 4 +- hw/xfree86/int10/generic.c | 2 +- hw/xfree86/int10/helper_exec.c | 6 +-- hw/xfree86/int10/vbe.c | 4 +- hw/xfree86/int10/vbe.h | 3 +- hw/xfree86/int10/vbeModes.c | 2 +- hw/xfree86/int10/xf86int10.c | 2 +- hw/xfree86/modes/xf86Crtc.c | 4 +- hw/xfree86/modes/xf86Crtc.h | 2 +- hw/xfree86/modes/xf86EdidModes.c | 4 +- hw/xfree86/modes/xf86RandR12.c | 2 +- hw/xfree86/os-support/bsd/bsd_init.c | 6 +-- hw/xfree86/os-support/bsd/memrange.h | 2 +- hw/xfree86/os-support/shared/sigio.c | 2 +- hw/xfree86/os-support/solaris/sun_apm.c | 2 +- hw/xfree86/os-support/xf86_OSproc.h | 4 +- hw/xfree86/parser/Configint.h | 6 +-- hw/xfree86/parser/write.c | 2 +- hw/xfree86/ramdac/CURSOR.NOTES | 42 +++++++++---------- hw/xfree86/utils/cvt/cvt.c | 4 +- hw/xfree86/vgahw/vgaHW.c | 6 +-- hw/xfree86/vgahw/vgaHW.h | 2 +- hw/xfree86/x86emu/decode.c | 2 +- hw/xfree86/x86emu/ops.c | 18 ++++---- hw/xfree86/x86emu/prim_ops.c | 14 +++---- hw/xfree86/x86emu/sys.c | 2 +- hw/xfree86/x86emu/x86emu/debug.h | 4 +- hw/xfree86/x86emu/x86emu/regs.h | 2 +- hw/xfree86/x86emu/x86emu/x86emui.h | 4 +- hw/xfree86/xorgconf.cpp | 2 +- hw/xnest/Args.c | 2 +- hw/xnest/Handlers.c | 2 +- hw/xnest/Keyboard.c | 6 +-- hw/xnest/Window.c | 2 +- hw/xnest/man/Xnest.man | 2 +- hw/xquartz/GL/capabilities.c | 6 +-- hw/xquartz/GL/glcontextmodes.c | 8 ++-- hw/xquartz/X11Controller.h | 4 +- hw/xquartz/darwin.c | 4 +- hw/xquartz/mach-startup/.gitignore | 2 +- hw/xquartz/pbproxy/x-selection.m | 10 ++--- hw/xquartz/xpr/xprScreen.c | 2 +- hw/xwayland/xwayland-glamor-eglstream.c | 8 ++-- hw/xwayland/xwayland-input.c | 2 +- hw/xwayland/xwayland-shm.c | 2 +- hw/xwin/InitOutput.c | 2 +- hw/xwin/ddraw.h | 24 +++++------ hw/xwin/glx/indirect.c | 6 +-- hw/xwin/man/XWin.man | 4 +- hw/xwin/man/XWinrc.man | 2 +- hw/xwin/win.h | 2 +- hw/xwin/winallpriv.c | 2 +- hw/xwin/winclipboard/wndproc.c | 2 +- hw/xwin/winclipboard/xwinclip.man | 4 +- hw/xwin/winclipboardinit.c | 2 +- hw/xwin/winconfig.c | 2 +- hw/xwin/wincreatewnd.c | 2 +- hw/xwin/wincursor.c | 2 +- hw/xwin/winkeynames.h | 4 +- hw/xwin/winmouse.c | 2 +- hw/xwin/winmultiwindowicons.c | 2 +- hw/xwin/winmultiwindowwindow.c | 8 ++-- hw/xwin/winmultiwindowwm.c | 6 +-- hw/xwin/winprefs.c | 2 +- hw/xwin/winprocarg.c | 2 +- hw/xwin/winscrinit.c | 6 +-- hw/xwin/winshadgdi.c | 2 +- hw/xwin/winwndproc.c | 4 +- include/.gitignore | 2 +- include/glxvndabi.h | 2 +- include/pixmap.h | 2 +- include/scrnintstr.h | 6 +-- include/xkbstr.h | 2 +- mi/miarc.c | 4 +- mi/mibitblt.c | 2 +- mi/micmap.c | 2 +- mi/miglblt.c | 2 +- mi/mipointer.c | 6 +-- mi/mipointer.h | 2 +- mi/miscrinit.c | 2 +- mi/mizerline.c | 2 +- miext/rootless/rootless.h | 4 +- miext/rootless/rootlessCommon.h | 2 +- miext/rootless/rootlessWindow.c | 6 +-- miext/shadow/shadow.c | 2 +- miext/sync/misyncstr.h | 2 +- os/access.c | 2 +- os/backtrace.c | 2 +- os/client.c | 2 +- os/connection.c | 2 +- os/io.c | 6 +-- present/present.h | 2 +- present/present_wnmd.c | 2 +- record/record.c | 4 +- xfixes/cursor.c | 2 +- xkb/XKM_file_format.txt | 6 +-- xkb/ddxLoad.c | 2 +- 202 files changed, 389 insertions(+), 395 deletions(-) diff --git a/README.md b/README.md index bc39f41cd..a40f2ca2b 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/Xext/hashtable.h b/Xext/hashtable.h index a988af32c..04e0be9e2 100644 --- a/Xext/hashtable.h +++ b/Xext/hashtable.h @@ -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 diff --git a/Xext/saver.c b/Xext/saver.c index c27a66c80..1d7e3cadf 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -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)); diff --git a/Xext/shm.c b/Xext/shm.c index 24c6b1087..0deb9a945 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -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) diff --git a/Xext/vidmode.c b/Xext/vidmode.c index 6e4a7c709..c7c61647e 100644 --- a/Xext/vidmode.c +++ b/Xext/vidmode.c @@ -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; diff --git a/Xext/xres.c b/Xext/xres.c index 7a7aabc9b..354329802 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -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) { diff --git a/Xext/xtest.c b/Xext/xtest.c index 38b80122b..540d270a1 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -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; /** diff --git a/Xext/xvmain.c b/Xext/xvmain.c index c520c7d29..f62747193 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -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; diff --git a/Xi/closedev.c b/Xi/closedev.c index 199d38a5a..f68b5231a 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -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. * */ diff --git a/Xi/exevents.c b/Xi/exevents.c index 98319ad4d..41a4097cc 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -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); diff --git a/Xi/grabdev.c b/Xi/grabdev.c index eb4f9bfde..cb68cfa8d 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -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) * diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 6ec419e87..a36f7d61d 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -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, diff --git a/composite/compwindow.c b/composite/compwindow.c index ea59b5a1a..73a1871a0 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -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); diff --git a/configure.ac b/configure.ac index f91242267..7b1728b0c 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/dbe/dbe.c b/dbe/dbe.c index 292a22366..cdab3e9e5 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -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; diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index fe2ef0af6..ce99fbea8 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -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; diff --git a/dix/.gitignore b/dix/.gitignore index f149fffc6..47cb0826e 100644 --- a/dix/.gitignore +++ b/dix/.gitignore @@ -1,2 +1,2 @@ -# Add & Override for this directory and it's subdirectories +# Add & Override for this directory and its subdirectories dix.O diff --git a/dix/colormap.c b/dix/colormap.c index 12a85b256..7a00d14d6 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -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) { diff --git a/dix/dispatch.c b/dix/dispatch.c index f20e1963e..8865219d0 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -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. diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 0ea8678bb..58a385f71 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -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; diff --git a/dix/enterleave.c b/dix/enterleave.c index a2f625bc9..a41bacfb9 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -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. diff --git a/dix/events.c b/dix/events.c index f546700fa..9431e4f12 100644 --- a/dix/events.c +++ b/dix/events.c @@ -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); diff --git a/dix/getevents.c b/dix/getevents.c index f784c68d5..b2b8f124f 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -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); diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index ff39d7bba..632971ed9 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -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 */ diff --git a/dix/region.c b/dix/region.c index e269e695c..49d823cda 100644 --- a/dix/region.c +++ b/dix/region.c @@ -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 diff --git a/dix/swaprep.c b/dix/swaprep.c index 08344d7f7..d785b2e5e 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -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++; diff --git a/dix/touch.c b/dix/touch.c index 37902bd05..337674ddb 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -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 */ diff --git a/dix/window.c b/dix/window.c index b9c79ce95..cd917f006 100644 --- a/dix/window.c +++ b/dix/window.c @@ -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) { diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml index 2c7e17a86..15ecb0fd5 100644 --- a/doc/Xserver-spec.xml +++ b/doc/Xserver-spec.xml @@ -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). -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 diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml index 91ca254d7..0846bb3ca 100644 --- a/doc/dtrace/Xserver-DTrace.xml +++ b/doc/dtrace/Xserver-DTrace.xml @@ -58,7 +58,7 @@ DEALINGS IN THE SOFTWARE. - The provider was integrated into the X.Org git master repository + The provider was integrated into the X.Org code base with Solaris 10 & 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. diff --git a/exa/exa.c b/exa/exa.c index d6ff19796..b16875845 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -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; diff --git a/exa/exa.h b/exa/exa.h index 949ea3ac0..288d9ac66 100644 --- a/exa/exa.h +++ b/exa/exa.h @@ -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; diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index 174d4456a..c77e36261 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -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. * diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 912e21478..8414bd857 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -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; diff --git a/fb/fbbltone.c b/fb/fbbltone.c index 811bbc533..7eac85b08 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -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; diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c index 7b6a2c679..d9976ce9f 100644 --- a/fb/fbcmap_mi.c +++ b/fb/fbcmap_mi.c @@ -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 diff --git a/glamor/glamor.c b/glamor/glamor.c index 59178b930..a11e2212d 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -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. diff --git a/glamor/glamor.h b/glamor/glamor.h index 76ad84ed9..31157471d 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -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. * */ diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index eef078860..7e5d5cca9 100644 --- a/glamor/glamor_gradient.c +++ b/glamor/glamor_gradient.c @@ -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)]. * diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c index f9adb93bc..57760f8d3 100644 --- a/glamor/glamor_largepixmap.c +++ b/glamor/glamor_largepixmap.c @@ -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, diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c index 734189fa2..000c3e827 100644 --- a/glamor/glamor_vbo.c +++ b/glamor/glamor_vbo.c @@ -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" diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 1e2061d89..c29b62676 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -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. diff --git a/glx/indirect_util.c b/glx/indirect_util.c index dccffa393..ba180b0cc 100644 --- a/glx/indirect_util.c +++ b/glx/indirect_util.c @@ -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 diff --git a/hw/dmx/.gitignore b/hw/dmx/.gitignore index 4dd9b0358..513ee3770 100644 --- a/hw/dmx/.gitignore +++ b/hw/dmx/.gitignore @@ -1,2 +1,2 @@ -# Add & Override for this directory and it's subdirectories +# Add & Override for this directory and its subdirectories Xdmx diff --git a/hw/dmx/config/.gitignore b/hw/dmx/config/.gitignore index 086062204..b74975302 100644 --- a/hw/dmx/config/.gitignore +++ b/hw/dmx/config/.gitignore @@ -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 diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index 85bc0dbe4..5daf9ec9c 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -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; diff --git a/hw/dmx/config/dmxparse.h b/hw/dmx/config/dmxparse.h index a64b36f70..0a82e4ef0 100644 --- a/hw/dmx/config/dmxparse.h +++ b/hw/dmx/config/dmxparse.h @@ -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; diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h index 83a2cfbd7..76a37566b 100644 --- a/hw/dmx/dmx-config.h +++ b/hw/dmx/dmx-config.h @@ -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. diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 4c7808de1..9020f9e91 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -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. * diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c index cca5702ee..6d652c32b 100644 --- a/hw/dmx/dmxcb.c +++ b/hw/dmx/dmxcb.c @@ -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; } } diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index 0ef800e39..c5ae2a620 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -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); diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index 4f5ca7252..504e5a00b 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -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) { diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c index 3249c4867..a1915a189 100644 --- a/hw/dmx/dmxlog.c +++ b/hw/dmx/dmxlog.c @@ -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 diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c index ae095e300..433e31863 100644 --- a/hw/dmx/dmxscrinit.c +++ b/hw/dmx/dmxscrinit.c @@ -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 diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c index b55c9ddf3..ce20c84a5 100644 --- a/hw/dmx/dmxsync.c +++ b/hw/dmx/dmxsync.c @@ -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 diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c index dcdb9ac60..56c6c9825 100644 --- a/hw/dmx/dmxwindow.c +++ b/hw/dmx/dmxwindow.c @@ -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) diff --git a/hw/dmx/doc/DMXSpec.txt b/hw/dmx/doc/DMXSpec.txt index 4009f1210..4053dcc8f 100644 --- a/hw/dmx/doc/DMXSpec.txt +++ b/hw/dmx/doc/DMXSpec.txt @@ -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 diff --git a/hw/dmx/doc/dmx.xml b/hw/dmx/doc/dmx.xml index 1ee748440..2f86e5d33 100644 --- a/hw/dmx/doc/dmx.xml +++ b/hw/dmx/doc/dmx.xml @@ -3307,10 +3307,10 @@ described above). Doxygen documentation 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. diff --git a/hw/dmx/examples/.gitignore b/hw/dmx/examples/.gitignore index d86e7eb2c..9f32fa7df 100644 --- a/hw/dmx/examples/.gitignore +++ b/hw/dmx/examples/.gitignore @@ -1,4 +1,4 @@ -# Add & Override for this directory and it's subdirectories +# Add & Override for this directory and its subdirectories dmxaddinput dmxaddscreen dmxinfo diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index 6e64811ce..b71588678 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -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 diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c index 92ca512a7..b7fc1c56f 100644 --- a/hw/dmx/glxProxy/glxcmdsswap.c +++ b/hw/dmx/glxProxy/glxcmdsswap.c @@ -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) && diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index e254936a9..319da50b0 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -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) diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c index 52d70eb70..f1d464305 100644 --- a/hw/dmx/glxProxy/glxvendor.c +++ b/hw/dmx/glxProxy/glxvendor.c @@ -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) diff --git a/hw/dmx/input/atKeynames.h b/hw/dmx/input/atKeynames.h index 68e2eb31d..4aabb4165 100644 --- a/hw/dmx/input/atKeynames.h +++ b/hw/dmx/input/atKeynames.h @@ -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 diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c index 56abe8013..1c51776e7 100644 --- a/hw/dmx/input/dmxbackend.c +++ b/hw/dmx/input/dmxbackend.c @@ -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; diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c index f33a0ebd3..86f01b703 100644 --- a/hw/dmx/input/dmxconsole.c +++ b/hw/dmx/input/dmxconsole.c @@ -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 diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index fb0c00fe1..a4b99cd5a 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -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 diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h index 11af2ca82..27e93561e 100644 --- a/hw/dmx/input/dmxinputinit.h +++ b/hw/dmx/input/dmxinputinit.h @@ -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; diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man index a5bdccd58..209c49ca6 100644 --- a/hw/dmx/man/Xdmx.man +++ b/hw/dmx/man/Xdmx.man @@ -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 diff --git a/hw/kdrive/ephyr/README b/hw/kdrive/ephyr/README index 6d6a222ef..5019fbb5f 100644 --- a/hw/kdrive/ephyr/README +++ b/hw/kdrive/ephyr/README @@ -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 2004 - - +Matthew Allum 2004 diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 4f1f19860..c503ad6a6 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -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 * * 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) { diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h index fe01661dc..587a48dc7 100644 --- a/hw/kdrive/ephyr/ephyr.h +++ b/hw/kdrive/ephyr/ephyr.h @@ -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 * * Copyright © 2004 Nokia diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c b/hw/kdrive/ephyr/ephyr_glamor_glx.c index b41a90eff..40b80cbe7 100644 --- a/hw/kdrive/ephyr/ephyr_glamor_glx.c +++ b/hw/kdrive/ephyr/ephyr_glamor_glx.c @@ -42,7 +42,7 @@ #include /* 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 /** @{ diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 47bd97ade..020461db2 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -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 * * Copyright © 2004 Nokia diff --git a/hw/kdrive/ephyr/ephyrlog.h b/hw/kdrive/ephyr/ephyrlog.h index 43679e181..744da74c5 100644 --- a/hw/kdrive/ephyr/ephyrlog.h +++ b/hw/kdrive/ephyr/ephyrlog.h @@ -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 * * Copyright © 2007 OpenedHand Ltd diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c index 671a0ddce..2dbddfb8d 100644 --- a/hw/kdrive/ephyr/ephyrvideo.c +++ b/hw/kdrive/ephyr/ephyrvideo.c @@ -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 * * Copyright © 2007 OpenedHand Ltd diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 6b1d3eb40..a5b2e344e 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -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 * * Copyright © 2004 Nokia diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h index d0f30119c..4b2678e58 100644 --- a/hw/kdrive/ephyr/hostx.h +++ b/hw/kdrive/ephyr/hostx.h @@ -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 * * Copyright © 2004 Nokia diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 711f4d80d..cb04f48cc 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -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). diff --git a/hw/xfree86/common/.gitignore b/hw/xfree86/common/.gitignore index 81e8416d2..817dfda8b 100644 --- a/hw/xfree86/common/.gitignore +++ b/hw/xfree86/common/.gitignore @@ -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 diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 367feae46..0263e6907 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -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) diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index de054fbc9..8bb68a56f 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -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; diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 4b939000c..05fa2bb90 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -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; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 3b4811053..6bdbf7c15 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -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)) { diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 484cde7ab..eb0885571 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -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 diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index c590ffec4..a40ecff0f 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -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 */ diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 3cc90c4e9..a2b2de392 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -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); diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index 91ddedc29..25779e510 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -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 */ diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 6575c4ec8..aeeed8be6 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -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 diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index f87760b63..ee2f3f86a 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -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; diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index d613d712c..8a8c5939d 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -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). diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 3568a578c..f35a6825a 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -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. diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index b884d8212..adc9bf71c 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -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)) ) diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index e16b12476..699cbe11d 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -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"); diff --git a/hw/xfree86/doc/README.modes b/hw/xfree86/doc/README.modes index ea228e592..54543bf0a 100644 --- a/hw/xfree86/doc/README.modes +++ b/hw/xfree86/doc/README.modes @@ -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 diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index 796a02648..1eed293fe 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -511,7 +511,7 @@ mechanism for this. 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. @@ -1065,7 +1065,7 @@ Here is what InitOutput() does: against the expected number (most drivers expect only one). The entity information for each of them should be retrieved (with xf86GetEntityInfo()) 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. @@ -1373,7 +1373,7 @@ Here is what InitOutput() does: - 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. In PreInit() phase each driver should check if any -sharable resources it has registered during Probe() has +shareable resources it has registered during Probe() has been denied and take appropriate action which could simply be to fail. If it needs to access resources it has disabled during EntitySetup() it can do so provided it has registered @@ -2226,7 +2226,7 @@ rules: - 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 (IO or MEM). @@ -4704,7 +4704,7 @@ typedef struct { depth - 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). diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 9f7075996..d1b092bdb 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -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", diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h index 1e7afddbd..4c14b705d 100644 --- a/hw/xfree86/dri2/dri2.h +++ b/hw/xfree86/dri2/dri2.h @@ -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); diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c index 529de7515..4f98639aa 100644 --- a/hw/xfree86/dri2/dri2ext.c +++ b/hw/xfree86/dri2/dri2ext.c @@ -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. */ diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 0c1867f02..5098adb94 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -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); diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index a9a83aa8b..49b9ae944 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -3970,7 +3970,7 @@ drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth, /* * We hook the screen's cursor-sprite (swcursor) functions to see if a swcursor - * is active. When a swcursor is active we disabe page-flipping. + * is active. When a swcursor is active we disable page-flipping. */ static void drmmode_sprite_do_set_cursor(msSpritePrivPtr sprite_priv, diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c index 2113f2228..9c199668f 100644 --- a/hw/xfree86/drivers/modesetting/pageflip.c +++ b/hw/xfree86/drivers/modesetting/pageflip.c @@ -85,7 +85,7 @@ struct ms_flipdata { }; /* - * Per crtc pageflipping infomation, + * Per crtc pageflipping information, * These are submitted to the queuing code * one of them per crtc per flip. */ @@ -219,7 +219,7 @@ queue_flip_on_crtc(ScreenPtr screen, xf86CrtcPtr crtc, xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue retry\n"); } - /* The page flip succeded. */ + /* The page flip succeeded. */ return TRUE; } @@ -273,7 +273,7 @@ ms_do_pageflip(ScreenPtr screen, * Take a local reference on flipdata. * if the first flip fails, the sequence abort * code will free the crtc flip data, and drop - * it's reference which would cause this to be + * its reference which would cause this to be * freed when we still required it. */ flipdata->flip_count++; diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index f146ff4a4..3d8b92e66 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -1,4 +1,4 @@ -/* all driver need this */ +/* all drivers need this */ #ifdef HAVE_XORG_CONFIG_H #include #endif @@ -118,7 +118,7 @@ fbdevHWGetFD(ScrnInfoPtr pScrn) } /* -------------------------------------------------------------------- */ -/* some helpers for printing debug informations */ +/* some helpers for printing debug information */ #ifdef DEBUG static void diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index 340a4428c..8d224ae02 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -1,5 +1,5 @@ /* - * copyed from from linux kernel 2.2.4 + * copied from from linux kernel 2.2.4 * removed internal stuff (#ifdef __KERNEL__) */ diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 22109cfbc..59733b032 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -401,8 +401,8 @@ xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr) * 3rd, if a Start condition has been successfully sent, * Send a Stop condition. * - * The functions exits immediately when an error occures, - * not proceeding any data left. However, step 3 will + * The function exits immediately when an error occurs, + * not processing any data left. However, step 3 will * be executed anyway to leave the bus in clean idle state. */ @@ -440,7 +440,7 @@ I2CWriteRead(I2CDevPtr d, return r; } -/* wrapper - for compatibility and convinience */ +/* wrapper - for compatibility and convenience */ Bool xf86I2CWriteRead(I2CDevPtr d, @@ -592,7 +592,7 @@ xf86I2CWriteVec(I2CDevPtr d, I2CByte * vec, int nValues) * ========================= */ -/* Allocates an I2CDevRec for you and initializes with propper defaults +/* Allocates an I2CDevRec for you and initializes with proper defaults * you may modify before calling xf86I2CDevInit. Your I2CDevRec must * contain at least a SlaveAddr, and a pI2CBus pointer to the bus this * device shall be linked to. @@ -692,7 +692,7 @@ xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr) static I2CBusPtr I2CBusList; -/* Allocates an I2CBusRec for you and initializes with propper defaults +/* Allocates an I2CBusRec for you and initializes with proper defaults * you may modify before calling xf86I2CBusInit. Your I2CBusRec must * contain at least a BusName, a scrnIndex (or -1), and a complete set * of either high or low level I2C function pointers. You may pass diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO index e2154c1c3..13477ce87 100644 --- a/hw/xfree86/int10/INT10.HOWTO +++ b/hw/xfree86/int10/INT10.HOWTO @@ -96,7 +96,7 @@ for the INT10 executor: starting at address 0 in the process virtual memory space. Thus if this mode is to be used, the OS environment has to be able to provide that, ie. it must be able to remap the processes virtual memory space - onto itself. If the emulator is able to handle memory access thru + onto itself. If the emulator is able to handle memory access through externally provided functions the real mode process memory can be located anywhere in the processes virtual memory. It does not even have to be consecutive. @@ -304,7 +304,7 @@ FALSE. Otherwise TRUE is returned. Note: This function is currently based on the Linux vm86 call. It might have to be modified or even rewritten for other OS. So your -milage may vary. +mileage may vary. Functions to dump memory, code, xf86 CPU register values and stack are also provided. Take a look at helper.c To view a memory range the diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 8d5c4daf3..1811efb14 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -223,7 +223,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) setup_int_vect(pInt); set_return_trap(pInt); - /* Retrieve the entire legacy video BIOS segment. This can be upto + /* Retrieve the entire legacy video BIOS segment. This can be up to * 128KiB. */ vbiosMem = (char *) base + V_BIOS; diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 6a83f422e..12000bf96 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -660,10 +660,10 @@ bios_checksum(const uint8_t *start, int size) * an attempt to detect a legacy ISA card. If they find one they might * act very strange: for example they might configure the card as a * monochrome card. This might cause some drivers to choke. - * To avoid this we attempt legacy VGA by writing to all know VGA + * To avoid this we attempt legacy VGA by writing to all known VGA * disable registers before we call the BIOS initialization and - * restore the original values afterwards. In beween we hold our - * breath. To get to a (possibly exising) ISA card need to disable + * restore the original values afterwards. In between we hold our + * breath. To get to a (possibly existing) ISA card need to disable * our current PCI card. */ /* diff --git a/hw/xfree86/int10/vbe.c b/hw/xfree86/int10/vbe.c index a37975ddf..26efdd76e 100644 --- a/hw/xfree86/int10/vbe.c +++ b/hw/xfree86/int10/vbe.c @@ -169,7 +169,7 @@ vbeFree(vbeInfoPtr pVbe) return; xf86Int10FreePages(pVbe->pInt10, pVbe->memory, pVbe->num_pages); - /* If we have initalized int10 we ought to free it, too */ + /* If we have initialized int10 we ought to free it, too */ if (pVbe->init_int10) xf86FreeInt10(pVbe->pInt10); free(pVbe); @@ -846,7 +846,7 @@ VBEGetVBEpmi(vbeInfoPtr pVbe) AX := Status ES := Real Mode Segment of Table DI := Offset of Table - CX := Lenght of Table including protected mode code in bytes (for copying purposes) + CX := Length of Table including protected mode code in bytes (for copying purposes) (All other registers are preserved) */ diff --git a/hw/xfree86/int10/vbe.h b/hw/xfree86/int10/vbe.h index c8fb4e48f..8024f5102 100644 --- a/hw/xfree86/int10/vbe.h +++ b/hw/xfree86/int10/vbe.h @@ -225,8 +225,7 @@ typedef enum { } vbeSaveRestoreFunction; extern _X_EXPORT Bool - -VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction, +VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, void **memory, int *size, int *real_mode_pages); /* diff --git a/hw/xfree86/int10/vbeModes.c b/hw/xfree86/int10/vbeModes.c index 50ac50d2c..980e40b9c 100644 --- a/hw/xfree86/int10/vbeModes.c +++ b/hw/xfree86/int10/vbeModes.c @@ -431,7 +431,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe) } /* - * These wrappers are to allow (temporary) funtionality divergences. + * These wrappers are to allow (temporary) functionality divergences. */ int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index 5ead44f23..578f461b7 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -598,7 +598,7 @@ int42_handler(xf86Int10InfoPtr pInt) /** * These functions are meant to be used by the PCI BIOS emulation. Some * BIOSes need to see if there are \b other chips of the same type around so - * by setting \c exclude one PCI device can be explicitely excluded, if + * by setting \c exclude one PCI device can be explicitly excluded, if * required. */ static struct pci_device * diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 9c4c66969..ead393062 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -2737,7 +2737,7 @@ xf86DisableCrtc(xf86CrtcPtr crtc) } /* - * Check the CRTC we're going to map each output to vs. it's current + * Check the CRTC we're going to map each output to vs. its current * CRTC. If they don't match, we have to disable the output and the CRTC * since the driver will have to re-route things. */ @@ -3164,7 +3164,7 @@ xf86OutputSetTileProperty(xf86OutputPtr output) #endif -/* Pull out a phyiscal size from a detailed timing if available. */ +/* Pull out a physical size from a detailed timing if available. */ struct det_phySize_parameter { xf86OutputPtr output; ddc_quirk_t quirks; diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index bf3e808bc..fcba5c902 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -1066,7 +1066,7 @@ extern _X_EXPORT Bool xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags); /** - * Superseeded by xf86CursorResetCursor, which is getting called + * Superseded by xf86CursorResetCursor, which is getting called * automatically when necessary. */ static _X_INLINE _X_DEPRECATED void xf86_reload_cursors(ScreenPtr screen) {} diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index 96249ac3a..1ac573867 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -573,7 +573,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing, * Refuse to create modes that are insufficiently large. 64 is a random * number, maybe the spec says something about what the minimum is. In * particular I see this frequently with _old_ EDID, 1.0 or so, so maybe - * our parser is just being too aggresive there. + * our parser is just being too aggressive there. */ if (timing->h_active < 64 || timing->v_active < 64) { xf86DrvMsg(scrnIndex, X_INFO, @@ -589,7 +589,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing, return NULL; } - /* We only do seperate sync currently */ + /* We only do separate sync currently */ if (timing->sync != 0x03) { xf86DrvMsg(scrnIndex, X_INFO, "%s: %dx%d Warning: We only handle separate" diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index adec7bd3c..0bef53714 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -550,7 +550,7 @@ xf86RandR12SetMode(ScreenPtr pScreen, } /* * We know that if the driver failed to SwitchMode to the rotated - * version, then it should revert back to it's prior mode. + * version, then it should revert back to its prior mode. */ if (!xf86SwitchMode(pScreen, mode)) { ret = FALSE; diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 6fdf6d4e6..46536f81d 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -102,9 +102,9 @@ static char *supported_drivers[] = { }; /* - * Functions to probe for the existance of a supported console driver. + * Functions to probe for the existence of a supported console driver. * Any function returns either a valid file descriptor (driver probed - * succesfully), -1 (driver not found), or uses FatalError() if the + * successfully), -1 (driver not found), or uses FatalError() if the * driver was found but proved to not support the required mode to run * an X server. */ @@ -131,7 +131,7 @@ static int xf86OpenWScons(void); * The sequence of the driver probes is important; start with the * driver that is best distinguishable, and end with the most generic * driver. (Otherwise, pcvt would also probe as syscons, and either - * pcvt or syscons might succesfully probe as pccons.) + * pcvt or syscons might successfully probe as pccons.) */ static xf86ConsOpen_t xf86ConsTab[] = { #ifdef PCVT_SUPPORT diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index bacd4aa0d..49d5627f1 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -1,5 +1,5 @@ /* - * Memory range attribute operations, peformed on /dev/mem + * Memory range attribute operations, performed on /dev/mem */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 247bec708..ccf9d89d7 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -68,7 +68,7 @@ #endif #ifdef MAXDEVICES -/* MAXDEVICES represents the maximimum number of input devices usable +/* MAXDEVICES represents the maximum number of input devices usable * at the same time plus one entry for DRM support. */ #define MAX_FUNCS (MAXDEVICES + 1) diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c index dbdc4b677..368f21eef 100644 --- a/hw/xfree86/os-support/solaris/sun_apm.c +++ b/hw/xfree86/os-support/solaris/sun_apm.c @@ -127,7 +127,7 @@ sunToXF86(int type) } /* - * APM events can be requested direclty from /dev/apm + * APM events can be requested directly from /dev/apm */ static int sunPMGetEventFromOS(int fd, pmEvent * events, int num) diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index c6a201aea..05a7cd820 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -68,9 +68,9 @@ #define _XF86_OSPROC_H /* - * The actual prototypes have been pulled into this seperate file so + * The actual prototypes have been pulled into this separate file so * that they can can be used without pulling in all of the OS specific - * stuff like sys/stat.h, etc. This casues problem for loadable modules. + * stuff like sys/stat.h, etc. that causes problems for loadable modules. */ /* diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h index e5fa6cec2..0a8e4feee 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -124,10 +124,10 @@ else\ /* * These are defines for error messages to promote consistency. - * error messages are preceded by the line number, section and file name, + * Error messages are preceded by the line number, section and file name, * so these messages should be about the specific keyword and syntax in error. - * To help limit namespace polution, end each with _MSG. - * limit messages to 70 characters if possible. + * To help limit namespace pollution, end each with _MSG. + * Limit messages to 70 characters if possible. */ #define BAD_OPTION_MSG \ diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 122e96730..6e96ba053 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -139,7 +139,7 @@ xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr) int status; void (*csig) (int); - /* Need to fork to change ruid without loosing euid */ + /* Need to fork to change ruid without losing euid */ csig = OsSignal(SIGCHLD, SIG_DFL); switch ((pid = fork())) { case -1: diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES index 726e2edc1..3be79a1e2 100644 --- a/hw/xfree86/ramdac/CURSOR.NOTES +++ b/hw/xfree86/ramdac/CURSOR.NOTES @@ -9,9 +9,9 @@ cursor management is separate from the rest of the module. All relevant prototypes and defines are in xf86Cursor.h. - To initialize the cursor, the driver should allocate an -xf86CursorInfoRec via xf86CreateCursorInfoRec(), fill it out as described -later in this document and pass it to xf86InitCursor(). xf86InitCursor() + To initialize the cursor, the driver should allocate an +xf86CursorInfoRec via xf86CreateCursorInfoRec(), fill it out as described +later in this document and pass it to xf86InitCursor(). xf86InitCursor() must be called _after_ the software cursor initialization (usually miDCInitialize). @@ -21,7 +21,7 @@ structure in its CloseScreen function via xf86DestroyCursorInfoRec(). 2) FILLING OUT THE xf86CursorInfoRec - The driver informs the ramdac module of it's hardware cursor capablities by + The driver informs the ramdac module of its hardware cursor capabilities by filling out an xf86CursorInfoRec structure and passing it to xf86InitCursor(). The xf86CursorInfoRec contains the following function pointers: @@ -46,10 +46,10 @@ void SetCursorPosition(ScrnInfoPtr pScrn, int x, int y) void SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) Set the cursor foreground and background colors. In 8bpp, fg and - bg are indicies into the current colormap unless the + bg are indices into the current colormap unless the HARDWARE_CURSOR_TRUECOLOR_AT_8BPP flag is set. In that case and in all other bpps the fg and bg are in 8-8-8 RGB format. - + void LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits) LoadCursorImage is how the hardware cursor bits computed by the @@ -59,14 +59,14 @@ void LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits) /**** These functions are optional ****/ - -unsigned char* RealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs) + +unsigned char* RealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs) If RealizeCursor is not provided by the driver, one will be provided for you based on the Flags field described below. The driver must provide this function if the hardware cursor format is not one of the common ones supported by this module. - + Bool UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) @@ -122,7 +122,7 @@ Flags /* Cursor data packing flags */ Hardware cursor data consists of two pieces, a source and a mask. - The mask is a bitmap indicating which parts of the cursor are + The mask is a bitmap indicating which parts of the cursor are transparent and which parts are drawn. The source is a bitmap indicating which parts of the non-transparent portion of the the cursor should be painted in the foreground color and which should @@ -142,8 +142,8 @@ Flags HARDWARE_CURSOR_AND_SOURCE_WITH_MASK - This flag will have the module logical AND the source with the mask to make - sure there are no source bits set if the corresponding mask bits + This flag will have the module logical AND the source with the mask to make + sure there are no source bits set if the corresponding mask bits aren't set. Some hardware will not care if source bits are set where there are supposed to be transparent areas, but some hardware will interpret this as a third cursor color or similar. That type of @@ -170,21 +170,21 @@ Flags until the entire pattern is stored. The following flags describe the bit interleave. - HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED + HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED This one is the default. - + The following are for interleaved cursors. - - HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 - HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 - HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 - HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 - HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 + + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 And once again, if your hardware requires something different than these packing styles, your driver can supply its own RealizeCursor - function. + function. diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c index 9413c20fa..8e5bc1aeb 100644 --- a/hw/xfree86/utils/cvt/cvt.c +++ b/hw/xfree86/utils/cvt/cvt.c @@ -67,7 +67,7 @@ XNFcallocarray(size_t nmemb, size_t size) } /* - * Quickly check wether this is a CVT standard mode. + * Quickly check whether this is a CVT standard mode. */ static Bool CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, @@ -108,7 +108,7 @@ PrintUsage(char *Name) fprintf(stderr, "usage: %s [-v|--verbose] [-r|--reduced] X Y [refresh]\n", Name); fprintf(stderr, "\n"); - fprintf(stderr, " -v|--verbose : Warn about CVT standard adherance.\n"); + fprintf(stderr, " -v|--verbose : Warn about CVT standard adherence.\n"); fprintf(stderr, " -r|--reduced : Create a mode with reduced blanking " "(default: normal blanking).\n"); fprintf(stderr, " X : Desired horizontal resolution " diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index ebecfa8a9..f6888009c 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -591,12 +591,12 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on) } else { /* - * Reenable sequencer, then turn on screen. + * Re-enable sequencer, then turn on screen. */ tmp = hwp->readSeq(hwp, 0x01); - hwp->writeSeq(hwp, 0x01, tmp & ~0x20); /* reenable display */ + hwp->writeSeq(hwp, 0x01, tmp & ~0x20); /* re-enable display */ vgaHWSeqReset(hwp, FALSE); /* clear synchronousreset */ hwp->disablePalette(hwp); @@ -1946,7 +1946,7 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) hwp->writeCrtc(hwp, 0x09, (save->cr09 & 0xDF)); save->cr07 = hwp->readCrtc(hwp, 0x07); hwp->writeCrtc(hwp, 0x07, (save->cr07 & 0x10)); - /* vsync polarity negativ & ensure a 25MHz clock */ + /* vsync polarity negative & ensure a 25MHz clock */ save->msr = hwp->readMiscOut(hwp); hwp->writeMiscOut(hwp, ((save->msr & 0xF3) | 0x80)); break; diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index b979b85a6..0fa80da45 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -83,7 +83,7 @@ typedef struct { unsigned char *CRTC; /* Crtc Controller */ unsigned char *Sequencer; /* Video Sequencer */ unsigned char *Graphics; /* Video Graphics */ - unsigned char *Attribute; /* Video Atribute */ + unsigned char *Attribute; /* Video Attribute */ unsigned char DAC[768]; /* Internal Colorlookuptable */ unsigned char numCRTC; /* number of CRTC registers, def=VGA_NUM_CRTC */ unsigned char numSequencer; /* number of seq registers, def=VGA_NUM_SEQ */ diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c index 08a07b1bb..261d67b21 100644 --- a/hw/xfree86/x86emu/decode.c +++ b/hw/xfree86/x86emu/decode.c @@ -269,7 +269,7 @@ cpu-state-varible M.x86.mode. There are several potential states: gs segment override ss segment override - ds/ss select (in absense of override) + ds/ss select (in absence of override) Each of the above 7 items are handled with a bit in the mode field. ****************************************************************************/ diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c index 210f8ce64..8846db0ca 100644 --- a/hw/xfree86/x86emu/ops.c +++ b/hw/xfree86/x86emu/ops.c @@ -39,7 +39,7 @@ * to the 256 byte-"opcodes" found on the 8086. The table which * dispatches this is found in the files optab.[ch]. * -* Each opcode proc has a comment preceeding it which gives it's table +* Each opcode proc has a comment preceding it which gives its table * address. Several opcodes are missing (undefined) in the table. * * Each proc includes information for decoding (DECODE_PRINTF and @@ -7590,8 +7590,8 @@ x86emuOp_lahf(u8 X86EMU_UNUSED(op1)) DECODE_PRINTF("LAHF\n"); TRACE_AND_STEP(); M.x86.R_AH = (u8) (M.x86.R_FLG & 0xff); - /*undocumented TC++ behavior??? Nope. It's documented, but - you have too look real hard to notice it. */ + /* Undocumented TC++ behavior??? Nope. It's documented, but + you have to look real hard to notice it. */ M.x86.R_AH |= 0x2; DECODE_CLEAR_SEGOVR(); END_OF_INSTR(); @@ -7711,7 +7711,7 @@ x86emuOp_movs_byte(u8 X86EMU_UNUSED(op1)) TRACE_AND_STEP(); count = 1; if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* move them until CX is ZERO. */ count = M.x86.R_CX; M.x86.R_CX = 0; @@ -7756,7 +7756,7 @@ x86emuOp_movs_word(u8 X86EMU_UNUSED(op1)) TRACE_AND_STEP(); count = 1; if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* move them until CX is ZERO. */ count = M.x86.R_CX; M.x86.R_CX = 0; @@ -7991,7 +7991,7 @@ x86emuOp_stos_byte(u8 X86EMU_UNUSED(op1)) inc = 1; TRACE_AND_STEP(); if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* move them until CX is ZERO. */ while (M.x86.R_CX != 0) { store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL); @@ -8036,7 +8036,7 @@ x86emuOp_stos_word(u8 X86EMU_UNUSED(op1)) TRACE_AND_STEP(); count = 1; if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* move them until CX is ZERO. */ count = M.x86.R_CX; M.x86.R_CX = 0; @@ -8072,7 +8072,7 @@ x86emuOp_lods_byte(u8 X86EMU_UNUSED(op1)) else inc = 1; if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* move them until CX is ZERO. */ while (M.x86.R_CX != 0) { M.x86.R_AL = fetch_data_byte(M.x86.R_SI); @@ -8117,7 +8117,7 @@ x86emuOp_lods_word(u8 X86EMU_UNUSED(op1)) TRACE_AND_STEP(); count = 1; if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* move them until CX is ZERO. */ count = M.x86.R_CX; M.x86.R_CX = 0; diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c index 5604c7e81..35ef94710 100644 --- a/hw/xfree86/x86emu/prim_ops.c +++ b/hw/xfree86/x86emu/prim_ops.c @@ -68,7 +68,7 @@ * * By inspection, one gets: cc = ab + r'(a + b) * -* That represents alot of operations, but NO CHOICE.... +* That represents a lot of operations, but NO CHOICE.... * * Borrow Chain Calculation. * @@ -2050,7 +2050,7 @@ test_byte(u8 d, u8 s) CONDITIONAL_SET_FLAG(res & 0x80, F_SF); CONDITIONAL_SET_FLAG(res == 0, F_ZF); CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF); - /* AF == dont care */ + /* AF == don't care */ CLEAR_FLAG(F_CF); } @@ -2069,7 +2069,7 @@ test_word(u16 d, u16 s) CONDITIONAL_SET_FLAG(res & 0x8000, F_SF); CONDITIONAL_SET_FLAG(res == 0, F_ZF); CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF); - /* AF == dont care */ + /* AF == don't care */ CLEAR_FLAG(F_CF); } @@ -2088,7 +2088,7 @@ test_long(u32 d, u32 s) CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF); CONDITIONAL_SET_FLAG(res == 0, F_ZF); CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF); - /* AF == dont care */ + /* AF == don't care */ CLEAR_FLAG(F_CF); } @@ -2597,7 +2597,7 @@ ins(int size) inc = -size; } if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* in until CX is ZERO. */ u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ? M.x86.R_ECX : M.x86.R_CX); @@ -2663,7 +2663,7 @@ outs(int size) inc = -size; } if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) { - /* dont care whether REPE or REPNE */ + /* don't care whether REPE or REPNE */ /* out until CX is ZERO. */ u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ? M.x86.R_ECX : M.x86.R_CX); @@ -2818,7 +2818,7 @@ cpuid(void) switch (feature) { case 0: /* Regardless if we have real data from the hardware, the emulator - * will only support upto feature 1, which we set in register EAX. + * will only support up to feature 1, which we set in register EAX. * Registers EBX:EDX:ECX contain a string identifying the CPU. */ M.x86.R_EAX = 1; diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c index c9d463f3b..6a648bf39 100644 --- a/hw/xfree86/x86emu/sys.c +++ b/hw/xfree86/x86emu/sys.c @@ -529,7 +529,7 @@ PARAMETERS: int - New software interrupt to prepare for REMARKS: -This function is used to set up the emulator state to exceute a software +This function is used to set up the emulator state to execute a software interrupt. This can be used by the user application code to allow an interrupt to be hooked, examined and then reflected back to the emulator so that the code in the emulator will continue processing the software diff --git a/hw/xfree86/x86emu/x86emu/debug.h b/hw/xfree86/x86emu/x86emu/debug.h index 1f04b7b65..8660ebcb6 100644 --- a/hw/xfree86/x86emu/x86emu/debug.h +++ b/hw/xfree86/x86emu/x86emu/debug.h @@ -107,8 +107,8 @@ x86emu_decode_printf(x,y) /* - * The following allow us to look at the bytes of an instruction. The - * first INCR_INSTRN_LEN, is called everytime bytes are consumed in + * The following allows us to look at the bytes of an instruction. The + * first INCR_INSTRN_LEN, is called every time bytes are consumed in * the decoding process. The SAVE_IP_CS is called initially when the * major opcode of the instruction is accessed. */ diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h index 3c9469f52..edf9be324 100644 --- a/hw/xfree86/x86emu/x86emu/regs.h +++ b/hw/xfree86/x86emu/x86emu/regs.h @@ -58,7 +58,7 @@ * EAX & 0xff === AL * EAX & 0xffff == AX * - * etc. The result is that alot of the calculations can then be + * etc. The result is that a lot of the calculations can then be * done using the native instruction set fully. */ diff --git a/hw/xfree86/x86emu/x86emu/x86emui.h b/hw/xfree86/x86emu/x86emu/x86emui.h index 01bd92a6f..aa2074a87 100644 --- a/hw/xfree86/x86emu/x86emu/x86emui.h +++ b/hw/xfree86/x86emu/x86emu/x86emui.h @@ -33,8 +33,8 @@ * Developer: Kendall Bennett * * Description: Header file for system specific functions. These functions -* are always compiled and linked in the OS depedent libraries, -* and never in a binary portable driver. +* are always compiled and linked in the OS dependent libraries, +* and never in a binary portable driver. * ****************************************************************************/ diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp index 8352dcad2..4cf677f36 100644 --- a/hw/xfree86/xorgconf.cpp +++ b/hw/xfree86/xorgconf.cpp @@ -142,7 +142,7 @@ Section "InputDevice" Option "AutoRepeat" "500 5" -# Specifiy which keyboard LEDs can be user-controlled (eg, with xset(1)). +# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)). # Option "Xleds" "1 2 3" diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 21faf2e3a..f54dbd608 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -188,5 +188,5 @@ ddxUseMsg(void) ErrorF("-bw int window border width\n"); ErrorF("-name string window name\n"); ErrorF("-scrns int number of screens to generate\n"); - ErrorF("-install instal colormaps directly\n"); + ErrorF("-install install colormaps directly\n"); } diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index e90a6168f..27ea30a83 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -32,7 +32,7 @@ is" without express or implied warranty. #include "Handlers.h" void -xnestBlockHandler(void *blockData, void *timout) +xnestBlockHandler(void *blockData, void *timeout) { xnestCollectExposures(); XFlush(xnestDisplay); diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index c7af77e9b..46f257c83 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -238,8 +238,7 @@ xnestUpdateModifierState(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]; @@ -257,8 +256,7 @@ xnestUpdateModifierState(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) { diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 8d9c67205..d6f44a25a 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -339,7 +339,7 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask) xnestSetInstalledColormapWindows(pWin->drawable.pScreen); } - if (mask & CWCursor) /* this is handeled in cursor code */ + if (mask & CWCursor) /* this is handled in cursor code */ mask &= ~CWCursor; if (mask) diff --git a/hw/xnest/man/Xnest.man b/hw/xnest/man/Xnest.man index e287b8e9c..1057e2d72 100644 --- a/hw/xnest/man/Xnest.man +++ b/hw/xnest/man/Xnest.man @@ -150,7 +150,7 @@ This option specifies the geometry parameters for the top-level window. See \(lqGEOMETRY SPECIFICATIONS\(rq in .BR X (@miscmansuffix@) -for a discusson of this option's syntax. +for a discussion of this option's syntax. This window corresponds to the root window of the nested server. The width .I W diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c index 5573629fd..1744f1203 100644 --- a/hw/xquartz/GL/capabilities.c +++ b/hw/xquartz/GL/capabilities.c @@ -369,7 +369,7 @@ handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes) assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS); } -/* Return non-zero if an error occured. */ +/* Return non-zero if an error occurred. */ static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, struct glCapabilitiesConfig *c) @@ -521,7 +521,7 @@ freeGlCapabilities(struct glCapabilities *cap) cap->configurations = NULL; } -/*Return true if an error occured. */ +/* Return true if an error occurred. */ bool getGlCapabilities(struct glCapabilities *cap) { @@ -566,6 +566,6 @@ getGlCapabilities(struct glCapabilities *cap) CGLDestroyRendererInfo(info); - /* No error occured. We are done. */ + /* No error occurred. We are done. */ return kCGLNoError; } diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c index 17e7a5874..64a1ac7c4 100644 --- a/hw/xquartz/GL/glcontextmodes.c +++ b/hw/xquartz/GL/glcontextmodes.c @@ -114,7 +114,7 @@ _gl_convert_to_x_visual_type(int visualType) /** * Copy a GLX visual config structure to a GL context mode structure. All * of the fields in \c config are copied to \c mode. Additional fields in - * \c mode that can be derrived from the fields of \c config (i.e., + * \c mode that can be derived from the fields of \c config (i.e., * \c haveDepthBuffer) are also filled in. The remaining fields in \c mode * that cannot be derived are set to default values. * @@ -408,10 +408,10 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute, * \param count Number of structures to allocate. * \param minimum_size Minimum size of a structure to allocate. This allows * for differences in the version of the - * \c __GLcontextModes stucture used in libGL and in a + * \c __GLcontextModes structure used in libGL and in a * DRI-based driver. * \returns A pointer to the first element in a linked list of \c count - * stuctures on success, or \c NULL on failure. + * structures on success, or \c NULL on failure. * * \warning Use of \c minimum_size does \b not guarantee binary compatibility. * The fundamental assumption is that if the \c minimum_size @@ -469,7 +469,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size) * Destroy a linked list of \c __GLcontextModes structures created by * \c _gl_context_modes_create. * - * \param modes Linked list of structures to be destroyed. All structres + * \param modes Linked list of structures to be destroyed. All structures * in the list will be freed. */ void diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h index 1e6027006..c8b501831 100644 --- a/hw/xquartz/X11Controller.h +++ b/hw/xquartz/X11Controller.h @@ -88,7 +88,7 @@ typedef unsigned int NSUInteger; IBOutlet NSMenuItem *window_separator; // window_separator is DEPRECATED due to this radar: // NSApplication releases the separator in the Windows menu even though it's an IBOutlet - // It is kept around for localization compatability and is subject to removal "eventually" + // It is kept around for localization compatibility and is subject to removal "eventually" // If it is !NULL (meaning it is in the nib), it is removed from the menu and released IBOutlet NSMenuItem *x11_about_item; @@ -96,7 +96,7 @@ typedef unsigned int NSUInteger; IBOutlet NSMenuItem *apps_separator; IBOutlet NSMenuItem *toggle_fullscreen_item; #ifdef XQUARTZ_SPARKLE - NSMenuItem *check_for_updates_item; // Programatically enabled + NSMenuItem *check_for_updates_item; // Programmatically enabled #endif IBOutlet NSMenuItem *copy_menu_item; IBOutlet NSMenu *dock_apps_menu; diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 7bfbb767e..e34994673 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -731,7 +731,7 @@ ddxProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-fakemouse2")) { if (i == argc - 1) { - FatalError("-fakemouse2 must be followed by a modifer list\n"); + FatalError("-fakemouse2 must be followed by a modifier list\n"); } if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], "")) darwinFakeMouse2Mask = 0; @@ -744,7 +744,7 @@ ddxProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-fakemouse3")) { if (i == argc - 1) { - FatalError("-fakemouse3 must be followed by a modifer list\n"); + FatalError("-fakemouse3 must be followed by a modifier list\n"); } if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], "")) darwinFakeMouse3Mask = 0; diff --git a/hw/xquartz/mach-startup/.gitignore b/hw/xquartz/mach-startup/.gitignore index 374abbfbe..f6a06c550 100644 --- a/hw/xquartz/mach-startup/.gitignore +++ b/hw/xquartz/mach-startup/.gitignore @@ -1,4 +1,4 @@ -# Add & Override for this directory and it's subdirectories +# Add & Override for this directory and its subdirectories mach_startup.h mach_startupServer.c mach_startupServer.h diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m index f4f4de88e..b89a5760e 100644 --- a/hw/xquartz/pbproxy/x-selection.m +++ b/hw/xquartz/pbproxy/x-selection.m @@ -787,7 +787,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, [self send_reply:&reply]; } -/* Return nil if an error occured. */ +/* Return nil if an error occurred. */ /* DO NOT retain the encdata for longer than the length of an event response. * The autorelease pool will reuse/free it. */ @@ -818,8 +818,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, return encdata; } -/* Return YES when an error has occured when trying to send the PICT. */ -/* The caller should send a default reponse with a property of None when an error occurs. */ +/* Return YES when an error has occurred when trying to send the PICT. */ +/* The caller should send a default response with a property of None when an error occurs. */ - (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb type:(NSBitmapImageFileType)imagetype @@ -866,7 +866,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, return NO; /*no error*/ } -/* Return YES if an error occured. */ +/* Return YES if an error occurred. */ /* The caller should send a reply with a property of None when an error occurs. */ - (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb @@ -1049,7 +1049,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True, &type)) { /* - * An error occured, so we should invoke the copy_completed:, but + * An error occurred, so we should invoke the copy_completed:, but * not handle_selection:type:propdata: */ [self copy_completed:e->selection]; diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 30f2218b6..74ea86b5c 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -470,7 +470,7 @@ xprSetupScreen(int index, ScreenPtr pScreen) /* * xprUpdateScreen - * Update screen after configuation change. + * Update screen after configuration change. */ static void xprUpdateScreen(ScreenPtr pScreen) diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c index aa5267a4d..a344c2993 100644 --- a/hw/xwayland/xwayland-glamor-eglstream.c +++ b/hw/xwayland/xwayland-glamor-eglstream.c @@ -84,7 +84,7 @@ struct xwl_pixmap { struct wl_buffer *buffer; struct xwl_screen *xwl_screen; - /* The stream and associated resources have their own lifetime seperate + /* The stream and associated resources have their own lifetime separate * from the pixmap's */ int refcount; @@ -365,7 +365,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap) * - X window receives resize event, causing us to create a new pixmap and * begin creating the corresponding eglstream. This pixmap is known as * pixmap A. - * - X window receives another resize event, and again changes it's current + * - X window receives another resize event, and again changes its current * pixmap causing us to create another corresponding eglstream for the same * window. This pixmap is known as pixmap B. * - Start handling events from the wayland compositor. @@ -375,7 +375,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap) * callback in the original order the pixmaps were created. This means the * following would happen: * - * - Receive pixmap A's stream callback, attach it's stream to the surface of + * - Receive pixmap A's stream callback, attach its stream to the surface of * the window that just orphaned it. * - Receive pixmap B's stream callback, fall over and fail because the * window's surface now incorrectly has pixmap A's stream attached to it. @@ -386,7 +386,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap) * * - Begin processing X events... * - A window is resized, causing us to add an eglstream (known as eglstream - * A) waiting for it's consumer to finish attachment to be added to the + * A) waiting for its consumer to finish attachment to be added to the * queue. * - Resize on same window happens. We invalidate the previously pending * stream and add another one to the pending queue (known as eglstream B). diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index f7ba91051..d31e0ea4e 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -435,7 +435,7 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer, if (BitIsOn(dev->button->down, i)) QueuePointerEvents(dev, ButtonRelease, i, 0, &mask); - /* The last cursor frame we commited before the pointer left one + /* The last cursor frame we committed before the pointer left one * of our surfaces might not have been shown. In that case we'll * have a cursor surface frame callback pending which we need to * clear so that we can continue submitting new cursor frames. */ diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c index 84d58874a..00f2600a7 100644 --- a/hw/xwayland/xwayland-shm.c +++ b/hw/xwayland/xwayland-shm.c @@ -111,7 +111,7 @@ create_tmpfile_cloexec(char *tmpname) * * If the C library implements posix_fallocate(), it is used to * guarantee that disk space is available for the file at the - * given size. If disk space is insufficent, errno is set to ENOSPC. + * given size. If disk space is insufficient, errno is set to ENOSPC. * If posix_fallocate() is not supported, program may receive * SIGBUS on accessing mmap()'ed file contents instead. */ diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 9f4a2f807..c9390fd18 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -139,7 +139,7 @@ void XwinExtensionInit(void) #if defined(DDXBEFORERESET) /* * Called right before KillAllClients when the server is going to reset, - * allows us to shutdown our seperate threads cleanly. + * allows us to shutdown our separate threads cleanly. */ void diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index 4c9af772e..720fa5a9c 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -344,7 +344,7 @@ extern "C" { #define DDSCAPS2_RESERVED2 0x00000040 /* indicates surface will never be locked again */ #define DDSCAPS2_OPAQUE 0x00000080 -/* set at CreateSurface() time to indicate antialising will be used */ +/* set at CreateSurface() time to indicate antialiasing will be used */ #define DDSCAPS2_HINTANTIALIASING 0x00000100 /* set at CreateSurface() time to indicate cubic environment map */ #define DDSCAPS2_CUBEMAP 0x00000200 @@ -383,9 +383,9 @@ extern "C" { typedef struct _DDCAPS_DX7 { /* DirectX 7 version of caps struct */ DWORD dwSize; /* size of the DDDRIVERCAPS structure */ DWORD dwCaps; /* driver specific capabilities */ - DWORD dwCaps2; /* more driver specific capabilites */ + DWORD dwCaps2; /* more driver specific capabilities */ DWORD dwCKeyCaps; /* color key capabilities of the surface */ - DWORD dwFXCaps; /* driver specific stretching and effects capabilites */ + DWORD dwFXCaps; /* driver specific stretching and effects capabilities */ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */ DWORD dwPalCaps; /* palette capabilities */ DWORD dwSVCaps; /* stereo vision capabilities */ @@ -407,7 +407,7 @@ extern "C" { DWORD dwAlignSizeDest; /* dest rectangle byte size */ DWORD dwAlignStrideAlign; /* stride alignment */ DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */ - DDSCAPS ddsOldCaps; /* old DDSCAPS - superceded for DirectX6+ */ + DDSCAPS ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */ DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */ DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */ DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */ @@ -443,9 +443,9 @@ extern "C" { typedef struct _DDCAPS_DX6 { /* DirectX 6 version of caps struct */ DWORD dwSize; /* size of the DDDRIVERCAPS structure */ DWORD dwCaps; /* driver specific capabilities */ - DWORD dwCaps2; /* more driver specific capabilites */ + DWORD dwCaps2; /* more driver specific capabilities */ DWORD dwCKeyCaps; /* color key capabilities of the surface */ - DWORD dwFXCaps; /* driver specific stretching and effects capabilites */ + DWORD dwFXCaps; /* driver specific stretching and effects capabilities */ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */ DWORD dwPalCaps; /* palette capabilities */ DWORD dwSVCaps; /* stereo vision capabilities */ @@ -467,7 +467,7 @@ extern "C" { DWORD dwAlignSizeDest; /* dest rectangle byte size */ DWORD dwAlignStrideAlign; /* stride alignment */ DWORD dwRops[DD_ROP_SPACE]; /* ROPS supported */ - DDSCAPS ddsOldCaps; /* old DDSCAPS - superceded for DirectX6+ */ + DDSCAPS ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */ DWORD dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */ DWORD dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */ DWORD dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */ @@ -504,9 +504,9 @@ extern "C" { typedef struct _DDCAPS_DX5 { /* DirectX5 version of caps struct */ DWORD dwSize; /* size of the DDDRIVERCAPS structure */ DWORD dwCaps; /* driver specific capabilities */ - DWORD dwCaps2; /* more driver specific capabilites */ + DWORD dwCaps2; /* more driver specific capabilities */ DWORD dwCKeyCaps; /* color key capabilities of the surface */ - DWORD dwFXCaps; /* driver specific stretching and effects capabilites */ + DWORD dwFXCaps; /* driver specific stretching and effects capabilities */ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */ DWORD dwPalCaps; /* palette capabilities */ DWORD dwSVCaps; /* stereo vision capabilities */ @@ -564,9 +564,9 @@ extern "C" { typedef struct _DDCAPS_DX3 { /* DirectX3 version of caps struct */ DWORD dwSize; /* size of the DDDRIVERCAPS structure */ DWORD dwCaps; /* driver specific capabilities */ - DWORD dwCaps2; /* more driver specific capabilites */ + DWORD dwCaps2; /* more driver specific capabilities */ DWORD dwCKeyCaps; /* color key capabilities of the surface */ - DWORD dwFXCaps; /* driver specific stretching and effects capabilites */ + DWORD dwFXCaps; /* driver specific stretching and effects capabilities */ DWORD dwFXAlphaCaps; /* alpha driver specific capabilities */ DWORD dwPalCaps; /* palette capabilities */ DWORD dwSVCaps; /* stereo vision capabilities */ @@ -827,7 +827,7 @@ extern "C" { /* DDCAPS.dwSVCaps */ /* the first 4 of these are now obsolete */ -#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occured */ +#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occurred */ #define DDSVCAPS_RESERVED1 0x00000001 #define DDSVCAPS_RESERVED2 0x00000002 #define DDSVCAPS_RESERVED3 0x00000004 diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index 59ee17fb1..ff015f763 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -763,7 +763,7 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) Discard any CopyWindow requests if a GL drawing context is pointing at the window For regions which are being drawn by GL, the shadow framebuffer doesn't have the - correct bits, so we wish to avoid shadow framebuffer damage occuring, which will + correct bits, so we wish to avoid shadow framebuffer damage occurring, which will cause those incorrect bits to be transferred to the display.... */ if (pGlxDraw && pGlxDraw->drawContext) { @@ -1110,7 +1110,7 @@ glxWinReleaseTexImage(__GLXcontext * baseContext, * * WGL contexts are created for a specific HDC, so we cannot create the WGL * context in glxWinCreateContext(), we must defer creation until the context - * is actually used on a specifc drawable which is connected to a native window, + * is actually used on a specific drawable which is connected to a native window, * pbuffer or DIB * * The WGL context may be used on other, compatible HDCs, so we don't need to @@ -1915,7 +1915,7 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen) continue; } else { - // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated... + // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD accelerated... c->base.visualRating = GLX_NONE_EXT; } diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man index 296ce4c9f..8d4af41db 100644 --- a/hw/xwin/man/XWin.man +++ b/hw/xwin/man/XWin.man @@ -66,7 +66,7 @@ Screen specific parameters can be applied as a default to all screens by placing those screen specific parameters before any \fB\-screen\fP parameter. Screen specific parameters placed after the first \fB\-screen\fP parameter will apply only to the immediately -preceeding \fB\-screen\fP parameter. +preceding \fB\-screen\fP parameter. .TP 8 .B \-[no]multimonitors or \-[no]multiplemonitors Create a screen 0 that covers all monitors [the primary monitor] on a system with @@ -79,7 +79,7 @@ This option is currently enabled by default in \fB\-multiwindow\fP mode. .B "\-screen \fIscreen_number\fP [\fIW\fP \fIH\fP [\fIX\fP \fIY\fP] | [[\fIW\fPx\fIH\fP[+\fIX\fP+\fIY\fP]][@\fIM\fP]] ] " Create screen number .I screen_number -and optionally specify it's +and optionally specify its .I height, .I width and diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man index bc51a7a64..3c1ed067d 100644 --- a/hw/xwin/man/XWinrc.man +++ b/hw/xwin/man/XWinrc.man @@ -141,7 +141,7 @@ filename of an .ico format file .br (e.g. "cygwin.ico", "apple.ico", "C:\\icons\\cheese.ico", "/usr/share/icons/moon.ico") .IP \fI"NAME.DLL,nnn"\fP 16 -filename of a DLL with an index into it's ICON resources +filename of a DLL with an index into its ICON resources .br (e.g. "c:\\windows\\system32\\shell32.dll,4", the default folder icon, "/usr/bin/cygicons-0.dll,10", the hippo icon) diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 50554e7dd..48795a8b5 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -470,7 +470,7 @@ typedef struct _winPrivScreenRec { void *pWMInfo; Bool fRootWindowShown; - /* Privates used for any module running in a seperate thread */ + /* Privates used for any module running in a separate thread */ pthread_mutex_t pmServerStarted; Bool fServerStarted; diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index e25e6bd11..818805cb1 100644 --- a/hw/xwin/winallpriv.c +++ b/hw/xwin/winallpriv.c @@ -67,7 +67,7 @@ winAllocatePrivates(ScreenPtr pScreen) /* Initialize the memory of the private structure */ ZeroMemory(pScreenPriv, sizeof(winPrivScreenRec)); - /* Intialize private structure members */ + /* Initialize private structure members */ pScreenPriv->fActive = TRUE; /* Register our screen private */ diff --git a/hw/xwin/winclipboard/wndproc.c b/hw/xwin/winclipboard/wndproc.c index 10824a3ae..63de4b9e5 100644 --- a/hw/xwin/winclipboard/wndproc.c +++ b/hw/xwin/winclipboard/wndproc.c @@ -298,7 +298,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) /* WM_RENDERALLFORMATS is sent as we are shutting down, to render the - clipboard so it's contents remains available to other applications. + clipboard so its contents remains available to other applications. Unfortunately, this can't work without major changes. The server is already waiting for us to stop, so we can't ask for the rendering of diff --git a/hw/xwin/winclipboard/xwinclip.man b/hw/xwin/winclipboard/xwinclip.man index e3db50177..f0c2fc32b 100644 --- a/hw/xwin/winclipboard/xwinclip.man +++ b/hw/xwin/winclipboard/xwinclip.man @@ -40,7 +40,7 @@ The INCR (Incremental transfer) clipboard protocol for clipboard contents larger request (approximately 256K) is only supported for X -> Windows clipboard transfers. Some X clients, notably ones written in Tcl/Tk, do not re-assert ownership of the PRIMARY selection or update -it's timestamp when it's contents change, which currently prevents \fIxwinclip\fP from correctly noticing that +its timestamp when its contents change, which currently prevents \fIxwinclip\fP from correctly noticing that the PRIMARY selection's contents have changed. Windows clipboard rendering is synchronous in the WM_RENDER*FORMAT message (that is, we must have placed the @@ -49,7 +49,7 @@ client which owns the selection to convert the selection to our requested format using a fixed timeout. After requesting conversion of the selection, if no events are received from the X client which owns the selection for one second, the conversion is assumed to have failed. -The XWin(1) server should indicate somehow (by placing an atom on the root window?) that it is running with it's +The XWin(1) server should indicate somehow (by placing an atom on the root window?) that it is running with its internal clipboard integration enabled, and xwinclip should notice this and exit with an appropriate error. Probably many other bugs. diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c index 814899f8e..dbce0bc17 100644 --- a/hw/xwin/winclipboardinit.c +++ b/hw/xwin/winclipboardinit.c @@ -108,7 +108,7 @@ winClipboardThreadProc(void *arg) } /* - * Intialize the Clipboard module + * Initialize the Clipboard module */ Bool diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 646d69006..4f16b21e0 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -317,7 +317,7 @@ winConfigKeyboard(DeviceIntPtr pDevice) deviceIdentifier = layoutNum >> 16; for (pass = 0; pass < 2; pass++) { - /* If we didn't find an exact match for the input locale identifer, + /* If we didn't find an exact match for the input locale identifier, try to find an match on the language identifier part only */ if (pass == 1) layoutNum = (layoutNum & 0xffff); diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index a69c9c643..444e843ec 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -209,7 +209,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Did the user specify a height and width? */ if (pScreenInfo->fUserGaveHeightAndWidth) { - /* User gave a desired height and width, try to accomodate */ + /* User gave a desired height and width, try to accommodate */ #if CYGDEBUG winDebug("winCreateBoundingWindowWindowed - User gave height " "and width\n"); diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index 2afcf9fb5..3fc050bfa 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -173,7 +173,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) dBackY = BRIGHTNESS(pCursor->back); fReverse = dForeY < dBackY; - /* Check wether the X11 cursor is bigger than the win32 cursor */ + /* Check whether the X11 cursor is bigger than the win32 cursor */ if (pScreenPriv->cursor.sm_cx < pCursor->bits->width || pScreenPriv->cursor.sm_cy < pCursor->bits->height) { winErrorFVerb(3, diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h index 6159f623e..2ac1c8c97 100644 --- a/hw/xwin/winkeynames.h +++ b/hw/xwin/winkeynames.h @@ -42,7 +42,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 @@ -150,7 +150,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 diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index bbe21cba6..aad99d9ad 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -100,7 +100,7 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState) */ map = malloc(sizeof(CARD8) * (lngMouseButtons + lngWheelEvents + 1)); - /* initalize button map */ + /* initialize button map */ map[0] = 0; for (i = 1; i <= lngMouseButtons + lngWheelEvents; i++) map[i] = i; diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index f39f842db..0ef666d89 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -346,7 +346,7 @@ NetWMToWinIcon(int bpp, uint32_t * icon) osvi.dwMajorVersion = 5; osvi.dwMinorVersion = 1; - /* Windows versions later than XP have icon alpha channel suport, 2000 does not */ + /* Windows versions later than XP have icon alpha channel support, 2000 does not */ VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL); VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 4eec72be2..b3bdb6b23 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -507,7 +507,7 @@ winCreateWindowsWindow(WindowPtr pWin) make sure the window actually ends up somewhere where it will be visible To handle arrangements of monitors which form a non-rectangular virtual - desktop, check if the window will end up with it's top-left corner on any + desktop, check if the window will end up with its top-left corner on any monitor */ if (pWin->drawable.class != InputOnly) { @@ -551,7 +551,7 @@ winCreateWindowsWindow(WindowPtr pWin) /* Calculate the window coordinates containing the requested client area, - being careful to preseve CW_USEDEFAULT + being careful to preserve CW_USEDEFAULT */ rc.top = (iY != CW_USEDEFAULT) ? iY : 0; rc.left = (iX != CW_USEDEFAULT) ? iX : 0; @@ -751,7 +751,7 @@ winReorderWindowsMultiWindow(void) WindowPtr pWin = NULL; WindowPtr pWinSib = NULL; XID vlist[2]; - static Bool fRestacking = FALSE; /* Avoid recusive calls to this function */ + static Bool fRestacking = FALSE; /* Avoid recursive calls to this function */ DWORD dwCurrentProcessID = GetCurrentProcessId(); DWORD dwWindowProcessID = 0; @@ -760,7 +760,7 @@ winReorderWindowsMultiWindow(void) #endif if (fRestacking) { - /* It is a recusive call so immediately exit */ + /* It is a recursive call so immediately exit */ #if CYGWINDOWING_DEBUG ErrorF("winReorderWindowsMultiWindow - " "exit because fRestacking == TRUE\n"); diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 9801b14c9..37f1a7a02 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -698,7 +698,7 @@ UpdateStyle(WMInfoPtr pWMInfo, xcb_window_t iWindow) winApplyHints(pWMInfo, iWindow, hWnd, &zstyle); winUpdateWindowPosition(hWnd, &zstyle); - /* Apply the updated window style, without changing it's show or activation state */ + /* Apply the updated window style, without changing its show or activation state */ flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE; if (zstyle == HWND_NOTOPMOST) flags |= SWP_NOZORDER | SWP_NOOWNERZORDER; @@ -1422,7 +1422,7 @@ winInitWM(void **ppWMInfo, pArg->pWMInfo = pWMInfo; pArg->ppmServerStarted = ppmServerStarted; - /* Intialize the message queue */ + /* Initialize the message queue */ if (!InitQueue(&pWMInfo->wmMsgQueue)) { ErrorF("winInitWM - InitQueue () failed.\n"); return FALSE; @@ -1600,7 +1600,7 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg) /* Set the root window cursor to left_ptr (this controls the cursor an - application gets over it's windows when it doesn't set one) + application gets over its windows when it doesn't set one) */ { #define XC_left_ptr 68 diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index a948e4a7d..d0b2ef2e7 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -295,7 +295,7 @@ HandleCustomWM_INITMENU(HWND hwnd, HMENU hmenu) /* * Searches for the custom WM_COMMAND command ID and performs action. - * Return TRUE if command is proccessed, FALSE otherwise. + * Return TRUE if command is processed, FALSE otherwise. */ Bool HandleCustomWM_COMMAND(HWND hwnd, WORD command, winPrivScreenPtr pScreenPriv) diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 50b1f6c38..66023f335 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -442,7 +442,7 @@ ddxProcessArgument(int argc, char *argv[], int i) g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; } - /* Flag that this screen was explicity specified by the user */ + /* Flag that this screen was explicitly specified by the user */ g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE; /* diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 9c0473019..ae6bc12a6 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -40,7 +40,7 @@ /* * Determine what type of screen we are initializing - * and call the appropriate procedure to intiailize + * and call the appropriate procedure to initialize * that type of screen. */ @@ -101,7 +101,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv) else if (dwInitialBPP != pScreenInfo->dwBPP) { /* Warn user if engine forced a depth different to -depth parameter */ ErrorF - ("winScreenInit - Command line depth of %d bpp overidden by engine, using %d bpp\n", + ("winScreenInit - Command line depth of %d bpp overridden by engine, using %d bpp\n", (int) dwInitialBPP, (int) pScreenInfo->dwBPP); } else { @@ -288,7 +288,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) * own colormap, as it cannot allocate 7 planes in the default * colormap. Setting whitePixel to 1 allows Magic to get 7 * planes in the default colormap, so it doesn't create its - * own colormap. This latter situation is highly desireable, + * own colormap. This latter situation is highly desirable, * as it keeps the Magic window viewable when switching to * other X clients that use the default colormap. */ diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 65678962b..25e16bf76 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -1245,7 +1245,7 @@ winDestroyColormapShadowGDI(ColormapPtr pColormap) } /* - * Set engine specific funtions + * Set engine specific functions */ Bool diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 456213bc3..c7950880f 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -143,7 +143,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_DISPLAYCHANGE: /* WM_DISPLAYCHANGE seems to be sent when the monitor layout or - any monitor's resolution or depth changes, but it's lParam and + any monitor's resolution or depth changes, but its lParam and wParam always indicate the resolution and bpp for the primary monitor (so ignore that as we could be on any monitor...) */ @@ -151,7 +151,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) /* We cannot handle a display mode change during initialization */ if (s_pScreenInfo == NULL) FatalError("winWindowProc - WM_DISPLAYCHANGE - The display " - "mode changed while we were intializing. This is " + "mode changed while we were initializing. This is " "very bad and unexpected. Exiting.\n"); /* diff --git a/include/.gitignore b/include/.gitignore index 8cb149114..3516078d1 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,4 +1,4 @@ -# Add & Override for this directory and it's subdirectories +# Add & Override for this directory and its subdirectories *-config.h do-not-use-config.h.in xorg-server.h diff --git a/include/glxvndabi.h b/include/glxvndabi.h index 71f36e722..e210755ae 100644 --- a/include/glxvndabi.h +++ b/include/glxvndabi.h @@ -223,7 +223,7 @@ typedef struct GlxServerExportsRec { * up the old context private pointer. * * However, this function is not safe to use from a ClientStateCallback, - * because GLVND may have alraedy deleted the tag by that point. + * because GLVND may have already deleted the tag by that point. */ void * (* getContextTagPrivate)(ClientPtr client, GLXContextTag tag); diff --git a/include/pixmap.h b/include/pixmap.h index b7fb25723..f79c41549 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -130,7 +130,7 @@ extern _X_EXPORT Bool PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst); /* helper function, drivers can do this themselves if they can do it more - efficently */ + efficiently */ extern _X_EXPORT Bool PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty); diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 9b663fa44..d2c65dc47 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -486,9 +486,9 @@ typedef void (*DPMSProcPtr)(ScreenPtr pScreen, int level); Wrap(as, pScreen, UnrealizeCursor, AnimCurUnrealizeCursor); The wrapping block handler is a bit different; it does the Unwrap, - the local operations and then only re-Wraps if the hook is still - required. Unwrap occurrs at the top of each function, just after - entry, and Wrap occurrs at the bottom of each function, just + the local operations, and then only re-Wraps if the hook is still + required. Unwrap occurs at the top of each function, just after + entry, and Wrap occurs at the bottom of each function, just before returning. */ diff --git a/include/xkbstr.h b/include/xkbstr.h index 8d715577a..8a9f01c68 100644 --- a/include/xkbstr.h +++ b/include/xkbstr.h @@ -386,7 +386,7 @@ typedef struct _XkbCompatMapRec { typedef struct _XkbIndicatorMapRec { unsigned char flags; - /* FIXME: For some reason, interepretation of groups is wildly + /* FIXME: For some reason, interpretation of groups is wildly * different between which being base/latched/locked. */ unsigned char which_groups; unsigned char groups; diff --git a/mi/miarc.c b/mi/miarc.c index 71df4ab64..3936f6c27 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -96,7 +96,7 @@ cbrt(double x) #endif /* - * some interesting sematic interpretation of the protocol: + * some interesting semantic interpretation of the protocol: * * Self intersecting arcs (i.e. those spanning 360 degrees) * never join with other arcs, and are drawn without caps @@ -2370,7 +2370,7 @@ lengthToAngle(double len, dashMap * map) } /* - * compute the angle of an ellipse which cooresponds to + * compute the angle of an ellipse which corresponds to * the given path length. Note that the correct solution * to this problem is an eliptic integral, we'll punt and * approximate (it's only for dashes anyway). This diff --git a/mi/mibitblt.c b/mi/mibitblt.c index dbfc73a4f..0954b2545 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -451,7 +451,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc, ValidateGC(pDraw, pGC); /* Fill the drawable with the stipple. This will draw the - * foreground color whereever 1 bits are set, leaving everything + * foreground color wherever 1 bits are set, leaving everything * with 0 bits untouched. Note that the part outside the clip * region is all 0s. */ rect.x = dstx; diff --git a/mi/micmap.c b/mi/micmap.c index 8b7ecd27f..7003a5326 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -416,7 +416,7 @@ maskShift(Pixel p) /* * Given a list of formats for a screen, create a list - * of visuals and depths for the screen which corespond to + * of visuals and depths for the screen which correspond to * the set which can be used with this version of cfb. */ diff --git a/mi/miglblt.c b/mi/miglblt.c index 68be5b914..169d44ffc 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -94,7 +94,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyp int j; unsigned char *pbits; /* buffer for PutImage */ unsigned char *pb; /* temp pointer into buffer */ - CharInfoPtr pci; /* currect char info */ + CharInfoPtr pci; /* current char info */ unsigned char *pglyph; /* pointer bits in glyph */ int gWidth, gHeight; /* width and height of glyph */ int nbyGlyphWidth; /* bytes per scanline of glyph */ diff --git a/mi/mipointer.c b/mi/mipointer.c index 75be1aeeb..a638f25d4 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -402,7 +402,7 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) } /** - * Syncronize the sprite with the cursor. + * Synchronize the sprite with the cursor. * * @param pDev The device to sync */ @@ -699,8 +699,8 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, /** * Get the current position of the device in desktop coordinates. * - * @param x Return value for the current x coordinate in desktop coordiates. - * @param y Return value for the current y coordinate in desktop coordiates. + * @param x Return value for the current x coordinate in desktop coordinates. + * @param y Return value for the current y coordinate in desktop coordinates. */ void miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y) diff --git a/mi/mipointer.h b/mi/mipointer.h index 7ce6409b3..00f523740 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -100,7 +100,7 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y); extern _X_EXPORT void miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y); -/* Moves the cursor to the specified position. May clip the co-ordinates: +/* Moves the cursor to the specified position. May clip the coordinates: * x and y are modified in-place. */ extern _X_EXPORT ScreenPtr miPointerSetPosition(DeviceIntPtr pDev, int mode, double *x, double *y, diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 64a160b0c..3bb52b1bc 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -43,7 +43,7 @@ from The Open Group. #include "shmint.h" #endif -/* We use this structure to propogate some information from miScreenInit to +/* We use this structure to propagate some information from miScreenInit to * miCreateScreenResources. miScreenInit allocates the structure, fills it * in, and puts it into pScreen->devPrivate. miCreateScreenResources * extracts the info and frees the structure. We could've accomplished the diff --git a/mi/mizerline.c b/mi/mizerline.c index 2f22d2309..1a0ca3427 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -60,7 +60,7 @@ SOFTWARE. /* Draw lineSolid, fillStyle-independent zero width lines. * * Must keep X and Y coordinates in "ints" at least until after they're - * translated and clipped to accomodate CoordModePrevious lines with very + * translated and clipped to accommodate CoordModePrevious lines with very * large coordinates. * * Draws the same pixels regardless of sign(dx) or sign(dy). diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index 1be61cdf3..ed3b6c489 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -41,7 +41,7 @@ /* Each top-level rootless window has a one-to-one correspondence to a physical - on-screen window. The physical window is refered to as a "frame". + on-screen window. The physical window is referred to as a "frame". */ typedef void *RootlessFrameID; @@ -345,7 +345,7 @@ void RootlessStartDrawing(WindowPtr pWindow); void RootlessStopDrawing(WindowPtr pWindow, Bool flush); /* - * Alocate a new screen pixmap. + * Allocate a new screen pixmap. * miCreateScreenResources does not do this properly with a null * framebuffer pointer. */ diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index c3fa2a297..83dec3bb7 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -269,7 +269,7 @@ void RootlessFlushScreenColormaps(ScreenPtr pScreen); // Move a window to its proper location on the screen. void RootlessRepositionWindow(WindowPtr pWin); -// Move the window to it's correct place in the physical stacking order. +// Move the window to its correct place in the physical stacking order. void RootlessReorderWindow(WindowPtr pWin); void RootlessScreenExpose(ScreenPtr pScreen); diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index e3042990c..106d4320e 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -561,9 +561,9 @@ RootlessReorderWindow(WindowPtr pWin) /* 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 + * hittability to ensure offscreen windows don't get restacked * relative to onscreen ones (but that the offscreen ones maintain - * their stacking order if they are explicitly asked to Reorder + * their stacking order if they are explicitly asked to Reorder). */ newPrevW = pWin->prevSib; @@ -932,7 +932,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity, if (code == (WIDTH_SMALLER | HEIGHT_SMALLER)) { /* Since the window is getting smaller, we can do gravity - repair on it with it's current size, then resize it + repair on it with its current size, then resize it afterwards. */ resize_after = TRUE; diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 529402d6e..e8d0d51b0 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -87,7 +87,7 @@ shadowGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, shadowBuf(pScreen); - /* Many apps use GetImage to sync with the visable frame buffer */ + /* Many apps use GetImage to sync with the visible frame buffer */ if (pDrawable->type == DRAWABLE_WINDOW) shadowRedisplay(pScreen); unwrap(pBuf, pScreen, GetImage); diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h index 6f89714d6..490cf6194 100644 --- a/miext/sync/misyncstr.h +++ b/miext/sync/misyncstr.h @@ -65,7 +65,7 @@ struct _SyncTrigger { SyncObject *pSync; int64_t wait_value; /* wait value */ unsigned int value_type; /* Absolute or Relative */ - unsigned int test_type; /* transition or Comparision type */ + unsigned int test_type; /* transition or Comparison type */ int64_t test_value; /* trigger event threshold value */ Bool (*CheckTrigger)(struct _SyncTrigger *pTrigger, int64_t newval); diff --git a/os/access.c b/os/access.c index bffb3eb6b..34ebecad9 100644 --- a/os/access.c +++ b/os/access.c @@ -920,7 +920,7 @@ AddLocalHosts(void) /* Fix for XFree86 bug #156: pass addingLocal = TRUE to * NewHost to tell that we are adding the default local * host entries and not to flag the entries as being - * explicitely requested */ + * explicitly requested */ (void) NewHost(self->family, self->addr, self->len, TRUE); } diff --git a/os/backtrace.c b/os/backtrace.c index 619bf145e..9f28b8809 100644 --- a/os/backtrace.c +++ b/os/backtrace.c @@ -173,7 +173,7 @@ xorg_backtrace(void) #define ElfSym Elf32_Sym #endif -/* Called for each frame on the stack to print it's contents */ +/* Called for each frame on the stack to print its contents */ static int xorg_backtrace_frame(uintptr_t pc, int signo, void *arg) { diff --git a/os/client.c b/os/client.c index 213492d6c..89a92d5b5 100644 --- a/os/client.c +++ b/os/client.c @@ -197,7 +197,7 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs) return; path[totsize - 1] = '\0'; - /* Contruct the process name without arguments. */ + /* Construct the process name without arguments. */ if (cmdname) { *cmdname = strdup(path); } diff --git a/os/connection.c b/os/connection.c index 85e0050d8..9e8d47f6b 100644 --- a/os/connection.c +++ b/os/connection.c @@ -895,7 +895,7 @@ ListenToAllClients(void) /**************** * IgnoreClient * Removes one client from input masks. - * Must have cooresponding call to AttendClient. + * Must have corresponding call to AttendClient. ****************/ void diff --git a/os/io.c b/os/io.c index 939f51743..5b7fac349 100644 --- a/os/io.c +++ b/os/io.c @@ -323,7 +323,7 @@ ReadRequestFromClient(ClientPtr client) /* save the data we've already read */ memmove(oci->buffer, oci->bufptr, gotnow); if (needed > oci->size) { - /* make buffer bigger to accomodate request */ + /* make buffer bigger to accommodate request */ char *ibuf; ibuf = (char *) realloc(oci->buffer, needed); @@ -343,7 +343,7 @@ ReadRequestFromClient(ClientPtr client) * never get here in those circumstances. */ if (!oc->trans_conn) { - /* treat as if an error occured on the read, which is what + /* treat as if an error occurred on the read, which is what * used to happen */ YieldControlDeath(); @@ -814,7 +814,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf) /******************** * FlushClient() * If the client isn't keeping up with us, then we try to continue - * buffering the data and set the apropriate bit in ClientsWritable + * buffering the data and set the appropriate bit in ClientsWritable * (which is used by WaitFor in the select). If the connection yields * a permanent error, or we can't allocate any more space, we then * close the connection. diff --git a/present/present.h b/present/present.h index eaef02a68..9d0ecb48d 100644 --- a/present/present.h +++ b/present/present.h @@ -95,7 +95,7 @@ typedef Bool (*present_flip_ptr) (RRCrtcPtr crtc, Bool sync_flip); /* Flip pixmap for window, return false if it didn't happen. * - * Like present_flip_ptr, additionaly with: + * Like present_flip_ptr, additionally with: * * 'window' used for synchronization. * diff --git a/present/present_wnmd.c b/present/present_wnmd.c index c9108e0e2..b5a9a995e 100644 --- a/present/present_wnmd.c +++ b/present/present_wnmd.c @@ -34,7 +34,7 @@ * * A flip still requires a copy currently, since the original pixmap needs * to be updated with the new pixmap content. Just a flip of all windows - * to the new pixmap is diffcult, because the original pixmap might not be + * to the new pixmap is difficult, because the original pixmap might not be * controlled by the Xserver. * */ diff --git a/record/record.c b/record/record.c index 42aee324a..f2d38c877 100644 --- a/record/record.c +++ b/record/record.c @@ -1386,7 +1386,7 @@ RecordSanityCheckRegisterClients(RecordContextPtr pContext, ClientPtr client, typedef struct { int nintervals; /* number of intervals in following array */ RecordSetInterval *intervals; /* array of intervals for this set */ - int size; /* size of intevals array; >= nintervals */ + int size; /* size of intervals array; >= nintervals */ int align; /* alignment restriction for set */ int offset; /* where to store set pointer rel. to start of RCAP */ short first, last; /* if for extension, major opcode interval */ @@ -1579,7 +1579,7 @@ RecordRegisterClients(RecordContextPtr pContext, ClientPtr client, return BadAlloc; /* We may have to create as many as one set for each "predefined" - * protocol types, plus one per range for extension reuests, plus one per + * protocol types, plus one per range for extension requests, plus one per * range for extension replies. */ maxSets = PREDEFSETS + 2 * stuff->nRanges; diff --git a/xfixes/cursor.c b/xfixes/cursor.c index d4b68f3af..60580b88f 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -670,7 +670,7 @@ ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, void *closure) ReplaceCursorLookup, (void *) &rcl); } } - /* this "knows" that WindowHasNewCursor doesn't depend on it's argument */ + /* this "knows" that WindowHasNewCursor doesn't depend on its argument */ WindowHasNewCursor(screenInfo.screens[0]->root); } diff --git a/xkb/XKM_file_format.txt b/xkb/XKM_file_format.txt index 0ba28ee8c..2a90e4047 100644 --- a/xkb/XKM_file_format.txt +++ b/xkb/XKM_file_format.txt @@ -77,8 +77,8 @@ specific fields listed underneath value 1. 3. XKM Format The XKM format is a binary format with structs usually being padded to a -multiple of 4 bytes. No provisions for endianess are provided, the parser is -left to guess the endianess of the XKM file. +multiple of 4 bytes. No provisions for endianness are provided, the parser is +left to guess the endianness of the XKM file. ❧❧❧❧❧❧❧❧❧❧❧ 3.1 Common data types @@ -399,7 +399,7 @@ The number of keysyms present is max_keycode - min_keycode + 1. Presence of names is conditional on the XkmKeyHasTypes flag. The number of strings is equal to the number of group bits in group_names_mask in the -preceeding XKMSymbols section. +preceding XKMSymbols section. The number of elements in syms is equal to width * num_groups. Presence of behavior is conditional on the XkmKeyHasBehavior flag. diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index a8b8368a6..ea7e34700 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -451,7 +451,7 @@ XkbRMLVOtoKcCGST(DeviceIntPtr dev, XkbRMLVOSet * rmlvo, /** * Compile the given RMLVO keymap and return it. Returns the XkbDescPtr on * success or NULL on failure. If the components compiled are not a superset - * or equal to need, the compiliation is treated as failure. + * or equal to need, the compilation is treated as failure. */ static XkbDescPtr XkbCompileKeymapForDevice(DeviceIntPtr dev, XkbRMLVOSet * rmlvo, int need)