1 files changed, 23 insertions, 9 deletions
diff --git a/nuttx/graphics/nxmu/nxmu_mouse.c b/nuttx/graphics/nxmu/nxmu_mouse.c
index 5650c8dd2..922b12c93 100644
--- a/nuttx/graphics/nxmu/nxmu_mouse.c
+++ b/nuttx/graphics/nxmu/nxmu_mouse.c
@@ -106,16 +106,30 @@ void nxmu_mousereport(struct nxbe_window_s *wnd)
   struct nxclimsg_mousein_s outmsg;
   int ret;
 
-  outmsg.msgid   = NX_CLIMSG_MOUSEIN;
-  outmsg.wnd     = wnd;
-  outmsg.pos.x   = g_mpos.x;
-  outmsg.pos.y   = g_mpos.y;
-  outmsg.buttons = g_mbutton;
-
-  ret = mq_send(wnd->conn->swrmq, outmsg, sizeof(struct nxclimsg_mousein_s), NX_SVRMSG_PRIO);
-  if (ret < 0)
+  /* Does this window support mouse callbacks? */
+
+  if (win->cb->mousein)
     {
-      gdbg("mq_send failed: %d\n", errno);
+      /* Yes.. Does the mount position lie within the window? */
+
+      if (nxgl_rectinside(wnd->bounds, g_mpos))
+        {
+          /* Yes... Convert the mouse position to window relative
+           * coordinates and send it to the client
+           */
+
+          outmsg.msgid   = NX_CLIMSG_MOUSEIN;
+          outmsg.wnd     = wnd;
+          outmsg.buttons = g_mbutton;
+          nxgl_vectsubtract(&outmsg.pos, g_mpos, wnd->origin);
+
+          ret = mq_send(wnd->conn->swrmq, outmsg,
+                        sizeof(struct nxclimsg_mousein_s), NX_SVRMSG_PRIO);
+          if (ret < 0)
+            {
+              gdbg("mq_send failed: %d\n", errno);
+            }
+        }
     }
 }