1 files changed, 114 insertions, 77 deletions

diff --git a/nx-X11/programs/Xserver/randr/rrpointer.c b/nx-X11/programs/Xserver/randr/rrpointer.c
index c88a0f83e..ace7d36a2 100644
--- a/nx-X11/programs/Xserver/randr/rrpointer.c
+++ b/nx-X11/programs/Xserver/randr/rrpointer.c
@@ -21,6 +21,7 @@
  */
 
 #include "randrstr.h"
+#include "inputstr.h"
 
 /*
  * When the pointer moves, check to see if the specified position is outside
@@ -31,19 +32,19 @@
  */
 
 static Bool
-RRCrtcContainsPosition (RRCrtcPtr crtc, int x, int y)
+RRCrtcContainsPosition(RRCrtcPtr crtc, int x, int y)
 {
-    RRModePtr   mode = crtc->mode;
-    int		scan_width, scan_height;
+    RRModePtr mode = crtc->mode;
+    int scan_width, scan_height;
 
     if (!mode)
-	return FALSE;
+        return FALSE;
 
-    RRCrtcGetScanoutSize (crtc, &scan_width, &scan_height);
+    RRCrtcGetScanoutSize(crtc, &scan_width, &scan_height);
 
     if (crtc->x <= x && x < crtc->x + scan_width &&
-	crtc->y <= y && y < crtc->y + scan_height)
-	return TRUE;
+        crtc->y <= y && y < crtc->y + scan_height)
+        return TRUE;
     return FALSE;
 }
 
@@ -51,95 +52,131 @@ RRCrtcContainsPosition (RRCrtcPtr crtc, int x, int y)
  * Find the CRTC nearest the specified position, ignoring 'skip'
  */
 static void
-RRPointerToNearestCrtc (ScreenPtr pScreen, int x, int y, RRCrtcPtr skip)
+RRPointerToNearestCrtc(
+#ifndef NXAGENT_SERVER
+                          DeviceIntPtr pDev,
+#endif                          /* !defined(NXAGENT_SERVER) */
+                          ScreenPtr pScreen, int x, int y, RRCrtcPtr skip)
 {
-    rrScrPriv (pScreen);
-    int		c;
-    RRCrtcPtr	nearest = NULL;
-    int		best = 0;
-    int		best_dx = 0, best_dy = 0;
-
-    for (c = 0; c < pScrPriv->numCrtcs; c++)
-    {
-	RRCrtcPtr   crtc = pScrPriv->crtcs[c];
-	RRModePtr   mode = crtc->mode;
-	int	    dx, dy;
-	int	    dist;
-	int	    scan_width, scan_height;
-
-	if (!mode)
-	    continue;
-	if (crtc == skip)
-	    continue;
-
-	RRCrtcGetScanoutSize (crtc, &scan_width, &scan_height);
-
-	if (x < crtc->x)
-	    dx = crtc->x - x;
-	else if (x > crtc->x + scan_width)
-	    dx = x - (crtc->x + scan_width);
-	else
-	    dx = 0;
-	if (y < crtc->y)
-	    dy = crtc->y - x;
-	else if (y > crtc->y + scan_height)
-	    dy = y - (crtc->y + scan_height);
-	else
-	    dy = 0;
-	dist = dx + dy;
-	if (!nearest || dist < best)
-	{
-	    nearest = crtc;
-	    best_dx = dx;
-	    best_dy = dy;
-	}
+    rrScrPriv(pScreen);
+    int c;
+    RRCrtcPtr nearest = NULL;
+    int best = 0;
+    int best_dx = 0, best_dy = 0;
+
+    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+        RRCrtcPtr crtc = pScrPriv->crtcs[c];
+        RRModePtr mode = crtc->mode;
+        int dx, dy;
+        int dist;
+        int scan_width, scan_height;
+
+        if (!mode)
+            continue;
+        if (crtc == skip)
+            continue;
+
+        RRCrtcGetScanoutSize(crtc, &scan_width, &scan_height);
+
+        if (x < crtc->x)
+            dx = crtc->x - x;
+        else if (x > crtc->x + scan_width - 1)
+            dx = crtc->x + (scan_width - 1) - x;
+        else
+            dx = 0;
+        if (y < crtc->y)
+            dy = crtc->y - y;
+        else if (y > crtc->y + scan_height - 1)
+            dy = crtc->y + (scan_height - 1) - y;
+        else
+            dy = 0;
+        dist = dx * dx + dy * dy;
+        if (!nearest || dist < best) {
+            nearest = crtc;
+            best_dx = dx;
+            best_dy = dy;
+            best = dist;
+        }
     }
     if (best_dx || best_dy)
-	(*pScreen->SetCursorPosition) (pScreen, x + best_dx, y + best_dy, TRUE);
+        (*pScreen->SetCursorPosition) (
+#ifndef NXAGENT_SERVER
+                                          pDev,
+#endif                          /* !defined(NXAGENT_SERVER) */
+                                          pScreen, x + best_dx, y + best_dy,
+                                          TRUE);
     pScrPriv->pointerCrtc = nearest;
 }
 
 void
-RRPointerMoved (ScreenPtr pScreen, int x, int y)
+RRPointerMoved(ScreenPtr pScreen, int x, int y)
 {
-    rrScrPriv (pScreen);
-    RRCrtcPtr	pointerCrtc = pScrPriv->pointerCrtc;
-    int	c;
+    rrScrPriv(pScreen);
+    RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc;
+    int c;
 
     /* Check last known CRTC */
-    if (pointerCrtc && RRCrtcContainsPosition (pointerCrtc, x, y))
-	return;
-    
+    if (pointerCrtc && RRCrtcContainsPosition(pointerCrtc, x, y))
+        return;
+
     /* Check all CRTCs */
-    for (c = 0; c < pScrPriv->numCrtcs; c++)
-    {
-	RRCrtcPtr   crtc = pScrPriv->crtcs[c];
-	
-	if (RRCrtcContainsPosition (crtc, x, y))
-	{
-	    /* Remember containing CRTC */
-	    pScrPriv->pointerCrtc = crtc;
-	    return;
-	}
+    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+        RRCrtcPtr crtc = pScrPriv->crtcs[c];
+
+        if (RRCrtcContainsPosition(crtc, x, y)) {
+            /* Remember containing CRTC */
+            pScrPriv->pointerCrtc = crtc;
+            return;
+        }
     }
 
     /* None contain pointer, find nearest */
-    RRPointerToNearestCrtc (pScreen, x, y, pointerCrtc);
+    ErrorF("RRPointerMoved: Untested, may cause \"bogus pointer event\"\n");
+    RRPointerToNearestCrtc(
+#ifndef NXAGENT_SERVER
+                              inputInfo.pointer,
+#endif                          /* !defined(NXAGENT_SERVER) */
+                              pScreen, x, y, pointerCrtc);
 }
 
 /*
- * When the screen is reconfigured, move the pointer to the nearest
+ * When the screen is reconfigured, move all pointers to the nearest
  * CRTC
  */
 void
-RRPointerScreenConfigured (ScreenPtr pScreen)
+RRPointerScreenConfigured(ScreenPtr pScreen)
 {
-    WindowPtr	pRoot = GetCurrentRootWindow ();
-    ScreenPtr	pCurrentScreen = pRoot ? pRoot->drawable.pScreen : NULL;
-    int		x, y;
-
-    if (pScreen != pCurrentScreen)
-	return;
-    GetSpritePosition (&x, &y);
-    RRPointerToNearestCrtc (pScreen, x, y, NULL);
+    WindowPtr pRoot;
+    ScreenPtr pCurrentScreen;
+    int x, y;
+
+#ifndef NXAGENT_SERVER
+    DeviceIntPtr pDev;
+
+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+        if (IsPointerDevice(pDev)) {
+#endif                          /* NXAGENT_SERVER */
+            pRoot = GetCurrentRootWindow(
+#ifndef NXAGENT_SERVER
+                                            pDev
+#endif                          /* NXAGENT_SERVER */
+                );
+            pCurrentScreen = pRoot ? pRoot->drawable.pScreen : NULL;
+
+            if (pScreen == pCurrentScreen) {
+                GetSpritePosition(
+#ifndef NXAGENT_SERVER
+                                     pDev,
+#endif                          /* NXAGENT_SERVER */
+                                     &x, &y);
+                RRPointerToNearestCrtc(
+#ifndef NXAGENT_SERVER
+                                          pDev,
+#endif                          /* NXAGENT_SERVER */
+                                          pScreen, x, y, NULL);
+#ifndef NXAGENT_SERVER
+            }
+        }
+#endif                          /* NXAGENT_SERVER */
+    }
 }