Set cursor sprite globally
Pointer are global, not screen specific. Hence so is also the cursor
sprite.
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 36d3742..dea3cb8 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -394,10 +394,14 @@
desktop[scrIdx]->add_copied(reg, rfb::Point(dx, dy));
}
-void vncSetCursor(int scrIdx, int width, int height, int hotX, int hotY,
+void vncSetCursor(int width, int height, int hotX, int hotY,
const unsigned char *rgbaData)
{
- desktop[scrIdx]->setCursor(width, height, hotX, hotY, rgbaData);
+ for (int scr = 0; scr < vncGetScreenCount(); scr++) {
+ if (desktop[scr] == NULL)
+ continue;
+ desktop[scr]->setCursor(width, height, hotX, hotY, rgbaData);
+ }
}
void vncPreScreenResize(int scrIdx)
diff --git a/unix/xserver/hw/vnc/vncExtInit.h b/unix/xserver/hw/vnc/vncExtInit.h
index a0914ad..9785d11 100644
--- a/unix/xserver/hw/vnc/vncExtInit.h
+++ b/unix/xserver/hw/vnc/vncExtInit.h
@@ -84,7 +84,7 @@
int nRects, const struct UpdateRect *rects,
int dx, int dy);
-void vncSetCursor(int scrIdx, int width, int height, int hotX, int hotY,
+void vncSetCursor(int width, int height, int hotX, int hotY,
const unsigned char *rgbaData);
void vncPreScreenResize(int scrIdx);
diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c
index b21f4c6..22ea9ea 100644
--- a/unix/xserver/hw/vnc/vncHooks.c
+++ b/unix/xserver/hw/vnc/vncHooks.c
@@ -699,7 +699,7 @@
}
#endif
- vncSetCursor(pScreen->myNum, width, height, hotX, hotY, rgbaData);
+ vncSetCursor(width, height, hotX, hotY, rgbaData);
free(rgbaData);
}