From 12bfabec70065f7994f91a9b315e2b69892b0a57 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 20 Oct 2012 16:07:49 +0000
Subject: Several bugfixes contributed by Petteri Aimonen

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5238 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/graphics/nxtk/nxtk_events.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'nuttx/graphics')

diff --git a/nuttx/graphics/nxtk/nxtk_events.c b/nuttx/graphics/nxtk/nxtk_events.c
index 33c50b7f9..aaec16b5a 100644
--- a/nuttx/graphics/nxtk/nxtk_events.c
+++ b/nuttx/graphics/nxtk/nxtk_events.c
@@ -76,6 +76,9 @@ static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
                        FAR void *arg);
 #endif
+#ifdef CONFIG_NX_MULTIUSER
+static void nxtk_blocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2);
+#endif
 
 /****************************************************************************
  * Private Data
@@ -95,6 +98,9 @@ const struct nx_callback_s g_nxtkcb =
 #ifdef CONFIG_NX_KBD
   , nxtk_kbdin    /* kbdin */
 #endif
+#ifdef CONFIG_NX_MULTIUSER
+  , nxtk_blocked
+#endif
 };
 
 /****************************************************************************
@@ -292,6 +298,24 @@ static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
 }
 #endif
 
+/****************************************************************************
+ * Name: nxtk_blocked
+ ****************************************************************************/
+
+#ifdef CONFIG_NX_MULTIUSER
+static void nxtk_blocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2)
+{
+  FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd;
+
+  /* Only the client window gets keyboard input */
+
+  if (fwnd->fwcb->blocked)
+    {
+      fwnd->fwcb->blocked((NXTKWINDOW)fwnd, fwnd->fwarg, arg2);
+    }
+}
+#endif
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
-- 
cgit v1.2.3