nxagent: delete trailing whitespace in many files

Please note that the NX*.c files still have trailing whitespace at
many locations. We keep it like that on purpose to make comparisons to
the files they are derived from easier.

22 files changed, 90 insertions, 94 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 174873e51..a3867f6a7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -480,7 +480,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
       return 2;
     }
     return 0;
-  } 
+  }
 
   if (!strcmp(argv[i], "-streaming"))
   {
@@ -542,7 +542,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     if (++i < argc &&
             sscanf(argv[i], "%ix%i", &width, &height) == 2 &&
                 width >= 32 && height >= 32)
-    { 
+    {
       nxagentChangeOption(TileWidth,  width);
       nxagentChangeOption(TileHeight, height);
       return 2;
@@ -582,13 +582,13 @@ int ddxProcessArgument(int argc, char *argv[], int i)
         nxagentChangeOption(AllScreens, False);
       }
       else
-      { 
-        if (nxagentUserGeometry.flag == 0) 
+      {
+        if (nxagentUserGeometry.flag == 0)
         {
-          nxagentUserGeometry.flag = XParseGeometry(argv[i], 
-                                                        &nxagentUserGeometry.X, 
-                                                            &nxagentUserGeometry.Y, 
-                                                                &nxagentUserGeometry.Width, 
+          nxagentUserGeometry.flag = XParseGeometry(argv[i],
+                                                        &nxagentUserGeometry.X,
+                                                            &nxagentUserGeometry.Y,
+                                                                &nxagentUserGeometry.Width,
                                                                     &nxagentUserGeometry.Height);
         }
       }
@@ -2025,12 +2025,12 @@ FIXME: In rootless mode the backing-store support is not functional yet.
      * need to check if this was set on the command line as this has
      * the priority over the option file.
      */
- 
+
     if (nxagentRenderEnable == UNDEFINED)
     {
       nxagentRenderEnable = True;
     }
-    
+
     if (nxagentRenderEnable == True)
     {
       nxagentAlphaEnabled = True;
@@ -2216,7 +2216,7 @@ void nxagentSetPackMethod(void)
 
     nxagentChangeOption(Adaptive, False);
   }
-  
+
   if (method == PACK_LOSSY || method == PACK_ADAPTIVE)
   {
     nxagentPackMethod = PACK_JPEG_16M_COLORS;
@@ -2433,7 +2433,7 @@ void nxagentSetDeferLevel(void)
   /*
    * Set the tile height.
    */
-  
+
   if (nxagentOption(TileHeight) != UNDEFINED)
   {
     #ifdef TEST
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index 6ce8b21e8..632f09440 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -225,7 +225,7 @@ static void finishWMDetection(Bool verbose)
   }
 }
 
-void nxagentWMDetect() 
+void nxagentWMDetect()
 {
   /* FIXME: verbose is always false, there's no code to set it to true */
   Bool verbose = False;
@@ -508,7 +508,7 @@ static void nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
     name_list[i] = atomNameList[i];
     atom_list[i] = None;
   }
-  
+
   for (unsigned int i = 0; i < privLastAtom; i++)
   {
     name_list[count + i] = (char *)privAtomMap[i].string;
@@ -623,7 +623,7 @@ static AtomMap* nxagentFindAtomByName(char *string, unsigned int length)
 {
   for (unsigned int i = 0; i < privLastAtom; i++)
   {
-    if ((length == privAtomMap[i].length) && 
+    if ((length == privAtomMap[i].length) &&
             (strcmp(string, privAtomMap[i].string) == 0))
     {
       return (privAtomMap + i);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
index 518c016c4..7119e2886 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
@@ -115,7 +115,7 @@ int nxagentCheckBinder(int argc, char *argv[], int i)
      * getenv(). It is to be decided how to handle the values of type
      * string in the Options repository.
      */
-     
+
     nxagentChangeOption(BinderOptions, display);
 
     return 2;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index 08b2d8feb..ff772f6ef 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -434,7 +434,7 @@ void nxagentWakeupByReset(ClientPtr client)
  */
 
 #define WAIT_ALL_EVENTS
- 
+
 #ifndef WAIT_ALL_EVENTS
 
 static Bool nxagentWaitWakeupBySplitPredicate(Display *disp, XEvent *event, XPointer ptr)
@@ -514,7 +514,7 @@ void nxagentWaitWakeupBySplit(ClientPtr client)
       }
 
       #endif
- 
+
       return;
     }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
index 9e14a82bb..aed0c367f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
@@ -145,7 +145,7 @@ void nxagentRedirectDefaultWindows(void)
      * agent window disappears. To make things even more weird, this
      * happens only at reconnection.
      */
- 
+
     XCompositeRedirectSubwindows(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum],
                                      CompositeRedirectAutomatic);
   }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 2facf1df3..f0ebbc5ca 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -286,7 +286,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
           totalReconnectedPixmaps++;
 
           fprintf(stderr, "%s: Reconnecting pixmap at [%p] [%dx%d] "
-                      "Depth [%d] Size [%d]. Total size [%d]. Total reconnected pixmaps [%d].\n", 
+                      "Depth [%d] Size [%d]. Total size [%d]. Total reconnected pixmaps [%d].\n",
                           __func__, (void *) pDrawable, width, height, depth, length,
                               totalLength, totalReconnectedPixmaps);
         }
@@ -460,7 +460,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
                           nxagentDrawableType(pDrawable), (void *) pDrawable);
       #endif
 
-     goto nxagentSynchronizeRegionFree; 
+     goto nxagentSynchronizeRegionFree;
     }
 
     /*
@@ -724,7 +724,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
            */
 
           RegionSubtract(nxagentPixmapCorruptedRegion(nxagentDrawableBitmap(pDrawable)),
-                              nxagentPixmapCorruptedRegion(nxagentDrawableBitmap(pDrawable)), &tileRegion); 
+                              nxagentPixmapCorruptedRegion(nxagentDrawableBitmap(pDrawable)), &tileRegion);
 
           /*
            * The drawable's corrupted region can be cleared if the
@@ -920,7 +920,7 @@ nxagentSynchronizeRegionStop:
         int y = RegionRects(&collectedUpdates)[i].y1;
         int w = RegionRects(&collectedUpdates)[i].x2 - RegionRects(&collectedUpdates)[i].x1;
         int h = RegionRects(&collectedUpdates)[i].y2 - RegionRects(&collectedUpdates)[i].y1;
-       
+
         if (nxagentOption(Shadow) &&
                 (nxagentOption(XRatio) != DONT_SCALE ||
                     nxagentOption(YRatio) != DONT_SCALE))
@@ -2788,7 +2788,7 @@ void nxagentUnmarkExposedRegion(WindowPtr pWin, RegionPtr pRegion, RegionPtr pOt
     RegionInit(&clipRegion, NullBox, 1);
 
     RegionCopy(&clipRegion, pRegion);
-    
+
     if (pOther != NullRegion && !RegionNil(pOther))
     {
       RegionUnion(&clipRegion, &clipRegion, pOther);
@@ -2858,7 +2858,7 @@ void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPt
     #ifdef TEST
     fprintf(stderr, "nxagentSendBackgroundExpose: Pixmap background [%dx%d] is "
                 "smaller than window [%dx%d]. Going to expose the winSize.\n",
-                    pBackground -> drawable.width, pBackground -> drawable.height, 
+                    pBackground -> drawable.width, pBackground -> drawable.height,
                         pWin -> drawable.width, pWin -> drawable.height);
     #endif
 
@@ -2913,11 +2913,11 @@ void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPt
   /*
    * Reduce the overall region to expose.
    */
-  
+
   RegionTranslate(&expose, -pWin -> drawable.x, -pWin -> drawable.y);
-  
+
   RegionSubtract(pExpose, pExpose, &expose);
-  
+
   RegionTranslate(&expose, pWin -> drawable.x, pWin -> drawable.y);
 
   miWindowExposures(pWin, &expose, &expose);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
index 9ca7711b2..91f36e496 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
@@ -312,7 +312,7 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen)
 
   for (int i = 2; i < nSizes - 1; i++)
   {
-    if ((w[i] <= maxWidth * 3 / 4) && 
+    if ((w[i] <= maxWidth * 3 / 4) &&
             (h[i] <= maxHeight * 3 / 4) &&
                 (w[i] >= w[0]) &&
                     (h[i] >= h[0]))
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c
index b956bb8df..46e9cfe6f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GC.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c
@@ -219,13 +219,13 @@ void nxagentValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 
   if (!pGC -> tileIsPixel && !nxagentPixmapIsVirtual(pGC -> tile.pixmap))
   {
-    pGC -> tile.pixmap = nxagentVirtualPixmap(pGC -> tile.pixmap); 
+    pGC -> tile.pixmap = nxagentVirtualPixmap(pGC -> tile.pixmap);
   }
 
   PixmapPtr lastTile = pGC -> tile.pixmap;
 
   PixmapPtr lastStipple = pGC->stipple;
-  
+
   if (lastStipple)
   {
     pGC->stipple = nxagentVirtualPixmap(pGC->stipple);
@@ -403,7 +403,7 @@ void nxagentChangeGC(GCPtr pGC, unsigned long mask)
       values.font = nxagentFont(pGC->font);
       changeFlag += nxagentTestGC(values.font, font);
     }
-  } 
+  }
 
   CHECKGCVAL(GCSubwindowMode, subwindow_mode, pGC->subWindowMode);
   CHECKGCVAL(GCGraphicsExposures, graphics_exposures, pGC->graphicsExposures);
@@ -595,7 +595,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects)
     case CT_UNSORTED:
     {
       if (!clipsMatch && !nxagentGCTrap)
-      {    
+      {
         XSetClipRectangles(nxagentDisplay, nxagentGC(pGC),
                                pGC->clipOrg.x, pGC->clipOrg.y,
                                    (XRectangle *)pValue, nRects, Unsorted);
@@ -896,7 +896,7 @@ static void nxagentReconnectGC(void *param0, XID param1, void * param2)
     #endif
   }
 
-  #ifdef DEBUG 
+  #ifdef DEBUG
   fprintf(stderr, "nxagentReconnectGC: GC at [%p].\n", (void *) pGC);
   #endif
 
@@ -1036,7 +1036,7 @@ void nxagentDisconnectGC(void * p0, XID x1, void * p2)
 
   if (!*pBool || !pGC)
   {
-    if (!pGC) 
+    if (!pGC)
     {
       #ifdef WARNING
       fprintf(stderr, "nxagentDisconnectGC: WARNING! pGC is NULL.\n");
@@ -1050,7 +1050,7 @@ void nxagentDisconnectGC(void * p0, XID x1, void * p2)
     PixmapPtr pMap = pGC -> stipple;
     nxagentDisconnectPixmap(nxagentRealPixmap(pMap), 0, pBool);
   }
-} 
+}
 
 Bool nxagentDisconnectAllGCs(void)
 {
@@ -1385,7 +1385,7 @@ GCPtr nxagentCreateGraphicContext(int depth)
    */
 
   nxagentGraphicContextsPtr nxagentGCs = realloc(nxagentGraphicContexts, (nxagentGraphicContextsSize + 1) * sizeof(nxagentGraphicContextsRec));
-   
+
   if (nxagentGCs == NULL)
   {
     #ifdef WARNING
@@ -1471,4 +1471,3 @@ void nxagentDisconnectGraphicContexts(void)
 
   return;
 }
-
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index bac9947f0..176e087a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -87,7 +87,7 @@ static int nxagentSaveGCTrap;
 { \
   nxagentGCTrap = nxagentSaveGCTrap; \
 }
- 
+
 /*
  * This is currently unused.
  */
@@ -131,7 +131,7 @@ void nxagentSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc,
   else
   {
     fbSetSpans(pDrawable, pGC, pSrc, pPoints, pWidths, nSpans, fSorted);
-  } 
+  }
 }
 
 void nxagentGetSpans(DrawablePtr pDrawable, int maxWidth, xPoint *pPoints,
@@ -577,7 +577,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
   #ifdef TEST
   fprintf(stderr, "nxagentCopyArea: Image src [%s:%p], dst [%s:%p] (%d,%d) -> (%d,%d) size (%d,%d)\n",
               (pSrcDrawable -> type == DRAWABLE_PIXMAP) ? "PIXMAP" : "WINDOW", (void *) pSrcDrawable,
-                      (pDstDrawable -> type == DRAWABLE_PIXMAP) ? "PIXMAP" : "WINDOW", 
+                      (pDstDrawable -> type == DRAWABLE_PIXMAP) ? "PIXMAP" : "WINDOW",
                           (void *) pDstDrawable, srcx, srcy, dstx, dsty, width, height);
   #endif
 
@@ -669,7 +669,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
     if (pSrcDrawable -> type == DRAWABLE_PIXMAP &&
             pDstDrawable -> type == DRAWABLE_PIXMAP)
     {
-      return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable), 
+      return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable),
                           nxagentVirtualDrawable(pDstDrawable),
                             pGC, srcx, srcy, width, height, dstx, dsty);
     }
@@ -823,7 +823,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
                     (void *) nxagentVirtualDrawable(pDstDrawable));
     #endif
 
-    return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable), 
+    return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable),
                           nxagentVirtualDrawable(pDstDrawable),
                               pGC, srcx, srcy, width, height, dstx, dsty);
   }
@@ -873,7 +873,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
     }
   }
 
-  return miHandleExposures(pSrcDrawable, pDstDrawable, pGC, 
+  return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
                                srcx, srcy, width, height, dstx, dsty, 0);
 }
 
@@ -895,7 +895,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
     if (pSrcDrawable -> type == DRAWABLE_PIXMAP &&
             pDstDrawable -> type == DRAWABLE_PIXMAP)
     {
-      return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable), 
+      return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable),
                            nxagentVirtualDrawable(pDstDrawable),
                              pGC, srcx, srcy, width, height, dstx, dsty, plane);
     }
@@ -1041,7 +1041,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
                     (void *) nxagentVirtualDrawable(pDstDrawable));
     #endif
 
-    return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable), 
+    return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable),
                          nxagentVirtualDrawable(pDstDrawable),
                            pGC, srcx, srcy, width, height, dstx, dsty, plane);
   }
@@ -1061,7 +1061,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
                             srcx, srcy, width, height, dstx, dsty, plane);
   }
 
-  return miHandleExposures(pSrcDrawable, pDstDrawable, pGC, 
+  return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
                                srcx, srcy, width, height, dstx, dsty, plane);
 }
 
@@ -1507,7 +1507,7 @@ void nxagentPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
   if (nRectangles == 1)
   {
     fprintf(stderr, "nxagentPolyFillRect: Drawable at [%p] GC at [%p] FillStyle [%d] Rectangle [%d,%d][%d,%d].\n",
-                (void *) pDrawable, (void *) pGC, pGC -> fillStyle, 
+                (void *) pDrawable, (void *) pGC, pGC -> fillStyle,
                     pRectangles -> x, pRectangles -> y, pRectangles -> width, pRectangles -> height);
   }
   else
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 639e3429e..77d498606 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -425,7 +425,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
   }
 
   #endif /* #ifdef DYNAMIC_DISPLAY_BUFFER */
-  
+
   /*
    * Dispatch to the clients the events that may have become
    * available.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index c033bf70d..a8ccef8ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -629,7 +629,7 @@ FIXME: Should use these.
                         pRegion -> extents.y1, pRegion -> extents.x2, pRegion -> extents.y2,
                             (void *) pDrawable);
         #endif
-  
+
         nxagentMarkCorruptedRegion(pDrawable, pRegion);
 
         goto nxagentPutImageEnd;
@@ -647,7 +647,7 @@ FIXME: Should use these.
                       pRegion -> extents.y1, pRegion -> extents.x2, pRegion -> extents.y2,
                           (void *) pDrawable);
       #endif
-  
+
       nxagentMarkCorruptedRegion(pDrawable, pRegion);
 
       goto nxagentPutImageEnd;
@@ -915,9 +915,9 @@ void nxagentRealizeImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
     #ifdef WARNING
     fprintf(stderr, "nxagentRealizeImage: WARNING! Visual not found. Using default visual.\n");
     #endif
-    
+
     pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
-  } 
+  }
 
   /*
    * Get bytes per line according to format.
@@ -1089,7 +1089,7 @@ FIXME: Should use an unpack resource here.
   if (client == NULL)
   {
     client = serverClient;
- 
+
     #ifdef TEST
     fprintf(stderr, "nxagentPutSubImage: WARNING! Using the server client with index [%d].\n",
                 client -> index);
@@ -1405,7 +1405,7 @@ FIXME: There should be a callback registered by the agent that
      * Add the image only if we have a valid checksum. This is the
      * case only if we originally tried to find the image in cache.
      */
-      
+
     if (NXImageCacheSize > 0 && packedChecksum != NULL)
     {
       #ifdef DEBUG
@@ -1608,7 +1608,7 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio,
   if (newImage -> data == NULL)
   {
     SAFE_free(newImage);
-    
+
     #ifdef PANIC
     fprintf(stderr, "nxagentScaleImage: PANIC! Failed to create the target image data.\n");
     #endif
@@ -1703,4 +1703,3 @@ char *nxagentAllocateImageData(int width, int height, int depth, int *length, in
 
   return data;
 }
-
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index fe51b595a..ec6521cce 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -269,7 +269,7 @@ void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[])
    */
 
   if (nxagentOption(ImageRateLimit) != 0)
-  { 
+  {
     fprintf(stderr, "Info: Image rate limit set to %u kB/s.\n", nxagentOption(ImageRateLimit));
   }
 
@@ -380,10 +380,10 @@ FIXME: These variables, if not removed at all because have probably
 #else
   nxagentFontPrivateIndex = AllocateFontPrivateIndex();
 #endif /* HAS_XFONT2 */
-  RT_NX_FONT = CreateNewResourceType(nxagentDestroyNewFontResourceType); 
+  RT_NX_FONT = CreateNewResourceType(nxagentDestroyNewFontResourceType);
   nxagentClientPrivateIndex = AllocateClientPrivateIndex();
   nxagentPixmapPrivateIndex = AllocatePixmapPrivateIndex();
-  RT_NX_PIXMAP = CreateNewResourceType(nxagentDestroyNewPixmapResourceType); 
+  RT_NX_PIXMAP = CreateNewResourceType(nxagentDestroyNewPixmapResourceType);
 
   RT_NX_CORR_BACKGROUND = CreateNewResourceType(nxagentDestroyCorruptedBackgroundResource);
   RT_NX_CORR_WINDOW = CreateNewResourceType(nxagentDestroyCorruptedWindowResource);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 2142adc8e..636414c40 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1292,7 +1292,7 @@ void nxagentInitXkbWrapper(void)
 }
 
 void nxagentDisableXkbExtension(void)
-{  
+{
   #ifdef TEST
   fprintf(stderr, "%s: Called.\n", __func__);
   #endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Literals.h b/nx-X11/programs/Xserver/hw/nxagent/Literals.h
index cef2904d1..9547b5aab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Literals.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Literals.h
@@ -29,7 +29,7 @@
  * opcode to the name of the X request.
  */
 
-static char *nxagentRequestLiteral[] = 
+static char *nxagentRequestLiteral[] =
 {
   "None",
   "CreateWindow",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index cd57182a1..77da4c765 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -550,7 +550,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
     nxagentFreeTimeoutTimer();
 
     /* FIXME: maybe move the code up to the KillAllClients() call to ddxBeforeReset? */
-    if ((dispatchException & DE_RESET) && 
+    if ((dispatchException & DE_RESET) &&
             (serverGeneration > nxagentMaxAllowedResets))
     {
         dispatchException &= ~DE_RESET;
@@ -568,7 +568,7 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
        * error on the display and wait until the
        * NX transport is gone.
        */
-  
+
       fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString());
       saveAgentState("TERMINATING");
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index d3c8c7150..ddcd6443c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -234,7 +234,7 @@ typedef struct _AgentOptions
    */
   Bool Reset;
 
-  /* 
+  /*
    * Geometry of the agent root window, relative to the agent default
    * window.
    */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
index 8aaa9ecd8..1b415718b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
@@ -75,7 +75,7 @@ int nxagentUniquePixels(XImage *image)
    */
 
   int total = image -> width * image -> height;
-  
+
   int step = total / elements;
 
   if (step < PIXEL_STEP)
@@ -91,7 +91,7 @@ int nxagentUniquePixels(XImage *image)
   /*
    * Shift at the left after each scanline.
    */
-   
+
   if (image -> bytes_per_line % step == 0)
   {
     step++;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 30e5d1e3f..6d9be3a90 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -287,7 +287,7 @@ PixmapPtr nxagentCreatePixmap(ScreenPtr pScreen, int width, int height,
    * pointers to pVirtualPixmap. We should also remove the copy of id
    * and use the one of the real pixmap.
    */
-   
+
   pVirtualPriv -> id = pPixmapPriv -> id;
   pVirtualPriv -> mid = 0;
 
@@ -783,7 +783,7 @@ void nxagentReconnectPixmap(void *p0, XID x1, void *p2)
       #endif
     }
 
-     
+
     if (nxagentDrawableStatus((DrawablePtr) pPixmap) == NotSynchronized)
     {
       if (nxagentIsCorruptedBackground(pPixmap) == 1)
@@ -1238,9 +1238,9 @@ FIXME: If the pixmap has a different depth from the window, the
     #ifdef WARNING
     fprintf(stderr, "nxagentPixmapOnShadowDisplay: WARNING! Visual not found. Using default visual.\n");
     #endif
-    
+
     pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
-  } 
+  }
 
   XImage *image = XCreateImage(nxagentDisplay, pVisual,
                                   depth, format, 0, (char *) data,
@@ -1394,9 +1394,9 @@ Bool nxagentFbOnShadowDisplay(void)
     #ifdef WARNING
     fprintf(stderr, "nxagentFbOnShadowDisplay: WARNING! Visual not found. Using default visual.\n");
     #endif
-    
+
     pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
-  } 
+  }
 
   XImage *image = XCreateImage(nxagentDisplay, pVisual,
                                   depth, format, 0, (char *) data,
@@ -1480,5 +1480,3 @@ void nxagentPrintResources(void)
 }
 
 #endif
-
-
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 205940ed7..386a4d273 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -759,7 +759,7 @@ void nxagentDestroyPicture(PicturePtr pPicture)
 
   XRenderFreePicture(nxagentDisplay,
                      nxagentPicturePriv(pPicture) -> picture);
-  
+
   #ifdef DEBUG
   XSync(nxagentDisplay, 0);
   #endif
@@ -789,8 +789,8 @@ int nxagentChangePictureClip(PicturePtr pPicture, int clipType, int nRects,
     {
       #ifdef DEBUG
       fprintf(stderr, "nxagentChangePictureClip: Clip type is [CT_PIXMAP].\n");
-      #endif      
-  
+      #endif
+
       /*
        * if(!nRects)
        * {
@@ -820,7 +820,7 @@ FIXME: Is this useful or just a waste of bandwidth?
       #endif
 
       break;
-    }   
+    }
     case CT_NONE:
     {
       #ifdef DEBUG
@@ -859,7 +859,7 @@ FIXME: Is this useful or just a waste of bandwidth?
       #ifdef DEBUG
       fprintf(stderr, "nxagentChangePictureClip: Clip type is [CT_REGION].\n");
       #endif
-    
+
       reg = XCreateRegion();
 
       for (index = 0; index <= nRects; index++, rects++)
@@ -889,7 +889,7 @@ FIXME: Is this useful or just a waste of bandwidth?
       #ifdef DEBUG
       XSync(nxagentDisplay, 0);
       #endif
-  
+
       XDestroyRegion(reg);
 
       break;
@@ -1025,7 +1025,7 @@ void nxagentChangePicture(PicturePtr pPicture, Mask mask)
     {
       valuemask |= CPPolyEdge;
       nxagentSetPictureRemoteValue(pPicture, poly_edge, attributes.poly_edge);
-    } 
+    }
   }
 
   if (mask & CPPolyMode)
@@ -1260,8 +1260,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
   #ifdef TEST
   if ((pSrc && pSrc->pDrawable) && (pDst && pDst->pDrawable)) {
       fprintf(stderr, "nxagentGlyphs: Called with source [%s][%p] destination [%s][%p] and size id [%d].\n",
-                  (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pSrc, 
-                      (pDst -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pDst, 
+                  (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pSrc,
+                      (pDst -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pDst,
                           sizeID);
   }
   #endif
@@ -1313,7 +1313,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
   {
     RegionPtr pRegion = nxagentCreateRegion(pDst -> pDrawable, NULL, glyphBox.x1, glyphBox.y1,
 					        glyphBox.x2 - glyphBox.x1, glyphBox.y2 - glyphBox.y1);
-    
+
     if (RegionNil(pRegion))
     {
       #ifdef TEST
@@ -1356,7 +1356,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
       #ifdef DEBUG
       if (pSrc && pSrc->pDrawable) {
         fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p] "
-                    "with geometry [%d,%d,%d,%d].\n", 
+                    "with geometry [%d,%d,%d,%d].\n",
                         (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"),
                             (void *) pSrc -> pDrawable, pSrc -> pDrawable -> x, pSrc -> pDrawable -> y,
                                 pSrc -> pDrawable -> x + pSrc -> pDrawable -> width,
@@ -1404,7 +1404,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
       #ifdef DEBUG
       if (pDst && pDst->pDrawable) {
         fprintf(stderr, "nxagentGlyphs: Synchronizing destination [%s] at [%p] "
-                    "with geometry [%d,%d,%d,%d].\n", 
+                    "with geometry [%d,%d,%d,%d].\n",
                         (pDst -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"),
                             (void *) pDst -> pDrawable, pDst -> pDrawable -> x, pDst -> pDrawable -> y,
                                 pDst -> pDrawable -> x + pDst -> pDrawable -> width,
@@ -1480,7 +1480,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 
         x += glyph -> info.xOff;
         y += glyph -> info.yOff;
-        
+
         #ifdef TEST
         fprintf(stderr, "nxagentGlyphs: Glyph at index [%d] has offset [%d,%d] and "
                     "position [%d,%d].\n", i, elements -> nchars, glyph -> info.xOff,
@@ -2697,8 +2697,8 @@ void nxagentRenderCreateRadialGradient(PicturePtr pPicture, xPointFixed *inner,
 
 void nxagentRenderCreateConicalGradient(PicturePtr pPicture,
                                             xPointFixed *center,
-                                                xFixed angle, int nStops, 
-                                                    xFixed *stops, 
+                                                xFixed angle, int nStops,
+                                                    xFixed *stops,
                                                         xRenderColor *colors)
 {
   if (nxagentRenderEnable == False)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 99cc3a280..198ead5eb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -406,7 +406,7 @@ void nxagentRegionSplit(DrawablePtr pDrawable, RegionPtr pRegion)
   nxagentCheckSplit(pDrawable, pResource);
 
   #endif
-  
+
   if (pResource == NULL)
   {
     #ifdef PANIC
@@ -579,7 +579,7 @@ void nxagentValidateSplit(DrawablePtr pDrawable, RegionPtr pRegion)
   nxagentCheckSplit(pDrawable, pResource);
 
   #endif
-  
+
   #ifdef TEST
   fprintf(stderr, "nxagentValidateSplit: Checking the region for resource [%d] "
               "and drawable at [%p].\n", pResource -> split, (void *) pDrawable);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
index 6be82148f..9e338ad96 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
@@ -94,7 +94,7 @@ Visual *nxagentVisualFromID(ScreenPtr pScreen, VisualID visual)
       return nxagentVisual(&pScreen->visuals[i]);
     }
   }
-  
+
   return NULL;
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
index 0cc60410d..477fd3f95 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
@@ -157,7 +157,7 @@ int CleanZImage(XImage *image)
     }
   }
 
-  /* 
+  /*
    * Clean the padding bytes at the real
    * end of the buffer.
    */