From 2cd5a160f5af4c8b593d1d86634fa10a3d96d609 Mon Sep 17 00:00:00 2001 From: Diego Viola Date: Tue, 3 Mar 2026 06:49:59 -0300 Subject: [PATCH] Fix typos Signed-off-by: Diego Viola Part-of: --- Xext/saver.c | 2 +- Xext/xf86bigfont.c | 2 +- Xext/xvmc.c | 2 +- dix/dispatch.c | 2 +- dix/pixmap.c | 2 +- dix/ptrveloc.c | 2 +- doc/Xinput.xml | 2 +- doc/Xserver-spec.xml | 4 ++-- exa/exa.c | 2 +- exa/exa.h | 2 +- glamor/glamor_gradient.c | 12 ++++++------ glamor/glamor_largepixmap.c | 4 ++-- glamor/glamor_render.c | 2 +- glamor/glamor_xv.c | 2 +- glx/glxserver.h | 2 +- hw/kdrive/ephyr/ephyr.c | 2 +- hw/kdrive/src/kinput.c | 2 +- hw/xfree86/common/xf86Init.c | 2 +- hw/xfree86/common/xf86Module.h | 2 +- hw/xfree86/common/xf86PciInfo.h | 2 +- hw/xfree86/ddc/print_edid.c | 2 +- hw/xfree86/doc/README.modes | 2 +- hw/xfree86/doc/ddxDesign.xml | 2 +- hw/xfree86/dri/dristruct.h | 2 +- hw/xfree86/dri2/dri2.c | 2 +- hw/xfree86/drivers/modesetting/modesetting.man | 2 +- hw/xfree86/fbdevhw/fbpriv.h | 8 ++++---- hw/xfree86/i2c/xf86i2c.c | 2 +- hw/xfree86/ramdac/xf86CursorRD.c | 2 +- hw/xfree86/vgahw/vgaHW.c | 2 +- hw/xfree86/x86emu/decode.c | 6 +++--- hw/xfree86/x86emu/ops.c | 2 +- hw/xfree86/x86emu/x86emu.h | 2 +- hw/xfree86/xorgconf.cpp | 2 +- hw/xquartz/GL/glcontextmodes.c | 2 +- hw/xquartz/X11Controller.m | 2 +- hw/xquartz/darwinEvents.c | 2 +- hw/xquartz/mach-startup/bundle_trampoline.c | 4 ++-- hw/xquartz/quartz.c | 2 +- hw/xquartz/xpr/appledri.h | 2 +- hw/xwin/man/XWinrc.man | 2 +- hw/xwin/winclipboard/xwinclip.man | 2 +- hw/xwin/wincreatewnd.c | 2 +- hw/xwin/winmultiwindowwndproc.c | 2 +- hw/xwin/winshadddnl.c | 2 +- hw/xwin/winshadgdi.c | 4 ++-- include/xserver-properties.h | 2 +- man/Xserver.man | 4 ++-- mi/miarc.c | 2 +- miext/rootless/rootless.h | 2 +- os/connection.c | 2 +- os/utils.c | 4 ++-- render/picture.h | 2 +- test/input.c | 4 ++-- test/xi2/protocol-xigetselectedevents.c | 2 +- test/xi2/protocol-xipassivegrabdevice.c | 2 +- test/xi2/protocol-xiselectevents.c | 4 ++-- test/xi2/protocol-xisetclientpointer.c | 2 +- xkb/XKM_file_format.txt | 4 ++-- xkb/xkbLEDs.c | 2 +- 60 files changed, 79 insertions(+), 79 deletions(-) diff --git a/Xext/saver.c b/Xext/saver.c index 4e5007a62..8757e253c 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -351,7 +351,7 @@ ScreenSaverFreeSuspend(void *value, XID id) screenSaverSuspended = FALSE; /* The screensaver could be active, since suspending it (by design) - doesn't prevent it from being forceably activated */ + doesn't prevent it from being forcibly activated */ #ifdef DPMSExtension if (screenIsSaved != SCREEN_SAVER_ON && DPMSPowerLevel == DPMSModeOn) #else diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index fb62c463c..e9b247dfc 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -347,7 +347,7 @@ ProcXF86BigfontQueryFont(ClientPtr client) if (dixLookupFontable(&pFont, stuff->id, client, DixGetAttrAccess) != Success) - return BadFont; /* procotol spec says only error is BadFont */ + return BadFont; /* protocol spec says only error is BadFont */ pmax = FONTINKMAX(pFont); pmin = FONTINKMIN(pFont); diff --git a/Xext/xvmc.c b/Xext/xvmc.c index 935b2d8cb..505092322 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -226,7 +226,7 @@ ProcXvMCCreateContext(ClientPtr client) } } - /* adaptor doesn't support this suface_type_id */ + /* adaptor doesn't support this surface_type_id */ if (!surface) return BadMatch; diff --git a/dix/dispatch.c b/dix/dispatch.c index 85d14c489..a0061d8d3 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3879,7 +3879,7 @@ ProcEstablishConnection(ClientPtr client) prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq); if (client->swapped && !AllowByteSwappedClients) { - reason = "Prohibited client endianess, see the Xserver man page "; + reason = "Prohibited client endianness, see the Xserver man page "; } else if ((client->req_len << 2) != sz_xReq + sz_xConnClientPrefix + pad_to_int32(prefix->nbytesAuthProto) + pad_to_int32(prefix->nbytesAuthString)) diff --git a/dix/pixmap.c b/dix/pixmap.c index f7812804a..4527cb614 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -44,7 +44,7 @@ from The Open Group. #include "picturestr.h" #include "randrstr.h" /* - * Scratch pixmap APIs are provided for source and binary compatability. In + * Scratch pixmap APIs are provided for source and binary compatibility. In * older versions, DIX would store a freed scratch pixmap for future use. This * optimization is not really that impactful on modern systems with decent * system heap management and modern CPUs, and it interferes with memory diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index b9f611f05..d288e6f22 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -863,7 +863,7 @@ PowerProfile(DeviceIntPtr dev, { double vel_dist; - acc = (acc - 1.0) * 0.1 + 1.0; /* without this, acc of 2 is unuseable */ + acc = (acc - 1.0) * 0.1 + 1.0; /* without this, acc of 2 is unusable */ if (velocity <= threshold) return vel->min_acceleration; diff --git a/doc/Xinput.xml b/doc/Xinput.xml index 0e7fbda72..d6e0e1fda 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -1013,7 +1013,7 @@ sections describe the contents of these events. Device Key Events -DeviceKeyPresss events contain all the information that is contained in +DeviceKeyPress events contain all the information that is contained in a core KeyPress event, and also the following additional information: diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml index f7dd8e917..879c23c66 100644 --- a/doc/Xserver-spec.xml +++ b/doc/Xserver-spec.xml @@ -857,7 +857,7 @@ and RemoveEnabledDevice are in Xserver/os/connection.c. Similarly, the X server or an extension may need to wait for some timeout. Early X releases implemented this functionality using block and wakeup handlers, -but this has been rewritten to use a general timer facilty, and the +but this has been rewritten to use a general timer facility, and the internal screen saver facilities reimplemented to use Timers. These functions are TimerInit, TimerForce, TimerSet, TimerCancel, and TimerFree, as defined in Xserver/include/os.h. A callback function will be called @@ -1094,7 +1094,7 @@ the current request. InsertFakeRequest() must insert the specified number of bytes of data into the head of the input buffer for the client. This may be a complete request, or it might be a partial request. For example, -NextAvailableCient() will insert a partial request in order to read +NextAvailableClient() will insert a partial request in order to read the initial connection data sent by the client. The routine returns FALSE if memory could not be allocated. ResetCurrentRequest() should "back up" the input buffer so that the currently executing request diff --git a/exa/exa.c b/exa/exa.c index 432a18496..d02c3bdbe 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -385,7 +385,7 @@ exaFinishAccess(DrawablePtr pDrawable, int index) return; if (pExaPixmap == NULL) - EXA_FatalErrorDebugWithRet(("EXA bug: exaFinishAccesss was called on a non-exa pixmap.\n"),); + EXA_FatalErrorDebugWithRet(("EXA bug: exaFinishAccess was called on a non-exa pixmap.\n"),); /* Handle repeated / nested calls. */ for (i = 0; i < EXA_NUM_PREPARE_INDICES; i++) { diff --git a/exa/exa.h b/exa/exa.h index 426d5f413..1251dc70a 100644 --- a/exa/exa.h +++ b/exa/exa.h @@ -585,7 +585,7 @@ typedef struct _ExaDriver { * @return TRUE if PrepareAccess() successfully prepared the pixmap for CPU * drawing. * @return FALSE if PrepareAccess() is unsuccessful and EXA should use - * DownloadFromScreen() to migate the pixmap out. + * DownloadFromScreen() to mitigate the pixmap out. */ Bool (*PrepareAccess) (PixmapPtr pPix, int index); diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index 49777bdab..606f6910a 100644 --- a/glamor/glamor_gradient.c +++ b/glamor/glamor_gradient.c @@ -206,9 +206,9 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count, * * The problem is given the two circles of c1 and c2 with the radius of r1 and * r1, we need to calculate the t, which is used to do interpolate with stops, - * using the fomula: + * using the formula: * length((1-t)*c1 + t*c2 - p) = (1-t)*r1 + t*r2 - * expand the fomula with xy coond, get the following: + * expand the formula with xy coond, get the following: * sqrt(sqr((1-t)*c1.x + t*c2.x - p.x) + sqr((1-t)*c1.y + t*c2.y - p.y)) * = (1-t)r1 + t*r2 * <====> At*t- 2Bt + C = 0 @@ -216,7 +216,7 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count, * B = (p.x - c1.x)*(c2.x - c1.x) + (p.y - c1.y)*(c2.y - c1.y) + r1*(r2 -r1) * C = sqr(p.x - c1.x) + sqr(p.y - c1.y) - r1*r1 * - * solve the fomula and we get the result of + * solve the formula and we get the result of * t = (B + sqrt(B*B - A*C)) / A or * t = (B - sqrt(B*B - A*C)) / A (quadratic equation have two solutions) * @@ -443,7 +443,7 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count, * to make it in the range of [0, (p2d - p1d)]. * * step 3: compare the percentage to every stop and find the stpos just - * before and after it. Use the interpolation fomula to compute RGBA. + * before and after it. Use the interpolation formula to compute RGBA. */ #define gradient_fs_template \ @@ -599,7 +599,7 @@ _glamor_gradient_convert_trans_matrix(PictTransform *from, float to[3][3], * T: The transform matrix. * v: point vector in width X height space. * - * result is OK if we use this fomula. But for every point in width X height space, + * result is OK if we use this formula. But for every point in width X height space, * we can just use their normalized point vector in shader, namely we can just * use the result of A*v in shader. So we have no chance to insert T in A*v. * We can just convert v_s = A*T*v to v_s = A*T*inv(A)*A*v, where inv(A) is the @@ -621,7 +621,7 @@ _glamor_gradient_convert_trans_matrix(PictTransform *from, float to[3][3], * | w*t31 h*t32 t33 | * -- -- * - * Because GLES2 cannot do trasposed mat by spec, we did transposing inside this function + * Because GLES2 cannot do transposed mat by spec, we did transposing inside this function * already, and matrix becoming look like this: * -- -- * | t11 w*t21/h t31*w| diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c index d8aa2e6d4..0f9c5c24a 100644 --- a/glamor/glamor_largepixmap.c +++ b/glamor/glamor_largepixmap.c @@ -459,8 +459,8 @@ _glamor_compute_clipped_regions(PixmapPtr pixmap, * * For the other cases, just need to start * from a proper shiftx/shifty, and then increase - * y by tile_height each time to walk trhough the - * target block and then walk trhough the target + * y by tile_height each time to walk through the + * target block and then walk through the target * at x direction by increate tile_width each time. * * This way, we can consolidate all the sub blocks diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index e69f9cc35..30ec785f3 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -106,7 +106,7 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key " } \n" " return rel_tex; \n" "}\n"; - /* The texture and the pixmap size is not match eaxctly, so can't sample it directly. + /* The texture and the pixmap size is not match exactly, so can't sample it directly. * rel_sampler will recalculate the texture coords.*/ const char *rel_sampler = " vec4 rel_sampler_rgba(sampler2D tex_image, vec2 tex, vec4 wh, int repeat)\n" diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 12e826e39..e3ecc700d 100644 --- a/glamor/glamor_xv.c +++ b/glamor/glamor_xv.c @@ -379,7 +379,7 @@ glamor_xv_query_image_attributes(int id, size *= *h; break; case FOURCC_UYVY: - /* UYVU is single-plane really, all tranformation is processed inside a shader */ + /* UYVU is single-plane really, all transformation is processed inside a shader */ size = ALIGN(*w, 2) * 2; if (pitches) pitches[0] = size; diff --git a/glx/glxserver.h b/glx/glxserver.h index 79f4944d0..88b411899 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -77,7 +77,7 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient); void __glXScreenInitVisuals(__GLXscreen * screen); /* -** The last context used (from the server's persective) is cached. +** The last context used (from the server's perspective) is cached. */ extern __GLXcontext *__glXForceCurrent(__GLXclientState *, GLXContextTag, int *); diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 556ae6525..339ce81a2 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -249,7 +249,7 @@ ephyrMapFramebuffer(KdScreenInfo * screen) /* Rotated/Reflected so we need to use shadow fb */ scrpriv->shadow = TRUE; - EPHYR_LOG("allocing shadow"); + EPHYR_LOG("allocating shadow"); KdShadowFbAlloc(screen, scrpriv->randr & (RR_Rotate_90 | RR_Rotate_270)); diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 1cffacc7b..b73e4152e 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1203,7 +1203,7 @@ KdCloseInput(void) * v1 -> (hold) (settimeout) button_1_pend * ^1 -> (deliver) start * v2 -> (deliver) button_2_down - * ^2 -> (deliever) start + * ^2 -> (deliver) start * v3 -> (hold) (settimeout) button_3_pend * ^3 -> (deliver) start * vo -> (deliver) start diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 70ff95b4d..283b478a8 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -448,7 +448,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) xf86PostProbe(); /* - * Sort the drivers to match the requested ording. Using a slow + * Sort the drivers to match the requested ordering. Using a slow * bubble sort. */ for (j = 0; j < xf86NumScreens - 1; j++) { diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 1893f4458..68186e974 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -134,7 +134,7 @@ typedef struct { */ typedef struct { CARD8 majorversion; /* module-specific major version */ - CARD8 minorversion; /* moudle-specific minor version */ + CARD8 minorversion; /* module-specific minor version */ CARD16 patchlevel; /* module-specific patch level */ const char *abiclass; /* ABI class that the module uses */ CARD32 abiversion; /* ABI version */ diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index 0f5430868..00873e9bf 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -362,7 +362,7 @@ /* ASPEED Technology (AST) */ #define PCI_CHIP_AST2000 0x2000 -/* Avance Logic */ +/* Advance Logic */ #define PCI_CHIP_ALG2064 0x2064 #define PCI_CHIP_ALG2301 0x2301 #define PCI_CHIP_ALG2501 0x2501 diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 464c11c5a..39024bf0c 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -367,7 +367,7 @@ print_detailed_timings(int scrnIndex, struct detailed_timings *t) } } -/* This function handle all detailed patchs, +/* This function handles all detailed patches, * including EDID and EDID-extension */ struct det_print_parameter { diff --git a/hw/xfree86/doc/README.modes b/hw/xfree86/doc/README.modes index 54543bf0a..603276393 100644 --- a/hw/xfree86/doc/README.modes +++ b/hw/xfree86/doc/README.modes @@ -134,7 +134,7 @@ enable as much hardware as possible using some fairly simple heuristics. The 'canGrow' parameter indicates that the frame buffer does not have a fixed size. When the frame buffer has a fixed size, the configuration selects a -'reasonablely large' frame buffer so that common reconfiguration options are +'reasonably large' frame buffer so that common reconfiguration options are possible. For resizable frame buffers, the frame buffer is set to the smallest size that encloses the desired configuration. diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index 08009ad11..18bcb8e38 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -6763,7 +6763,7 @@ programming the standard VGA registers, and for handling VGA colourmaps. non-default MapPhys or MapSize settings (the physical location and size of the VGA memory window) then those fields of the vgaHWRec must be initialised - before calling this function. Otherwise, this function initialiases + before calling this function. Otherwise, this function initialises the default values of 0xA0000 for MapPhys and (64 * 1024) for MapSize. This function must be called before diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index 2543912bd..761d53b35 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -77,7 +77,7 @@ typedef struct _DRIScreenPrivRec { DRIContextPrivPtr myContextPriv; /* Pointer to server's private area */ DRIContextPrivPtr lastPartial3DContext; /* last one partially saved */ void **hiddenContextStore; /* hidden X context */ - void **partial3DContextStore; /* parital 3D context */ + void **partial3DContextStore; /* partial 3D context */ DRIInfoPtr pDriverInfo; int nrWindows; int nrWindowsVisible; diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index f55659b53..2dd0e7261 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -1595,7 +1595,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) #endif } - /* Initialize minor if needed and set to minimum provied by DDX */ + /* Initialize minor if needed and set to minimum provided by DDX */ if (!dri2_minor || dri2_minor > cur_minor) dri2_minor = cur_minor; diff --git a/hw/xfree86/drivers/modesetting/modesetting.man b/hw/xfree86/drivers/modesetting/modesetting.man index 26212725c..35ae953c5 100644 --- a/hw/xfree86/drivers/modesetting/modesetting.man +++ b/hw/xfree86/drivers/modesetting/modesetting.man @@ -90,7 +90,7 @@ cause some tearing on these displays, but it prevents a permanent or periodic slowdown or irritating judder of animations if not all video outputs are running synchronized with each other and with the same refresh rate. There is no perfect solution apart from perfectly synchronized outputs, but this option may give -preferrable results if the displays in a multi-display setup mirror or clone +preferable results if the displays in a multi-display setup mirror or clone each other. The default is .B off. .TP diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index 8d224ae02..545433982 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -45,7 +45,7 @@ #define FB_AUX_TEXT_MDA 0 /* Monochrome text */ #define FB_AUX_TEXT_CGA 1 /* CGA/EGA/VGA Color text */ #define FB_AUX_TEXT_S3_MMIO 2 /* S3 MMIO fasttext */ -#define FB_AUX_TEXT_MGA_STEP16 3 /* MGA Millenium I: text, attr, 14 reserved bytes */ +#define FB_AUX_TEXT_MGA_STEP16 3 /* MGA Millennium I: text, attr, 14 reserved bytes */ #define FB_AUX_TEXT_MGA_STEP8 4 /* other MGAs: text, attr, 6 reserved bytes */ #define FB_VISUAL_MONO01 0 /* Monochr. 1=Black 0=White */ @@ -71,10 +71,10 @@ #define FB_ACCEL_SUN_LEO 13 /* Sun leo/zx */ #define FB_ACCEL_IMS_TWINTURBO 14 /* IMS Twin Turbo */ #define FB_ACCEL_3DLABS_PERMEDIA2 15 /* 3Dlabs Permedia 2 */ -#define FB_ACCEL_MATROX_MGA2064W 16 /* Matrox MGA2064W (Millenium) */ +#define FB_ACCEL_MATROX_MGA2064W 16 /* Matrox MGA2064W (Millennium) */ #define FB_ACCEL_MATROX_MGA1064SG 17 /* Matrox MGA1064SG (Mystique) */ -#define FB_ACCEL_MATROX_MGA2164W 18 /* Matrox MGA2164W (Millenium II) */ -#define FB_ACCEL_MATROX_MGA2164W_AGP 19 /* Matrox MGA2164W (Millenium II) */ +#define FB_ACCEL_MATROX_MGA2164W 18 /* Matrox MGA2164W (Millennium II) */ +#define FB_ACCEL_MATROX_MGA2164W_AGP 19 /* Matrox MGA2164W (Millennium II) */ #define FB_ACCEL_MATROX_MGAG100 20 /* Matrox G100 (Productiva G100) */ #define FB_ACCEL_MATROX_MGAG200 21 /* Matrox G200 (Myst, Mill, ...) */ #define FB_ACCEL_SUN_CG14 22 /* Sun cgfourteen */ diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index c70aaf1ac..ec1621314 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -69,7 +69,7 @@ I2CUDelay(I2CBusPtr b, int usec) * ================================================================ * * It is assumed that there is just one master on the I2C bus, therefore - * there is no explicit test for conflits. + * there is no explicit test for conflicts. */ #define RISEFALLTIME 2 /* usec, actually 300 to 1000 ns according to the i2c specs */ diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c index ae880cfca..b49123aef 100644 --- a/hw/xfree86/ramdac/xf86CursorRD.c +++ b/hw/xfree86/ramdac/xf86CursorRD.c @@ -495,7 +495,7 @@ xf86DestroyCursorInfoRec(xf86CursorInfoPtr infoPtr) } /** - * New cursor has been created. Do your initalizations here. + * New cursor has been created. Do your initializations here. */ static Bool xf86DeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index e1c2163f3..6df7591a4 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -361,7 +361,7 @@ vgaHWSetStdFuncs(vgaHWPtr hwp) /* * MMIO versions of the register access functions. These require * hwp->MemBase to be set in such a way that when the standard VGA port - * adderss is added the correct memory address results. + * address is added the correct memory address results. */ #define minb(p) MMIO_IN8(hwp->MMIOBase, (hwp->MMIOOffset + (p))) diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c index 6e4013ecc..d2c0129e6 100644 --- a/hw/xfree86/x86emu/decode.c +++ b/hw/xfree86/x86emu/decode.c @@ -33,7 +33,7 @@ * Developer: Kendall Bennett * * Description: This file includes subroutines which are related to -* instruction decoding and accessess of immediate data via IP. etc. +* instruction decoding and accesses of immediate data via IP. etc. * ****************************************************************************/ @@ -45,7 +45,7 @@ /**************************************************************************** REMARKS: -Handles any pending asychronous interrupts. +Handles any pending asynchronous interrupts. ****************************************************************************/ static void x86emu_intr_handle(void) @@ -248,7 +248,7 @@ no segment override. Address modes such as -3[BP] or 10[BP+SI] all refer to addresses relative to SS (ie: on the stack). So, at the minimum, all decodings of addressing modes would have to set/clear a bit describing whether the access is relative to DS or SS. That is the function of the -cpu-state-varible M.x86.mode. There are several potential states: +cpu-state-variable M.x86.mode. There are several potential states: repe prefix seen (handled elsewhere) repne prefix seen (ditto) diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c index 4983382bc..6b19ee4e7 100644 --- a/hw/xfree86/x86emu/ops.c +++ b/hw/xfree86/x86emu/ops.c @@ -10028,7 +10028,7 @@ x86emuOp_xlat(u8 X86EMU_UNUSED(op1)) END_OF_INSTR(); } -/* instuctions D8 .. DF are in i87_ops.c */ +/* instructions D8 .. DF are in i87_ops.c */ /**************************************************************************** REMARKS: diff --git a/hw/xfree86/x86emu/x86emu.h b/hw/xfree86/x86emu/x86emu.h index 501dd913c..ccb057c32 100644 --- a/hw/xfree86/x86emu/x86emu.h +++ b/hw/xfree86/x86emu/x86emu.h @@ -65,7 +65,7 @@ Data structure containing ponters to programmed I/O functions used by the emulator. This is used so that the user program can hook all programmed I/O for the emulator to handled as necessary by the user program. By default the emulator contains simple functions that do not do access the -hardware in any way. To allow the emualtor access the hardware, you will +hardware in any way. To allow the emulator access the hardware, you will need to override the programmed I/O functions using the X86EMU_setupPioFuncs function. diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp index 4cf677f36..342a3ee90 100644 --- a/hw/xfree86/xorgconf.cpp +++ b/hw/xfree86/xorgconf.cpp @@ -395,7 +395,7 @@ Section "Device" # section can only match up with the primary video device. For PCI # devices a line like the following could be used. This line should not # normally be included unless there is more than one video device -# intalled. +# installed. # BusID "PCI:0:10:0" diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c index 6e7f49af4..3d48cb31b 100644 --- a/hw/xquartz/GL/glcontextmodes.c +++ b/hw/xquartz/GL/glcontextmodes.c @@ -417,7 +417,7 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute, * structure in libGL is the same, then the meaning of each byte in * the structure is the same in both places. \b Be \b careful! * Basically this means that fields have to be added in libGL and - * then propagated to drivers. Drivers should \b never arbitrarilly + * then propagated to drivers. Drivers should \b never arbitrarily * extend the \c __GLcontextModes data-structure. */ __GLcontextModes * diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 7e7306895..5b1cda9d9 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -59,7 +59,7 @@ extern char *bundle_id_prefix; @interface X11Controller () #ifdef XQUARTZ_SPARKLE -@property (nonatomic, readwrite, strong) NSMenuItem *check_for_updates_item; // Programatically enabled +@property (nonatomic, readwrite, strong) NSMenuItem *check_for_updates_item; // Programmatically enabled #endif @property (nonatomic, readwrite, strong) NSArray *> *apps; diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index 5aa16ffab..298a5b007 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -200,7 +200,7 @@ DarwinUpdateModifiers(int pressed, // KeyPress or KeyRelease } } -/* Generic handler for Xquartz-specifc events. When possible, these should +/* Generic handler for Xquartz-specific events. When possible, these should be moved into their own individual functions and set as handlers using mieqSetHandler. */ diff --git a/hw/xquartz/mach-startup/bundle_trampoline.c b/hw/xquartz/mach-startup/bundle_trampoline.c index 9c58f3ee8..83eaff4fe 100644 --- a/hw/xquartz/mach-startup/bundle_trampoline.c +++ b/hw/xquartz/mach-startup/bundle_trampoline.c @@ -35,7 +35,7 @@ #include #include -/* We wnt XQuartz.app to inherit a login shell environment. This is handled by the X11.sh +/* We want XQuartz.app to inherit a login shell environment. This is handled by the X11.sh * script which re-execs the main binary from a login shell environment. However, recent * versions of macOS require that the main executable of an app be Mach-O for full system * fidelity. @@ -43,7 +43,7 @@ * Failure to do so results in two problems: * 1) bash is seen as the responsible executable for Security & Privacy, and the user doesn't * get prompted to allow filesystem access (https://github.com/XQuartz/XQuartz/issues/6). - * 2) The process is launched under Rosetta for compatability, which results in + * 2) The process is launched under Rosetta for compatibility, which results in * the subsequent spawn of the real executable under Rosetta rather than natively. * * This trampoline provides the mach-o needed by LaunchServices and TCC to satisfy those diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index da30f1f08..fd34a453f 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -72,7 +72,7 @@ // These are vended by the Objective-C runtime, but they are unfortunately // not available as API in the macOS SDK. We are following suit with swift -// and clang in declaring them inline here. They canot be removed or changed +// and clang in declaring them inline here. They cannot be removed or changed // in the OS without major bincompat ramifications. // // These were added in macOS 10.7. diff --git a/hw/xquartz/xpr/appledri.h b/hw/xquartz/xpr/appledri.h index a96c96fc8..98991fcf5 100644 --- a/hw/xquartz/xpr/appledri.h +++ b/hw/xquartz/xpr/appledri.h @@ -75,7 +75,7 @@ typedef struct { int type; /* of event */ unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came frome a SendEvent request */ + Bool send_event; /* true if this came from a SendEvent request */ Display *display; /* Display the event was read from */ Window window; /* window of event */ Time time; /* server timestamp when event happened */ diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man index bff8f96d6..a112becfc 100644 --- a/hw/xwin/man/XWinrc.man +++ b/hw/xwin/man/XWinrc.man @@ -86,7 +86,7 @@ this may be useful if you want no dialogs. .br .B } .br -This instruction defines a menu and asigns a \fIMenu_Name\fP to it. +This instruction defines a menu and assigns a \fIMenu_Name\fP to it. \fIMenu_Item_Line\fP are lines of any of the following types: .TP 8 .B SEPARATOR diff --git a/hw/xwin/winclipboard/xwinclip.man b/hw/xwin/winclipboard/xwinclip.man index 0f1d2c540..7d1df948c 100644 --- a/hw/xwin/winclipboard/xwinclip.man +++ b/hw/xwin/winclipboard/xwinclip.man @@ -10,7 +10,7 @@ xwinclip - An X11 and Windows clipboard integration tool \fIxwinclip\fP watches for updates to either clipboard and copies data between them when either one is updated. -\fIxwinclip\fP monitors the X PRIMARY and CLIBPOARD selections for changes in ownership, and makes +\fIxwinclip\fP monitors the X PRIMARY and CLIPBOARD selections for changes in ownership, and makes the contents of the most recent one to change available to paste from the Windows clipboard. It also monitors the contents of the Windows clipboard for changes, taking ownership of the PRIMARY and diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index 58247675f..9616819fb 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -363,7 +363,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) * size of the window area minus the space the caption, borders, and * scrollbars (if any) occupy, and the range is the size of the * underlying X visual. Notice that, contrary to what some of the - * MSDN Library arcticles lead you to believe, the windows + * MSDN Library articles lead you to believe, the windows * ``client area'' size does not include the scrollbars. In other words, * the whole client area size that is reported to you is drawable by * you; you do not have to subtract the size of the scrollbars from diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index 77a038e12..22e6b6248 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -1238,7 +1238,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) ret = DefWindowProc(hwnd, message, wParam, lParam); /* - * If the window was minized we get the stack change before the window is restored + * If the window was minimized we get the stack change before the window is restored * and so it gets lost. Ensure there stacking order is correct. */ if (needRestack) diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index bbed6f363..364e195e4 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -165,7 +165,7 @@ winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen) if (pScreenPriv->pddsPrimary4) { /* * Detach the clipper from the primary surface. - * NOTE: We do this explicity for clarity. The Clipper is not released. + * NOTE: We do this explicitly for clarity. The Clipper is not released. */ IDirectDrawSurface4_SetClipper(pScreenPriv->pddsPrimary4, NULL); diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 89207114a..8eac38eef 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -158,7 +158,7 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen) /* Color masks for 8 bpp are standardized */ if (GetDeviceCaps(pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE) { /* - * RGB BPP for 8 bit palletes is always 8 + * RGB BPP for 8 bit palettes is always 8 * and the color masks are always 0. */ pScreenPriv->dwBitsPerRGB = 8; @@ -926,7 +926,7 @@ winBltExposedWindowRegionShadowGDI(ScreenPtr pScreen, WindowPtr pWin) } /* - * Do any engine-specific appliation-activation processing + * Do any engine-specific application-activation processing */ static Bool diff --git a/include/xserver-properties.h b/include/xserver-properties.h index bf48fabe5..5cf43ec63 100644 --- a/include/xserver-properties.h +++ b/include/xserver-properties.h @@ -13,7 +13,7 @@ * Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY, + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER * IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/man/Xserver.man b/man/Xserver.man index 774239f17..4cac2703c 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -125,11 +125,11 @@ This is the default unless \-retro or \-wr is specified. disables backing store support on all screens. .TP 8 .B +byteswappedclients -Allow connections from clients with an endianess different to that of the +Allow connections from clients with an endianness different to that of the server. .TP 8 .B \-byteswappedclients -Prohibit connections from clients with an endianess different to that of the +Prohibit connections from clients with an endianness different to that of the server. This is the default unless \fB+byteswappedclients\fP is specified. .TP 8 diff --git a/mi/miarc.c b/mi/miarc.c index de869d2f7..9116d242c 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1153,7 +1153,7 @@ GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, int *by, int *ty) * edge list and a right edge list. The algorithm used * to traverse each edge is digital differencing analyzer * line algorithm with y as the major axis. There's some funny linear - * interpolation involved because of the subpixel postioning. + * interpolation involved because of the subpixel positioning. */ static void miFillSppPoly(DrawablePtr dst, GCPtr pgc, int count, /* number of points */ diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index b375731bf..a843e077b 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -205,7 +205,7 @@ typedef void (*RootlessStopDrawingProc) * Drawing is stopped before this is called. * * wid Frame id - * pDamage Region containing all the changed pixels in frame-lcoal + * pDamage Region containing all the changed pixels in frame-local * coordinates. This is clipped to the window's clip. */ typedef void (*RootlessUpdateRegionProc) diff --git a/os/connection.c b/os/connection.c index 64245af6b..74330958e 100644 --- a/os/connection.c +++ b/os/connection.c @@ -891,7 +891,7 @@ OnlyListenToOneClient(ClientPtr client) /**************** * ListenToAllClients: - * Undoes OnlyListentToOneClient() + * Undoes OnlyListenToOneClient() ****************/ void diff --git a/os/utils.c b/os/utils.c index 9252884c7..292e89221 100644 --- a/os/utils.c +++ b/os/utils.c @@ -273,8 +273,8 @@ UseMsg(void) ErrorF("-br create root window with black background\n"); ErrorF("+bs enable any backing store support\n"); ErrorF("-bs disable any backing store support\n"); - ErrorF("+byteswappedclients Allow clients with endianess different to that of the server\n"); - ErrorF("-byteswappedclients Prohibit clients with endianess different to that of the server\n"); + ErrorF("+byteswappedclients Allow clients with endianness different to that of the server\n"); + ErrorF("-byteswappedclients Prohibit clients with endianness different to that of the server\n"); ErrorF("-c turns off key-click\n"); ErrorF("c # key-click volume (0-100)\n"); ErrorF("-cc int default color visual class\n"); diff --git a/render/picture.h b/render/picture.h index c3a73d1d8..1171da366 100644 --- a/render/picture.h +++ b/render/picture.h @@ -143,7 +143,7 @@ typedef enum _PictFormatShort { * 256 PolicyColor (only on PseudoColor) * * The actual allocation code lives in miindex.c, and so is - * austensibly server dependent, but that code does: + * ostensibly server dependent, but that code does: * * PolicyMono Allocate no additional colors, use black and white * PolicyGray Allocate 13 gray levels (11 cells used) diff --git a/test/input.c b/test/input.c index 063db31e1..7c7910644 100644 --- a/test/input.c +++ b/test/input.c @@ -117,7 +117,7 @@ dix_init_valuators(void) assert(axis->scroll.type == SCROLL_TYPE_HORIZONTAL); assert(axis->scroll.flags == 0); - /* can add another non-preffered axis */ + /* can add another non-preferred axis */ assert(SetScrollValuator (&dev, 1, SCROLL_TYPE_VERTICAL, 5.0, SCROLL_FLAG_NONE) == TRUE); assert(SetScrollValuator @@ -879,7 +879,7 @@ dix_grab_matching(void) rc = GrabMatchesSecond(&b, &a, FALSE); assert(rc == FALSE); - /* XIAnyModifier or AnyModifer must succeed */ + /* XIAnyModifier or AnyModifier must succeed */ a.grabtype = XI2; b.grabtype = XI2; a.detail.exact = 1; diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 7b058ff90..6d02fac22 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -147,7 +147,7 @@ request_XIGetSelectedEvents(xXIGetSelectedEventsReq * req, int error) client->req_len (see above). We previously had to swap it here, so that SProcXIPassiveGrabDevice() will swap it back. Since that's gone now, still swapping itself would break if this function is called - again and writing back a errornously swapped value + again and writing back a erroneously swapped value */ swapl(&req->win); diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c index f794faf5c..c9a2f36db 100644 --- a/test/xi2/protocol-xipassivegrabdevice.c +++ b/test/xi2/protocol-xipassivegrabdevice.c @@ -153,7 +153,7 @@ request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq * req, client->req_len (see above). We previously had to swap it here, so that SProcXIPassiveGrabDevice() will swap it back. Since that's gone now, still swapping itself would break if this function is called - again and writing back a errornously swapped value + again and writing back a erroneously swapped value */ swapl(&req->time); diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index 483bbf89a..1e9173600 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -40,7 +40,7 @@ * BadValue for num_masks < 0 * BadWindow for invalid windows * BadDevice for non-existing devices - * BadImplemenation for devices >= 0xFF + * BadImplementation for devices >= 0xFF * BadValue if HierarchyChanged bit is set for devices other than * XIAllDevices * BadValue for invalid mask bits @@ -116,7 +116,7 @@ request_XISelectEvent(xXISelectEventsReq * req, int error) client->req_len (see above). We previously had to swap it here, so that SProcXIPassiveGrabDevice() will swap it back. Since that's gone now, still swapping itself would break if this function is called - again and writing back a errornously swapped value + again and writing back a erroneously swapped value */ swapl(&req->win); diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c index 43313bbab..31cbb561c 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -76,7 +76,7 @@ request_XISetClientPointer(xXISetClientPointerReq * req, int error) client->req_len (see above). We previously had to swap it here, so that SProcXIPassiveGrabDevice() will swap it back. Since that's gone now, still swapping itself would break if this function is called - again and writing back a errornously swapped value + again and writing back a erroneously swapped value */ swapl(&req->win); diff --git a/xkb/XKM_file_format.txt b/xkb/XKM_file_format.txt index 2a90e4047..ea6fff8fb 100644 --- a/xkb/XKM_file_format.txt +++ b/xkb/XKM_file_format.txt @@ -110,7 +110,7 @@ the level names and the section names ("complete", "evdev(inet)", etc.) version: CARD8 identifier1: 'm' identifier2: 'k' - idenfifier3: 'x' + identifier3: 'x' └─── The XKM file format has a 4 byte header identifying the file and the XKM @@ -183,7 +183,7 @@ modifiers change to a particular level. virt_mods: CARD16 num_map_entries: CARD8 num_level_names: CARD8 - perserve: CARD8 + preserve: CARD8 pad: CARD8 map_entries: LISTofXKMKTMapEntry name: XKMCountedString diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 4941c83eb..58e0e7020 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -555,7 +555,7 @@ XkbCheckIndicatorMaps(DeviceIntPtr dev, XkbSrvLedInfoPtr sli, unsigned which) * 'kf' or 'lf' on the keyboard specified by 'dev.' * * If 'needed_parts' is non-zero, this function makes sure that any - * of the parts speicified therein are allocated. + * of the parts specified therein are allocated. */ XkbSrvLedInfoPtr XkbAllocSrvLedInfo(DeviceIntPtr dev,