From 21079cf31ab2958472714984a8259455e93a2dfd Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 20:52:23 +0100
Subject: Drawable.c: fix segfault

Revert a wrong change that misteriously slipped in via the comment
reformatting commit 0133d4619.

Fixes ArcticaProject/nx-libs#893
---
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 7c69c99d9..199f01cd8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -405,7 +405,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
                                         RegionNumRects(nxagentCorruptedRegion((DrawablePtr) nxagentDrawableBitmap(pDrawable))));
     #endif
 
-    RegionPtr clipRegion = nxagentCreateRegion(pDrawable, NULL, 0, 0, pDrawable -> width, pDrawable -> height);
+    clipRegion = nxagentCreateRegion(pDrawable, NULL, 0, 0, pDrawable -> width, pDrawable -> height);
 
     /*
      * Intersecting the viewable region of the drawable with the
-- 
cgit v1.2.3


From c137c2a4d68cb17802275739a40cf0ad7eda9bc8 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 21:01:34 +0100
Subject: Clipboard.c: fix shadowed variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this was harmless but not nice nevertheless.

Clipboard.c: In function ‘nxagentConvertSelection’:
Clipboard.c:1850:9: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
     int i = nxagentFindCurrentSelectionIndex(selection);
         ^
Clipboard.c:1736:7: note: shadowed declaration is here
   int i = nxagentFindCurrentSelectionIndex(selection);
       ^
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 47eaa946d..1d5054fbb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1733,13 +1733,15 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
     return 0;
   }
 
-  int i = nxagentFindCurrentSelectionIndex(selection);
-  if (i < NumCurrentSelections && IS_INTERNAL_OWNER(i))
   {
-    /*
-     * There is a client owner on the agent side, let normal dix stuff happen.
-     */
-    return 0;
+    int i = nxagentFindCurrentSelectionIndex(selection);
+    if (i < NumCurrentSelections && IS_INTERNAL_OWNER(i))
+    {
+      /*
+       * There is a client owner on the agent side, let normal dix stuff happen.
+       */
+      return 0;
+    }
   }
 
   /*
-- 
cgit v1.2.3


From 7031219d94573bcf1ae4213cb62182a1002e0a7b Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 21:13:02 +0100
Subject: Events.c: fix two shadowed variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Events.c: In function ‘nxagentDispatchEvents’:
Events.c:1241:21: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local]
           ScreenPtr pScreen = nxagentScreen(X.xbutton.window);
                     ^~~~~~~
Events.c:827:13: note: shadowed declaration is here
   ScreenPtr pScreen = NULL;
             ^~~~~~~
Events.c:1383:19: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local]
         ScreenPtr pScreen = nxagentScreen(X.xmotion.window);
                   ^~~~~~~
Events.c:827:13: note: shadowed declaration is here
   ScreenPtr pScreen = NULL;
             ^~~~~~~

Events.c: In function ‘nxagentDispatchEvents’:
Events.c:1383:19: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local]
         ScreenPtr pScreen = nxagentScreen(X.xmotion.window);
                   ^~~~~~~
Events.c:827:13: note: shadowed declaration is here
   ScreenPtr pScreen = NULL;
             ^~~~~~~
---
 nx-X11/programs/Xserver/hw/nxagent/Events.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 597359cf1..a06d52a2a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1238,7 +1238,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
           int resource = nxagentWaitForResource(NXGetCollectGrabPointerResource,
                                                     nxagentCollectGrabPointerPredicate);
 
-          ScreenPtr pScreen = nxagentScreen(X.xbutton.window);
+          pScreen = nxagentScreen(X.xbutton.window);
           viewportCursor = XCreateFontCursor(nxagentDisplay, XC_fleur);
 
           NXCollectGrabPointer(nxagentDisplay, resource,
@@ -1380,7 +1380,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
       }
       case MotionNotify:
       {
-        ScreenPtr pScreen = nxagentScreen(X.xmotion.window);
+        pScreen = nxagentScreen(X.xmotion.window);
 
         #ifdef TEST
         fprintf(stderr, "%s: Going to handle new MotionNotify event.\n", __func__);
-- 
cgit v1.2.3


From a93e25077c84f08a1aeea88968c3629909961a92 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 21:25:31 +0100
Subject: Display.c: fix shadowed/unused variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Display.c: In function ‘nxagentInitAndCheckVisuals’:
Display.c:2273:10: warning: declaration of ‘matched’ shadows a previous local [-Wshadow=compatible-local]
     bool matched = false;
          ^~~~~~~
Display.c:2258:8: note: shadowed declaration is here
   bool matched;
        ^~~~~~~
Display.c:2258:8: warning: unused variable ‘matched’ [-Wunused-variable]
---
 nx-X11/programs/Xserver/hw/nxagent/Display.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index dad6bfb2b..3284857c2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -2255,7 +2255,6 @@ static int nxagentInitAndCheckVisuals(int flexibility)
 {
   /* FIXME: does this also need work? */
 
-  bool matched;
   bool compatible = true;
 
   long viMask = VisualScreenMask;
-- 
cgit v1.2.3


From 7977b9f8f1c6b0ab9a37ce33fc53b8ef36400262 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 21:44:30 +0100
Subject: Pixmap.c: fix variable shadowing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pixmap.c: In function ‘nxagentDisconnectAllPixmaps’:
Pixmap.c:677:19: warning: declaration of ‘r’ shadows a previous local [-Wshadow=compatible-local]
   for (int i = 0, r = 1; i < MAXCLIENTS; r = 1, i++)
                   ^
Pixmap.c:652:7: note: shadowed declaration is here
   int r = 1;
       ^
Pixmap.c: In function ‘nxagentReconnectAllPixmaps’:
Pixmap.c:840:19: warning: declaration of ‘result’ shadows a previous local [-Wshadow=compatible-local]
   for (int i = 0, result = 1; i < MAXCLIENTS; result = 1, i++)
                   ^~~~~~
Pixmap.c:807:8: note: shadowed declaration is here
   Bool result = 1;
        ^~~~~~
---
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c    | 17 +++++++++++++++--
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 695d14618..bb0e7302a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -674,7 +674,14 @@ Bool nxagentDisconnectAllPixmaps(void)
 
   #endif
 
-  for (int i = 0, r = 1; i < MAXCLIENTS; r = 1, i++)
+  /*
+   * FIXME: This is a bit cumbersome:
+   * - as stated below nxagentDisconnectPixmap will not modify r, so the result will stay at 1
+   * - at the end of each iteration r will be set to 1 anyway.
+   * So at the end of the loop r will always be 1. So the whole function will always return 1...
+   */
+  r = 1;
+  for (int i = 0; i < MAXCLIENTS; r = 1, i++)
   {
     if (clients[i])
     {
@@ -837,7 +844,13 @@ Bool nxagentReconnectAllPixmaps(void *p0)
 
   #endif
 
-  for (int i = 0, result = 1; i < MAXCLIENTS; result = 1, i++)
+  /*
+   * FIXME: This is a bit cumbersome: at the end of each iteration
+   * result will be reset to 1. Therefore at loop exit result will
+   * always be 1 meaning the whole function will always return 1...
+   */
+  result = 1;
+  for (int i = 0; i < MAXCLIENTS; result = 1, i++)
   {
     if (clients[i] != NULL)
     {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 86d3ba502..ff7033c6c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -519,6 +519,7 @@ Bool nxagentReconnectSession(void)
 
   nxagentEmptyBSPixmapList();
 
+  /* FIXME: nxagentReconnectAllPixmaps will always return 1 */
   if (nxagentReconnectAllPixmaps(reconnectLossyLevel[PIXMAP_STEP]) == 0)
   {
     failedStep = PIXMAP_STEP;
-- 
cgit v1.2.3


From 33fbc6211cdc9184b1cf7a054a895dc43599afb5 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 21:52:15 +0100
Subject: Pixmap.c: drop unused return code for nxagentDisconnectAllPixmaps

---
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c  | 17 ++++++-----------
 nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index bb0e7302a..565394c65 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -647,9 +647,9 @@ void nxagentDisconnectPixmap(void *p0, XID x1, void *p2)
   }
 }
 
-Bool nxagentDisconnectAllPixmaps(void)
+void nxagentDisconnectAllPixmaps(void)
 {
-  int r = 1;
+  int r;
 
   #ifdef TEST
   fprintf(stderr, "nxagentDisconnectAllPixmaps: Going to iterate through pixmap resources.\n");
@@ -661,6 +661,7 @@ Bool nxagentDisconnectAllPixmaps(void)
    * too.
    */
 
+  r = 1;
   FindClientResourcesByType(clients[serverClient -> index], RT_NX_PIXMAP, nxagentDisconnectPixmap, &r);
 
   #ifdef WARNING
@@ -674,14 +675,7 @@ Bool nxagentDisconnectAllPixmaps(void)
 
   #endif
 
-  /*
-   * FIXME: This is a bit cumbersome:
-   * - as stated below nxagentDisconnectPixmap will not modify r, so the result will stay at 1
-   * - at the end of each iteration r will be set to 1 anyway.
-   * So at the end of the loop r will always be 1. So the whole function will always return 1...
-   */
-  r = 1;
-  for (int i = 0; i < MAXCLIENTS; r = 1, i++)
+  for (int i = 0; i < MAXCLIENTS; i++)
   {
     if (clients[i])
     {
@@ -689,6 +683,7 @@ Bool nxagentDisconnectAllPixmaps(void)
       fprintf(stderr, "nxagentDisconnectAllPixmaps: Going to disconnect pixmaps of client [%d].\n", i);
       #endif
 
+      r = 1;
       FindClientResourcesByType(clients[i], RT_PIXMAP, nxagentDisconnectPixmap, &r);
 
       #ifdef WARNING
@@ -708,7 +703,7 @@ Bool nxagentDisconnectAllPixmaps(void)
   fprintf(stderr, "nxagentDisconnectAllPixmaps: Pixmaps disconnection completed.\n");
   #endif
 
-  return r;
+  return;
 }
 
 void nxagentReconnectPixmap(void *p0, XID x1, void *p2)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
index 00cc39c5f..d35cd4c30 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h
@@ -132,7 +132,7 @@ RegionPtr nxagentCreateRegion(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
 void nxagentReconnectPixmap(void *p0, XID x1, void *p2);
 Bool nxagentReconnectAllPixmaps(void *p0);
 void nxagentDisconnectPixmap(void *p0, XID x1, void* p2);
-Bool nxagentDisconnectAllPixmaps(void);
+void nxagentDisconnectAllPixmaps(void);
 
 int nxagentDestroyNewPixmapResourceType(void * p, XID id);
 
-- 
cgit v1.2.3


From 32b64d7d78a7986d3887c6892dd36be205897d80 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 21:57:43 +0100
Subject: Cursor.c: drop unused return code for nxagentDisconnectAllCursor

---
 nx-X11/programs/Xserver/hw/nxagent/Cursor.c    | 4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Cursor.h    | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
index 0c667a00c..bafb30cea 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
@@ -487,7 +487,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2)
   }
 }
 
-Bool nxagentDisconnectAllCursor(void)
+void nxagentDisconnectAllCursor(void)
 {
   Bool r = True;
 
@@ -518,7 +518,7 @@ Bool nxagentDisconnectAllCursor(void)
     nxagentDisconnectCursor(grab -> cursor, 0, &r);
   }
 
-  return r;
+  return;
 }
 
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
index b115dfa38..e857834df 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
@@ -112,6 +112,6 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2);
 void nxagentReconnectCursor(void * p0, XID x1, void * p2);
 void nxagentReDisplayCurrentCursor(void);
 Bool nxagentReconnectAllCursor(void *p0);
-Bool nxagentDisconnectAllCursor(void);
+void nxagentDisconnectAllCursor(void);
 
 #endif /* __Cursor_H__ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index ff7033c6c..cfa0ec804 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -83,7 +83,7 @@ extern Bool nxagentReconnectAllPicture(void*);
 
 extern Bool nxagentDisconnectAllPicture(void);
 extern Bool nxagentDisconnectAllWindows(void);
-extern Bool nxagentDisconnectAllCursor(void);
+extern void nxagentDisconnectAllCursor(void);
 
 extern Bool nxagentReconnectFailedFonts(void*);
 extern Bool nxagentInstallFontServerPath(void);
-- 
cgit v1.2.3


From fbfef7e62afa32f95c6d8e97aba6f13ab3493332 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 8 Jan 2020 23:43:15 +0100
Subject: Drawable.c: fix logic broken by scope cleanup

xp must be declared outside the while loop!

xp was reset in each interation despite being increased at the
iteration's end!

To protect against this happening again replace the while loop by a
for loop that references xp.

Bug introduced by d94f472744355c71987d145727aecace1e8455b6
---
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 199f01cd8..7f1d2dec5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -2261,11 +2261,11 @@ void nxagentPointsToDirtyRegion(DrawablePtr pDrawable, int mode,
 {
   RegionPtr pRegion = RegionCreate(NullBox, 1);
 
-  int np = nPoints;
-  while (np--)
+  xPoint *xp = pPoints;
+
+  for (int np = nPoints; np--; xp++)
   {
     BoxRec box;
-    xPoint *xp = pPoints;
 
     if (CoordModePrevious)
     {
@@ -2294,8 +2294,6 @@ void nxagentPointsToDirtyRegion(DrawablePtr pDrawable, int mode,
     RegionUnion(pRegion, pRegion, &tmpRegion);
 
     RegionUninit(&tmpRegion);
-
-    xp++;
   }
 
   BoxRec extents = *RegionExtents(pRegion);
-- 
cgit v1.2.3


From 870746222abbecd16f113b93a4420846b2d5d510 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 9 Jan 2020 23:44:33 +0100
Subject: compext/Clean.c: fix shadow warnings / scope
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Clean.c: In function ‘CleanZImage’:
Clean.c:141:23: warning: declaration of ‘j’ shadows a previous local [-Wshadow=local]
       register int i, j;
                       ^
Clean.c:88:16: note: shadowed declaration is here
   unsigned int j;
                ^
Clean.c: In function ‘CopyAndCleanImage’:
Clean.c:239:22: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
         register int i;
                      ^
Clean.c:192:16: note: shadowed declaration is here
   register int i;
                ^
Clean.c:324:13: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
         int i;
             ^
Clean.c:192:16: note: shadowed declaration is here
   register int i;
                ^
---
 nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c | 32 ++++++++--------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
index 7a6d81b6b..0cc60410d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
@@ -85,7 +85,6 @@ int CleanXYImage(XImage *image)
 int CleanZImage(XImage *image)
 {
   unsigned int bytesToClean;
-  unsigned int j;
   unsigned int imageLength;
 
   #ifdef TEST
@@ -105,8 +104,6 @@ int CleanZImage(XImage *image)
        * as fully transparent.
        */
 
-      register int i;
-
       bytesToClean = image -> bytes_per_line * image -> height;
 
       #ifdef DEBUG
@@ -118,14 +115,14 @@ int CleanZImage(XImage *image)
 
       if (image -> byte_order == LSBFirst)
       {
-        for (i = 3; i < bytesToClean; i += 4)
+        for (int i = 3; i < bytesToClean; i += 4)
         {
           ((unsigned char *) image -> data)[i] = 0x00;
         }
       }
       else
       {
-        for (i = 0; i < bytesToClean; i += 4)
+        for (int i = 0; i < bytesToClean; i += 4)
         {
           ((unsigned char *) image -> data)[i] = 0x00;
         }
@@ -138,14 +135,12 @@ int CleanZImage(XImage *image)
     case 16:
     case 8:
     {
-      register int i, j;
-
       bytesToClean = image -> bytes_per_line -
                            ((image -> width * image -> bits_per_pixel) >> 3);
 
-      for (i = 1; i <= image -> height; i++)
+      for (int i = 1; i <= image -> height; i++)
       {
-        for (j = bytesToClean; j > 0; j--)
+        for (int j = bytesToClean; j > 0; j--)
         {
           ((unsigned char *) image -> data)[(i * image -> bytes_per_line) - j] = 0x00;
         }
@@ -171,7 +166,7 @@ int CleanZImage(XImage *image)
 
   bytesToClean = imageLength % 4;
 
-  for (j = 0; j < bytesToClean; j++)
+  for (int j = 0; j < bytesToClean; j++)
   {
     ((unsigned char *)image -> data)[(imageLength + j)] = 0x00;
   }
@@ -189,7 +184,6 @@ int CleanZImage(XImage *image)
 int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
 {
   register long data_size;
-  register int i;
 
   data_size = (src_image -> bytes_per_line * src_image -> height) >> 2;
 
@@ -212,7 +206,7 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
       {
         mask = 0x00ffffff;
       }
-      for (i = 0; i < data_size; i++)
+      for (int i = 0; i < data_size; i++)
       {
         ((unsigned int *)dst_image -> data)[i] = ((unsigned int *)src_image -> data)[i] & mask;
       }
@@ -224,7 +218,7 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
     {
       unsigned int bytes_to_clean;
 
-      for (i = 0; i < data_size; i++)
+      for (int i = 0; i < data_size; i++)
       {
         ((unsigned int *)dst_image -> data)[i] = ((unsigned int *)src_image -> data)[i];
       }
@@ -236,7 +230,6 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
       {
         register unsigned int mask = 0xffffffff;
         register int line_size;
-        register int i;
 
         line_size = dst_image -> bytes_per_line >> 2;
 
@@ -249,7 +242,7 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
           mask = mask >> (bytes_to_clean << 3);
         }
 
-        for (i = 0; i < dst_image -> height;)
+        for (int i = 0; i < dst_image -> height;)
         {
           ((unsigned char *)dst_image -> data)[(++i * line_size) -1] &= mask;
         }
@@ -261,7 +254,7 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
     case 15:
     case 16:
     {
-      for (i = 0; i < data_size; i++)
+      for (int i = 0; i < data_size; i++)
       {
         ((unsigned int *) dst_image -> data)[i] = ((unsigned int *) src_image -> data)[i];
       }
@@ -270,7 +263,7 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
       {
         int card32_per_line = dst_image -> bytes_per_line >> 2;
 
-        for (i = 0; i < dst_image -> height;)
+        for (int i = 0; i < dst_image -> height;)
         {
           ((unsigned int *) dst_image -> data)[(++i * card32_per_line) -1] &= 0x0000ffff;
         }
@@ -313,7 +306,7 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
         }
       }
 
-      for (i = 0; i < data_size; i++)
+      for (int i = 0; i < data_size; i++)
       {
         ((unsigned int *) dst_image -> data)[i] = ((unsigned int *) src_image -> data)[i];
       }
@@ -321,11 +314,10 @@ int CopyAndCleanImage(XImage *src_image, XImage *dst_image)
       if (mask)
       {
         int card32_per_line;
-        int i;
 
         card32_per_line = dst_image -> bytes_per_line >> 2;
 
-        for (i = 0; i < dst_image -> height; i++)
+        for (int i = 0; i < dst_image -> height; i++)
         {
           ((unsigned int *) dst_image -> data)[(++i * card32_per_line) -1] &= mask;
         }
-- 
cgit v1.2.3


From 2adab29728f9598c3e1bbd89d7e1f11eeab1bcf6 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 25 Jan 2020 15:50:04 +0100
Subject: Events.c: fix capslock weirdness (re-add lost code)

This was removed by mistake in 39866f5c133230e5731156c2356c8571c971534c.

Fixes ArcticaProject/nx-libs#904
---
 nx-X11/programs/Xserver/hw/nxagent/Events.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index a06d52a2a..45c80909c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1593,6 +1593,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
             {
               for (int k = 0; k < 8; k++)
               {
+                if (val & (1 << k))
                 {
                   #ifdef NXAGENT_FIXKEYS_DEBUG
                   fprintf(stderr, "sending KeyRelease event for keycode: %x\n",
-- 
cgit v1.2.3


From 4821edfe0ecc2296745c4c5fcaa4c08245673c6e Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sat, 25 Jan 2020 21:23:55 +0100
Subject: nxagent: rename variables that shadow globals

---
 nx-X11/programs/Xserver/hw/nxagent/Client.c   |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Display.c  | 30 ++++++-------
 nx-X11/programs/Xserver/hw/nxagent/Events.c   | 10 ++---
 nx-X11/programs/Xserver/hw/nxagent/Events.h   |  4 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c     |  8 ++--
 nx-X11/programs/Xserver/hw/nxagent/Screen.c   | 62 +++++++++++++--------------
 nx-X11/programs/Xserver/hw/nxagent/Split.c    |  4 +-
 8 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index e04a03dc1..0b8331b79 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -303,7 +303,7 @@ void nxagentWakeupByReset(ClientPtr client)
  
 #ifndef WAIT_ALL_EVENTS
 
-static Bool nxagentWaitWakeupBySplitPredicate(Display *display, XEvent *event, XPointer ptr)
+static Bool nxagentWaitWakeupBySplitPredicate(Display *disp, XEvent *event, XPointer ptr)
 {
   return (event -> type == ClientMessage &&
               (event -> xclient.data.l[0] == NXNoSplitNotify ||
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 3284857c2..c8ad891be 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -110,7 +110,7 @@ Bool nxagentTrue24 = False;
 int nxagentNumVisuals;
 int nxagentXConnectionNumber;
 
-int nxagentIOErrorHandler(Display *display);
+int nxagentIOErrorHandler(Display *disp);
 
 static Bool nxagentDisplayInfoSaved = False;
 static Display *nxagentDisplayBackup = NULL;
@@ -170,7 +170,7 @@ Pixmap nxagentIconPixmap;
 Pixmap nxagentIconShape;
 Bool useXpmIcon = False;
 
-Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask);
+Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask);
 
 
 static void nxagentInitVisuals(void);
@@ -188,7 +188,7 @@ static int nxagentCheckForColormapsCompatibility(int flexibility);
  * Save Internal implementation Also called in Reconnect.c.
  */
 
-Display *nxagentInternalOpenDisplay(char *display);
+Display *nxagentInternalOpenDisplay(char *disp);
 
 #ifdef NXAGENT_TIMESTAMP
 unsigned long startTime;
@@ -226,7 +226,7 @@ int nxagentServerOrder(void)
  * be probably moved to Handlers.c.
  */
 
-int nxagentIOErrorHandler(Display *display)
+int nxagentIOErrorHandler(Display *disp)
 {
   #ifdef TEST
   fprintf(stderr, "nxagentIOErrorHandler: Got I/O error with nxagentException.ioError [%d].\n",
@@ -559,7 +559,7 @@ static void nxagentSigchldHandler(int signal)
   return;
 }
 
-Display *nxagentInternalOpenDisplay(char *display)
+Display *nxagentInternalOpenDisplay(char *disp)
 {
   /*
    * Stop the smart schedule timer since it uses SIGALRM as we do.
@@ -601,10 +601,10 @@ FIXME: Should print a warning if the user tries to let the agent
 
   #ifdef TEST
   fprintf(stderr, "nxagentInternalOpenDisplay: Going to open the display [%s].\n",
-              display);
+              disp);
   #endif
 
-  Display *newDisplay = XOpenDisplay(display);
+  Display *newDisplay = XOpenDisplay(disp);
 
   alarm(0);
 
@@ -630,7 +630,7 @@ FIXME: Should print a warning if the user tries to let the agent
   return newDisplay;
 }
 
-static void nxagentDisplayBlockHandler(Display *display, int reason)
+static void nxagentDisplayBlockHandler(Display *disp, int reason)
 {
   if (nxagentDisplay != NULL)
   {
@@ -686,7 +686,7 @@ static void nxagentDisplayBlockHandler(Display *display, int reason)
   }
 }
 
-static void nxagentDisplayWriteHandler(Display *display, int length)
+static void nxagentDisplayWriteHandler(Display *disp, int length)
 {
   if (nxagentDisplay != NULL)
   {
@@ -717,7 +717,7 @@ int nxagentGetDataRate(void)
   return nxagentRate;
 }
 
-static void nxagentDisplayFlushHandler(Display *display, int length)
+static void nxagentDisplayFlushHandler(Display *disp, int length)
 {
   if (nxagentDisplay != NULL)
   {
@@ -768,7 +768,7 @@ static void nxagentDisplayFlushHandler(Display *display, int length)
  * rupt was received or if any other event occurred mandating the
  + end of the session."
  */
-static int nxagentDisplayErrorPredicate(Display *display, int error)
+static int nxagentDisplayErrorPredicate(Display *disp, int error)
 {
   #ifdef TEST
   fprintf(stderr, "nxagentDisplayErrorPredicate: CHECK! Error is [%d] with [%d][%d][%d][%d][%d].\n",
@@ -789,7 +789,7 @@ static int nxagentDisplayErrorPredicate(Display *display, int error)
     else if (nxagentException.sigHup > 0 ||
                  nxagentException.ioError > 0)
     {
-      NXForceDisplayError(display);
+      NXForceDisplayError(disp);
 
       return 1;
     }
@@ -1746,7 +1746,7 @@ FIXME: Is this needed?
   nxagentDisplay = NULL;
 }
 
-Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
+Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask)
 {
   char** agentIconData;
 
@@ -1764,8 +1764,8 @@ Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
 
   XlibPixmap IconPixmap;
   XlibPixmap IconShape;
-  if (XpmSuccess == XpmCreatePixmapFromData(display,
-                                            DefaultRootWindow(display),
+  if (XpmSuccess == XpmCreatePixmapFromData(disp,
+                                            DefaultRootWindow(disp),
                                             agentIconData,
                                             &IconPixmap,
                                             &IconShape,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 45c80909c..b19dda3ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -167,7 +167,7 @@ void nxagentHandleCollectPropertyEvent(XEvent*);
 
 void nxagentHandleCollectGrabPointerEvent(int resource);
 
-Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr);
+Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr);
 
 /*
  * Used in Handlers.c to synchronize the agent with the remote X
@@ -702,7 +702,7 @@ static void nxagentToggleAutoGrab(void)
     nxagentDisableAutoGrab();
 }
 
-static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer window)
+static Bool nxagentExposurePredicate(Display *disp, XEvent *event, XPointer window)
 {
   /*
    *  Handle both Expose and ProcessedExpose events.  The latters are
@@ -720,12 +720,12 @@ static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer w
   }
 }
 
-static int nxagentAnyEventPredicate(Display *display, XEvent *event, XPointer parameter)
+static int nxagentAnyEventPredicate(Display *disp, XEvent *event, XPointer parameter)
 {
   return 1;
 }
 
-int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer parameter)
+int nxagentInputEventPredicate(Display *disp, XEvent *event, XPointer parameter)
 {
   switch (event -> type)
   {
@@ -3883,7 +3883,7 @@ void nxagentDeactivatePointerGrab(void)
   }
 }
 
-Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr)
+Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr)
 {
   return (X -> xclient.window == 0 &&
              X -> xclient.message_type == 0 &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h
index 85f585e1f..6df5725d4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h
@@ -68,9 +68,9 @@ typedef int (*GetResourceFuncPtr)(Display*);
 
 int nxagentWaitForResource(GetResourceFuncPtr, PredicateFuncPtr);
 
-Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr);
+Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr);
 
-int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer parameter);
+int nxagentInputEventPredicate(Display *disp, XEvent *event, XPointer parameter);
 
 /*
  * Enable and disable notification of
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 559eae719..fa6b9ce03 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -941,7 +941,7 @@ void nxagentHandleCollectInputFocusEvent(int resource)
   #endif
 }
 
-Bool nxagentCollectInputFocusPredicate(Display *display, XEvent *X, XPointer ptr)
+Bool nxagentCollectInputFocusPredicate(Display *disp, XEvent *X, XPointer ptr)
 {
   return (X -> xclient.window == 0 &&
              X -> xclient.message_type == 0 &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 3cba1a89d..0b6b36547 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -203,7 +203,7 @@ void checkX2goAgent(void)
 /*
  * Called at X server's initialization.
  */
-void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
+void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[])
 {
   /*
    * Print our pid and version information.
@@ -329,13 +329,13 @@ FIXME: These variables, if not removed at all because have probably
    * Initialize the basic screen info.
    */
 
-  nxagentSetScreenInfo(screenInfo);
+  nxagentSetScreenInfo(scrInfo);
 
   /*
    * Initialize pixmap formats for this screen.
    */
 
-  nxagentSetPixmapFormats(screenInfo);
+  nxagentSetPixmapFormats(scrInfo);
 
   /*
    * Get our own privates' index.
@@ -370,7 +370,7 @@ FIXME: These variables, if not removed at all because have probably
     AddScreen(nxagentOpenScreen, argc, argv);
   }
 
-  nxagentNumScreens = screenInfo->numScreens;
+  nxagentNumScreens = scrInfo->numScreens;
 
   /*
    * Initialize the GCs used by the synchronization put images. We do
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 2ed7d9593..bf614ffdc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -236,7 +236,7 @@ int nxagentBitsPerPixel(int depth)
     else return 32;
 }
 
-void nxagentSetScreenInfo(ScreenInfo *screenInfo)
+void nxagentSetScreenInfo(ScreenInfo *scrInfo)
 {
   /*
    * Setup global screen info parameters. In the Xnest
@@ -248,34 +248,34 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo)
    *
    * From a standard implementation:
    *
-   * screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
-   * screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
-   * screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
-   * screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+   * scrInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+   * scrInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+   * scrInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+   * scrInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
    *
    * From Xnest implementation:
    *
-   * screenInfo -> imageByteOrder = ImageByteOrder(nxagentDisplay);
-   * screenInfo -> bitmapScanlineUnit = BitmapUnit(nxagentDisplay);
-   * screenInfo -> bitmapScanlinePad = BitmapPad(nxagentDisplay);
-   * screenInfo -> bitmapBitOrder = BitmapBitOrder(nxagentDisplay);
+   * scrInfo -> imageByteOrder = ImageByteOrder(nxagentDisplay);
+   * scrInfo -> bitmapScanlineUnit = BitmapUnit(nxagentDisplay);
+   * scrInfo -> bitmapScanlinePad = BitmapPad(nxagentDisplay);
+   * scrInfo -> bitmapBitOrder = BitmapBitOrder(nxagentDisplay);
    */
 
-  screenInfo -> imageByteOrder = IMAGE_BYTE_ORDER;
-  screenInfo -> bitmapScanlinePad = BITMAP_SCANLINE_PAD;
-  screenInfo -> bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
-  screenInfo -> bitmapBitOrder = BITMAP_BIT_ORDER;
+  scrInfo -> imageByteOrder = IMAGE_BYTE_ORDER;
+  scrInfo -> bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+  scrInfo -> bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+  scrInfo -> bitmapBitOrder = BITMAP_BIT_ORDER;
 
   #ifdef TEST
   fprintf(stderr, "nxagentSetScreenInfo: Server image order is [%d] bitmap order is [%d].\n",
-              screenInfo -> imageByteOrder, screenInfo -> bitmapBitOrder);
+              scrInfo -> imageByteOrder, scrInfo -> bitmapBitOrder);
 
   fprintf(stderr, "nxagentSetScreenInfo: Server scanline unit is [%d] scanline pad is [%d].\n",
-              screenInfo -> bitmapScanlineUnit, screenInfo -> bitmapScanlinePad);
+              scrInfo -> bitmapScanlineUnit, scrInfo -> bitmapScanlinePad);
   #endif
 }
 
-void nxagentSetPixmapFormats(ScreenInfo *screenInfo)
+void nxagentSetPixmapFormats(ScreenInfo *scrInfo)
 {
   /*
    * Formats are created with no care of which are supported
@@ -284,19 +284,19 @@ void nxagentSetPixmapFormats(ScreenInfo *screenInfo)
    * of session from a display to another.
    */
 
-  screenInfo -> numPixmapFormats = nxagentNumPixmapFormats;
+  scrInfo -> numPixmapFormats = nxagentNumPixmapFormats;
 
   for (int i = 0; i < nxagentNumPixmapFormats; i++)
   {
-    screenInfo -> formats[i].depth = nxagentPixmapFormats[i].depth;
-    screenInfo -> formats[i].bitsPerPixel = nxagentPixmapFormats[i].bits_per_pixel;
-    screenInfo -> formats[i].scanlinePad = nxagentPixmapFormats[i].scanline_pad;
+    scrInfo -> formats[i].depth = nxagentPixmapFormats[i].depth;
+    scrInfo -> formats[i].bitsPerPixel = nxagentPixmapFormats[i].bits_per_pixel;
+    scrInfo -> formats[i].scanlinePad = nxagentPixmapFormats[i].scanline_pad;
 
     #ifdef TEST
     fprintf(stderr, "nxagentSetPixmapFormats: Set format at index [%d] to depth [%d] "
                 "bits per pixel [%d] scanline pad [%d].\n", i,
-                    screenInfo -> formats[i].depth, screenInfo -> formats[i].bitsPerPixel,
-                        screenInfo -> formats[i].scanlinePad);
+                    scrInfo -> formats[i].depth, scrInfo -> formats[i].bitsPerPixel,
+                        scrInfo -> formats[i].scanlinePad);
     #endif
   }
 }
@@ -2950,9 +2950,9 @@ int nxagentShadowSendUpdates(int *suspended)
   return 1;
 }
 
-int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr,
-                            unsigned char nxagentShadowDepth, int nxagentShadowWidth,
-                                 int nxagentShadowHeight, char *nxagentShadowBuffer, int *changed, int *suspended)
+int nxagentShadowPoll(PixmapPtr shadowPixmapPtr, GCPtr shadowGCPtr,
+                            unsigned char shadowDepth, int shadowWidth,
+                                 int shadowHeight, char *shadowBuffer, int *changed, int *suspended)
 {
   RegionRec updateRegion;
   RegionRec tempRegion;
@@ -2977,7 +2977,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
     BoxRec *pBox = (BoxRec *)ptBox;
 
     #ifdef TEST
-    fprintf(stderr, "nxagentShadowPoll: nRects[%ld], pBox[%p] depth[%d].\n", numRects, (void *) pBox, nxagentShadowDepth);
+    fprintf(stderr, "nxagentShadowPoll: nRects[%ld], pBox[%p] depth[%d].\n", numRects, (void *) pBox, shadowDepth);
     #endif
 
     for (int n = 0; n < numRects; n++)
@@ -2994,7 +2994,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
       unsigned int width = pBox[n].y1 - pBox[n].x1;/* y1 = x2 */
       unsigned int height = y2 - pBox[n].x2;   /* x2 = y1 */
 
-      if((x + width) > nxagentShadowWidth || (y + height) > nxagentShadowHeight)
+      if((x + width) > shadowWidth || (y + height) > shadowHeight)
       {
         /*
          * Out of bounds. Maybe a resize of the master session is going on.
@@ -3028,8 +3028,8 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
 
       for (int c = 0; c + y < y2; c++)
       {
-        memcpy(tBuffer, nxagentShadowBuffer + x * nxagentBppMaster + 
-                   (y + c) * nxagentShadowWidth * nxagentBppMaster, line);
+        memcpy(tBuffer, shadowBuffer + x * nxagentBppMaster +
+                   (y + c) * shadowWidth * nxagentBppMaster, line);
 
         tBuffer += line;
 
@@ -3042,8 +3042,8 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
         nxagentShadowAdaptDepth(width, height, line, &tBuffer);
       }
 
-      fbPutImage(nxagentVirtualDrawable((DrawablePtr)nxagentShadowPixmapPtr), nxagentShadowGCPtr,
-                          nxagentShadowDepth, x, y, width, height, 0, ZPixmap, tBuffer);
+      fbPutImage(nxagentVirtualDrawable((DrawablePtr)shadowPixmapPtr), shadowGCPtr,
+                     shadowDepth, x, y, width, height, 0, ZPixmap, tBuffer);
 
       BoxRec box = {.x1 = x, .x2 = x + width, .y1 = y, .y2 = y + height};
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 4dac8f5b2..850056c21 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -780,7 +780,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable)
   }
 }
 
-static Bool nxagentCommitSplitPredicate(Display *display, XEvent *event, XPointer ptr)
+static Bool nxagentCommitSplitPredicate(Display *disp, XEvent *event, XPointer ptr)
 {
   return (event -> type == ClientMessage &&
               event -> xclient.data.l[0] == NXCommitSplitNotify &&
@@ -820,7 +820,7 @@ void nxagentWaitCommitEvent(int resource)
   }
 }
 
-static Bool nxagentWaitSplitPredicate(Display *display, XEvent *event, XPointer ptr)
+static Bool nxagentWaitSplitPredicate(Display *disp, XEvent *event, XPointer ptr)
 {
   return (event -> type == ClientMessage &&
               (event -> xclient.data.l[0] == NXNoSplitNotify ||
-- 
cgit v1.2.3