diff --git a/dix/events.c b/dix/events.c index e024e75ebf..06accc15eb 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1509,7 +1509,7 @@ CurrentOrOldMasterKeyboard(DeviceIntPtr dev) if (!kbd) return NULL; /* if dev is a pointer the saved master is a master pointer, - * we want the keybard */ + * we want the keyboard */ return GetMaster(kbd, MASTER_KEYBOARD); } diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c index b478b15cbc..f5a8089bff 100644 --- a/hw/kdrive/ephyr/ephyr_draw.c +++ b/hw/kdrive/ephyr/ephyr_draw.c @@ -302,7 +302,7 @@ ephyrDoneComposite(PixmapPtr pDst) } /** - * Does fake acceleration of DownloadFromScren using memcpy. + * Does fake acceleration of DownloadFromScreen using memcpy. */ static Bool ephyrDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO index 13477ce87d..8c98df07d5 100644 --- a/hw/xfree86/int10/INT10.HOWTO +++ b/hw/xfree86/int10/INT10.HOWTO @@ -135,7 +135,7 @@ address space. 1. xf86Int10InfoPtr xf86InitInt10(int entityIndex); This function should first find the screen assigned to the entity -carrying entitiyIndex and then call +carrying entityIndex and then call Bool int10skip(ScrnInfoPtr pScrn) diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c index 4491682865..a1bfa13a15 100644 --- a/hw/xwin/glx/indirect.c +++ b/hw/xwin/glx/indirect.c @@ -1125,7 +1125,7 @@ glxWinSetPixelFormat(HDC hdc, int bppOverride, int drawableTypeOverride, and see if we can find a suitable one... */ ErrorF - ("glxWinSetPixelFormat: having second thoughts: cColorbits %d, bppOveride %d; config->drawableType %d, drawableTypeOverride %d\n", + ("glxWinSetPixelFormat: having second thoughts: cColorbits %d, bppOverride %d; config->drawableType %d, drawableTypeOverride %d\n", (config->redBits + config->greenBits + config->blueBits), bppOverride, config->drawableType, drawableTypeOverride); diff --git a/include/scrnintstr.h b/include/scrnintstr.h index c214067c16..af96d89021 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -249,7 +249,7 @@ typedef void (*CursorWarpedToProcPtr) (DeviceIntPtr /* pDev */ , int /*x */ , int /*y */ ); -typedef void (*CurserConfinedToProcPtr) (DeviceIntPtr /* pDev */ , +typedef void (*CursorConfinedToProcPtr) (DeviceIntPtr /* pDev */ , ScreenPtr /*pScreen */ , WindowPtr /*pWindow */ ); @@ -584,7 +584,7 @@ typedef struct _Screen { RecolorCursorProcPtr RecolorCursor; SetCursorPositionProcPtr SetCursorPosition; CursorWarpedToProcPtr CursorWarpedTo; - CurserConfinedToProcPtr CursorConfinedTo; + CursorConfinedToProcPtr CursorConfinedTo; /* GC procedures */ diff --git a/include/xf86Pci.h b/include/xf86Pci.h index 88cebcf1c2..6b316162d0 100644 --- a/include/xf86Pci.h +++ b/include/xf86Pci.h @@ -156,7 +156,7 @@ #define PCI_CLASS_I2O 0x0e #define PCI_CLASS_SATELLITE 0x0f #define PCI_CLASS_CRYPT 0x10 -#define PCI_CLASS_DATA_ACQUISTION 0x11 +#define PCI_CLASS_DATA_ACQUISITION 0x11 #define PCI_CLASS_UNDEFINED 0xff /* sub class */ diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 3689fa0524..be56190604 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -622,7 +622,7 @@ AccessXFilterReleaseEvent(DeviceEvent *event, DeviceIntPtr keybd) /* Don't transmit the KeyRelease if SlowKeys is turned on and * the user didn't hold the key long enough. We know we passed - * the key if the down bit was set by CoreProcessKeyboadEvent. + * the key if the down bit was set by CoreProcessKeyboardEvent. */ if (ctrls->enabled_ctrls & XkbSlowKeysMask) { xkbAccessXNotify ev; diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 894f27eb28..b5049663ce 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -133,7 +133,7 @@ int XkbResizeKeyType(XkbDescPtr xkb, int type_ndx, int map_count, void XkbFreeComponentNames(XkbComponentNamesPtr names, Bool freeNames); void XkbSetActionKeyMods(XkbDescPtr xkb, XkbAction *act, unsigned int mods); unsigned int XkbMaskForVMask(XkbDescPtr xkb, unsigned int vmask); -Bool XkbVirtualModsToReal(XkbDescPtr xkb, unsigned int virtua_mask, +Bool XkbVirtualModsToReal(XkbDescPtr xkb, unsigned int virtual_mask, unsigned int *mask_rtrn); unsigned int XkbAdjustGroup(int group, XkbControlsPtr ctrls); KeySym *XkbResizeKeySyms(XkbDescPtr xkb, int key, int needed);