This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 170416d26e885d4a6544a214b078162a0883bd94 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:11:57 2018 +0200 hw/nxagent: fix spelling errors as reported by codespell --- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 12 ++++++------ nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 10 +++++----- nx-X11/programs/Xserver/hw/nxagent/Error.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Image.c | 8 ++++---- nx-X11/programs/Xserver/hw/nxagent/Image.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXresource.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Options.h | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Pixels.h | 7 +++---- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Window.c | 12 ++++++------ 21 files changed, 50 insertions(+), 51 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index e2d97d2..5e578a5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -415,8 +415,8 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d /* * FIXME: We should clean up the atom map - * at nxagent reset, in order to cancel - * all the local atoms but still mantaining + * at nxagent reset, in order to cancel + * all the local atoms but still maintaining * the Xserver values and the atom names. */ @@ -470,8 +470,8 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet) } /* - * Ask X-Server for ours Atoms - * ... if successfull cache them too. + * Ask X-Server for our Atoms + * ... if successful cache them too. */ ret_value = XInternAtoms(nxagentDisplay, name_list, list_size, False, atom_list); @@ -532,7 +532,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet) } /* - * If the nxagent has been resetted, + * If the nxagent has been reset, * the local value of the atoms stored * in cache could have the value None, * do not call this function with None. @@ -639,7 +639,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit) { /* * Found Cached by name. - * It means that nxagent has been resetted, + * It means that nxagent has been reset, * but not the xserver so we still have cached its atoms. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index a13c842..a2ea7d6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -43,7 +43,7 @@ #include "X11/include/Xfixes_nxagent.h" /* - * Use asyncronous get property replies. + * Use asynchronous get property replies. */ #include "compext/Compext.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 494a732..3ca3db2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -589,8 +589,8 @@ FIXME: Should print a warning if the user tries to let the agent impersonate the same display as the display where the agent is supposed to connect. We actually handle this by means of RejectWell- - KnownSockets() but without giving to the user - a friendly explaination for the error. + KnownSockets() but without giving a friendly + explanation for the error to the user. */ newAction.sa_handler = nxagentRejectConnection; @@ -1280,7 +1280,7 @@ N/A /* FIXME: Use of nxagentParentWindow is strongly deprecated. We need also to clarify which events are selected - in the diferent operating modes. + in the different operating modes. */ nxagentInitDefaultEventMask(); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 8e82836..5228705 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -71,8 +71,8 @@ /* * If defined, send the XClearArea at the end * of the loop synchronizing the shadow pixmap. - * In this way, large images can be splitted but - * the user will see more updates togheter. + * In this way, large images can be split but + * the user will see more updates together. */ #undef COLLECTED_UPDATES @@ -643,7 +643,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for synchronization.\n"); /* - * Print detailed informations if the + * Print detailed information if the * image length is zero. */ @@ -2645,8 +2645,8 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable) /* * Should create a function to append - * a bitmap to another, instead of de- - * stroy the old one. + * a bitmap to another, instead of + * destroying the old one. */ if (nxagentDrawableBitmap(pDrawable) != NullPixmap) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c index 33d8abe..bc58ef8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Error.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c @@ -103,7 +103,7 @@ void nxagentGetClientsPath(void); static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp); /* declare an error handler that does not exit when an error - * event is catched. + * event is caught. */ int nxagentErrorHandler(Display *dpy, XErrorEvent *event) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 91a3c6e..5e598f5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3231,7 +3231,7 @@ int nxagentHandleConfigureNotify(XEvent* X) if ((pWin = nxagentRootlessTopLevelWindow(X -> xconfigure.window)) != NULL) { /* - * Cheking for new geometry or stacking order changes. + * Checking for new geometry or stacking order changes. */ nxagentCheckWindowConfiguration((XConfigureEvent*)X); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 72c5eb9..a1690eb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -245,7 +245,7 @@ void nxagentListRemoteFonts(const char *searchPattern, const int maxNames) * number of dashes in the pattern acts as * a rule to select how to search for the * font names, so the pattern '*' is useful - * to retrive the font aliases, while the + * to retrieve the font aliases, while the * other one will select the 'real' fonts. */ @@ -717,7 +717,7 @@ int nxagentDestroyNewFontResourceType(void * p, XID id) /* FIXME: It happens that this resource had been already - destroied. We should verify if the same font is + destroyed. We should verify if the same font is assigned both to the server client and another client. We had a crash when freeing server client resources. @@ -788,7 +788,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP numSearchFields = nxagentSplitString(nxagentRemoteFontList.list[i]->name, searchFields, FIELDS+1, "-"); - /* The following code attemps to find an accurate approximation + /* The following code attempts to find an accurate approximation * of the missing font. The current candidate and the missing font are * compared on the 14 fields of the X Logical Font Description Convention. * The selection is performed by the analysis of the matching fields, diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index e4c0568..c9aea9c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -96,7 +96,7 @@ #define TIME_BEFORE_YIELD 500 /* - * Dinamically reduce the display buffer + * Dynamically reduce the display buffer * size after a congestion. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index 7043f09..a5e1972 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -189,8 +189,8 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order) { /* * This is used whenever we need to swap the image data. - * If we got an image from a X server having a different - * endianess, we will need to redormat the image to match + * If we got an image from an X server having a different + * endianness, we will need to reformat the image to match * our own image-order so that ProcGetImage can return * the expected format to the client. */ @@ -1157,9 +1157,9 @@ FIXME: Should use an unpack resource here. /* * We got the image data from the X client or - * from the frame-buffer with our own endianess. + * from the frame-buffer with our own endianness. * Byte swap the image data if the display has - * a different endianess than our own. + * a different endianness than our own. */ if (nxagentImageNormalize(plainImage) != 0) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.h b/nx-X11/programs/Xserver/hw/nxagent/Image.h index 771c0db..6e22fa9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.h @@ -84,7 +84,7 @@ void nxagentResetAlphaCache(void); /* * Byte swap the image if the display - * uses a different endianess. + * uses a different endianness. */ #define nxagentImageNormalize(image) \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 26374f8..6e68b80 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -212,7 +212,7 @@ INCLUDES = \ # NXAGENT_GLYPHCACHE # NXAGENT_GLYPHCACHE_SIZE Slots for glyph cache # NXAGENT_SHAPE2 New shape code -# NXAGENT_FIXKEYS Force the release of pressed key when loosing focus +# NXAGENT_FIXKEYS Force the release of pressed key when losing focus # NXAGENT_EXPOSURES Manage expose events # NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers. # NXAGENT_FONTEXCLUDE Exclude some specific font names (only "-ult1mo" at this moment). diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 44b1033..5cfa927 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -540,7 +540,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio #if defined(DDXBEFORERESET) ddxBeforeReset (); #endif - /* FIXME: maybe move the code upto the KillAllClients() call to ddxBeforeReset? */ + /* FIXME: maybe move the code up to the KillAllClients() call to ddxBeforeReset? */ if ((dispatchException & DE_RESET) && (serverGeneration > nxagentMaxAllowedResets)) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 727246c..370fff6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -568,7 +568,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 = ROOT; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index a564d84..e05b368 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -437,7 +437,7 @@ RestartLoop: /* * It's not enough to check if the number of elements has - * changed, beacause it could happen that the number of + * changed, because it could happen that the number of * resources that have been added matches the number of * the freed ones. * 'nxagentResChangedFlag' is set if a resource has been @@ -521,7 +521,7 @@ RestartLoop: /* * It's not enough to check if the number of elements has - * changed, beacause it could happen that the number of + * changed, because it could happen that the number of * resources that have been added matches the number of * the freed ones. * 'nxagentResChangedFlag' is set if a resource has been diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index d108d3e..64bbf67 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -543,7 +543,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP if (!pParent) return Success; - /* Figure out if the window should be moved. Doesnt + /* Figure out if the window should be moved. Doesn't make the changes to the window if event sent */ #ifdef TEST @@ -769,7 +769,7 @@ ReparentWindow(register WindowPtr pWin, register 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); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h index a4e2c50..8e898bd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h @@ -334,7 +334,7 @@ typedef struct _AgentOptions /* * If set, prevent the shadow session to - * interact with master diplay. + * interact with master display. */ int ViewOnly; @@ -429,7 +429,7 @@ typedef struct _AgentOptions * we cannot rely on them because RandR and PanoramiX change their * values when trying to initialize. So we use this variable to * save the user preference provided by the -/+(rr)xinerama parameter(s) - * before initalizing those extensions. + * before initializing those extensions. */ int Xinerama; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h index fa25a46..316d147 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h @@ -111,10 +111,9 @@ while (0) nxagentCongestion > 4) /* -FIXME: The condition checking for the render - version is a workaround implemented to - avoid problems with the render composi- - te on XFree86 remote server. +FIXME: The condition checking for the render version is a workaround + implemented to avoid problems with the render composite on + XFree86 remote server. */ /* FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 25d410d..421e023 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -1129,7 +1129,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap) #ifdef TEST fprintf(stderr, "nxagentCheckPixmapIntegrity: Pixmap at [%p] has been realized. " - "Now remote and frambuffer data are synchronized.\n", (void *) pPixmap); + "Now remote and framebuffer data are synchronized.\n", (void *) pPixmap); #endif } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 2739847..6753897 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -236,7 +236,7 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo) * server this stuff is done after having opened the * real display as Xnest lets the screen reflect the * order of the remote end. Agent will instead set - * the order according to local endianess and swap + * the order according to local endianness and swap * data whenever it is appropriate. * * From a standard implementation: @@ -329,7 +329,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen) /* FIXME: We'll check for ReparentNotify and LeaveNotify events after XReparentWindow() in order to avoid the session window is iconified. - We could avoid the sesssion window is iconified when a LeaveNotify event is received, + We could avoid the session window is iconified when a LeaveNotify event is received, so this check would be unnecessary. */ struct timeval timeout; @@ -4012,7 +4012,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) /* * Convert old RANDR 1.0 data (if any) to current structure. This * is needed once at the first run of this function. If we don't - * do this here it will be done implicitely later and add mode(s) to + * do this here it will be done implicitly later and add mode(s) to * our crtc(s)! */ rrgetinfo = RRGetInfo(pScreen, FALSE); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c index c123791..a29560d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c @@ -141,7 +141,7 @@ Visual *nxagentVisualFromDepth(ScreenPtr pScreen, int depth) /* * Create a fake 32 bits depth visual and - * initialize it based on the endianess + * initialize it based on the endianness * of the remote display. */ @@ -152,7 +152,7 @@ void nxagentInitAlphaVisual(void) /* * Color masks are referred to bits inside * the pixel. This is independent from the - * endianess. + * endianness. */ nxagentAlphaVisual.red_mask = 0x00ff0000; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index e2ce9d3..073021e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -1752,7 +1752,7 @@ Bool nxagentChangeWindowAttributes(pWin, mask) } /* - * As we set this bit, whe must change dix in + * As we set this bit, we must change dix in * order not to perform PositionWindow and let * X move children windows for us. */ @@ -2635,7 +2635,7 @@ void nxagentMapDefaultWindows(void) Bool nxagentDisconnectAllWindows(void) { - Bool succeded = True; + Bool succeeded = True; int i; WindowPtr pWin; @@ -2646,7 +2646,7 @@ Bool nxagentDisconnectAllWindows(void) for (i = 0; i < screenInfo.numScreens; i++) { pWin = screenInfo.screens[i]->root; - nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeded); + nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeeded); nxagentDefaultWindows[i] = None; } @@ -2654,7 +2654,7 @@ Bool nxagentDisconnectAllWindows(void) fprintf(stderr, "nxagentDisconnectAllWindows: all windows disconnected\n"); #endif - return succeded; + return succeeded; } /* @@ -3270,7 +3270,7 @@ static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buff } /* XXX: This would break Motif menus. - If pWin is mapped but not realized, a followin UnmapWindow() wouldn't + If pWin is mapped but not realized, a following UnmapWindow() wouldn't do anything, leaving this mapped window around. XMapWindow() is called in nxagentRealizeWindow() and there it is enough. @@ -3387,7 +3387,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin) { #ifdef WARNING fprintf(stderr, "nxagentCheckWindowIntegrity: Window %p has been realized " - "now remote and frambuffer data are synchronized.\n", (void*) pWin); + "now remote and framebuffer data are synchronized.\n", (void*) pWin); #endif } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git