diff options
Diffstat (limited to 'nx-X11')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.h | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 16 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Options.h | 4 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Trap.c | 4 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Trap.h | 4 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c | 4 |
12 files changed, 23 insertions, 23 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index a8d2e447f..2ea2a1ba2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -433,7 +433,7 @@ static void nxagentWriteAtom(Atom local, XlibAtom remote, const char *string) #ifdef WARNING if (s == NULL) { - /* we only warn here, because s being NULL ist not problem, it + /* we only warn here, because s being NULL is not problem, it will only result in NULL being stored in the privAtomMap, which is perfectly legal. */ fprintf(stderr, "%s: Malloc failed.\n", __func__); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h index c8b059405..a6934336a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h @@ -71,7 +71,7 @@ void nxagentWMDetect(void); XlibAtom nxagentMakeAtom(char *, unsigned, Bool); /* - * Converts local atoms to remote atoms and viceversa. + * Converts local atoms to remote atoms and vice-versa. */ Atom nxagentRemoteToLocalAtom(XlibAtom); diff --git a/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c b/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c index 567c1c302..57b4406bc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c +++ b/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. * Derived from libXfont1's utilbitmap.c (available via fontmisc.h). */ -/* Utility functions for reformating font bitmaps */ +/* Utility functions for reformatting font bitmaps */ static const unsigned char _reverse_byte[0x100] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 2881a4031..12b18e366 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1973,14 +1973,14 @@ void nxagentHandleSelectionNotifyFromXServer(XEvent *X) #endif /* - * The state machine is able to work in two phases. In the first - * phase we get the size of property data, in the second we get - * the actual data. We save a round-trip by requesting a prede- - * termined amount of data in a single GetProperty and by discar- - * ding the remaining part. This is not the optimal solution (we - * could get the remaining part if it doesn't fit in a single - * reply) but, at least with text, it should work in most situa- - * tions. + * The state machine is able to work in two phases. In the + * first phase we get the size of property data, in the second + * we get the actual data. We save a round-trip by requesting + * a predetermined amount of data in a single GetProperty and + * by discar- ding the remaining part. This is not the optimal + * solution (we could get the remaining part if it doesn't fit + * in a single reply) but, at least with text, it should work + * in most situations. */ setClientSelectionStage(index, SelectionStageQueryData); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 4163c7b71..a2087ead2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -117,7 +117,7 @@ /* debug individual subsystems */ #undef DEBUG_AUTOGRAB -/* aktivate subsystems if generic DEBUG is activated */ +/* activate subsystems if generic DEBUG is activated */ #ifdef DEBUG #ifndef DEBUG_AUTOGRAB #define DEBUG_AUTOGRAB diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h index 951e3d697..7e67c9d33 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h @@ -61,7 +61,7 @@ typedef enum _BackingStoreMode here means "nxclient": Enable or disable copy and paste operations from the user's desktop - to the NX session or vice versa. This option can take four values: + to the NX session or vice-versa. This option can take four values: client The content copied on the client can be pasted inside the NX session. @@ -70,7 +70,7 @@ typedef enum _BackingStoreMode on the client. both The copy & paste operations are allowed both between the - client and the NX session and viceversa. + client and the NX session and vice-versa. none The copy&paste operations between the client and the NX session are never allowed. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index addc81b79..470c804e2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -335,7 +335,7 @@ Bool nxagentDestroyPixmap(PixmapPtr pPixmap) { /* * For some pixmaps we receive the destroy only for the - * virtual. Infact to draw in the framebuffer we can use the + * virtual. In fact to draw in the framebuffer we can use the * virtual pixmap instead of the pointer to the real one. As the * virtual pixmap can collect references, we must transfer those * references to the real pixmap so we can continue as the destroy diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index fb530f788..ac62b3d7a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -558,7 +558,7 @@ void nxagentSetScreenSaverTime(void) * Returning False the SaveScreens() function (which calls this one) * tries to build a screen-saver creating a new window. In some cases * we do not want this so we return True. If we want the dix to take - * care fo blanking we return False. + * care of blanking we return False. */ static Bool nxagentSaveScreen(ScreenPtr pScreen, int what) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.c b/nx-X11/programs/Xserver/hw/nxagent/Trap.c index aa2b15bc9..430732250 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Trap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Trap.c @@ -35,8 +35,8 @@ Bool nxagentGCTrap = False; /* - * Set if we are enqueing an internal operation, CreateWindow and - * Reparent- Window. Used to remove any screen operation. + * Set if we are enqueuing an internal operation, CreateWindow and + * ReparentWindow. Used to remove any screen operation. */ Bool nxagentScreenTrap = False; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.h b/nx-X11/programs/Xserver/hw/nxagent/Trap.h index 80a88f223..2f2ce86c5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Trap.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Trap.h @@ -43,8 +43,8 @@ extern Bool nxagentGCTrap; /* - * Set if we are enqueing an internal operation, CreateWindow and - * Reparent- Window. Used to remove any screen operation. + * Set if we are enqueuing an internal operation, CreateWindow and + * ReparentWindow. Used to remove any screen operation. */ extern Bool nxagentScreenTrap; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index b84c71c10..75bdae510 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -2121,7 +2121,7 @@ void nxagentWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_expo #endif /* - * The problem: we want to synthetize the expose events internally, so + * The problem: we want to synthesize the expose events internally, so * that we reduce the time between a window operation and the corresp- * onding graphical output, but at the same time we need to take care * of the remote exposures, as we need to handle those cases where our diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c index e7955caca..416135f27 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c @@ -2259,7 +2259,7 @@ NXPackedImage *NXPackImage(Display *dpy, XImage *src_image, unsigned int method) * Note that we save a new memory allocation * by using the same image as source and des- * tination. This means that PackImage() must - * be able to handle ovelapping areas. + * be able to handle overlapping areas. */ #ifdef TEST_IMAGE @@ -2428,7 +2428,7 @@ XImage *NXInPlacePackImage(Display *dpy, XImage *src_image, unsigned int method) * Note that we save a new memory allocation * by using the same image as source and des- * tination. This means that PackImage() must - * be able to handle ovelapping areas. + * be able to handle overlapping areas. */ #ifdef TEST_IMAGE |