Move more files from graphics/nxmu to libnx/nxmu

5 files changed, 5 insertions, 379 deletions

diff --git a/nuttx/graphics/nxmu/Make.defs b/nuttx/graphics/nxmu/Make.defs
index 41a660ba1..2f443c20f 100644
--- a/nuttx/graphics/nxmu/Make.defs
+++ b/nuttx/graphics/nxmu/Make.defs
@@ -35,7 +35,6 @@
 
 NX_ASRCS   =
 
-NX_CSRCS   = nx_eventhandler.c nx_eventnotify.c
 NX_CSRCS  += nxmu_kbdin.c nxmu_mouse.c nxmu_openwindow.c nxmu_redrawreq.c
 NX_CSRCS  += nxmu_releasebkgd.c nxmu_requestbkgd.c nxmu_reportposition.c
 NX_CSRCS  += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
diff --git a/nuttx/graphics/nxmu/nx_eventhandler.c b/nuttx/graphics/nxmu/nx_eventhandler.c
deleted file mode 100644
index 815f9f583..000000000
--- a/nuttx/graphics/nxmu/nx_eventhandler.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/****************************************************************************
- * graphics/nxmu/nx_eventhandler.c
- *
- *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <mqueue.h>
-#include <assert.h>
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/kmalloc.h>
-#include <nuttx/nx/nx.h>
-
-#include "nxfe.h"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_connected
- *
- * Description:
- *   The server has completed the connection and is ready.
- *
- ****************************************************************************/
-
-static inline void nx_connected(FAR struct nxfe_conn_s *conn)
-{
-  DEBUGASSERT(conn->state == NX_CLISTATE_NOTCONNECTED);
-  conn->state = NX_CLISTATE_CONNECTED;
-}
-
-/****************************************************************************
- * Name: nx_disconnected
- ****************************************************************************/
-
-static inline void nx_disconnected(FAR struct nxfe_conn_s *conn)
-{
-  /* Close the server and client MQs */
-
-  (void)mq_close(conn->cwrmq);
-  (void)mq_close(conn->crdmq);
-
-  /* And free the client structure */
-
-  kfree(conn);
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_eventhandler
- *
- * Description:
- *   The client code must call this function periodically to process
- *   incoming messages from the server.  If CONFIG_NX_BLOCKING is defined,
- *   then this function not return until a server message is received.
- *
- *   When CONFIG_NX_BLOCKING is not defined, the client must exercise
- *   caution in the looping to assure that it does not eat up all of
- *   the CPU bandwidth calling nx_eventhandler repeatedly.  nx_eventnotify
- *   may be called to get a signal event whenever a new incoming server
- *   event is avaiable.
- *
- * Input Parameters:
- *   handle - the handle returned by nx_connect
- *
- * Return:
- *     OK: No errors occurred.  If CONFIG_NX_BLOCKING is defined, then
- *         one or more server message was processed.
- *  ERROR: An error occurred and errno has been set appropriately.  Of
- *         particular interest, it will return errno == EHOSTDOWN when the
- *         server is disconnected.  After that event, the handle can no
- *         longer be used.
- *
- ****************************************************************************/
-
-int nx_eventhandler(NXHANDLE handle)
-{
-  FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
-  struct nxsvrmsg_s      *msg;
-  struct nxbe_window_s   *wnd;
-  uint8_t                 buffer[NX_MXCLIMSGLEN];
-  int                     nbytes;
-
-  /* Get the next message from our incoming message queue */
-
-  do
-    {
-      nbytes = mq_receive(conn->crdmq, buffer, NX_MXCLIMSGLEN, 0);
-      if (nbytes < 0)
-        {
-          /* EINTR is not an error.  The wait was interrupted by a signal and
-           * we just need to try reading again.
-           */
-
-          if (errno != EINTR)
-            {
-              if (errno == EAGAIN)
-                {
-                  /* EAGAIN is not an error.  It occurs because the MQ is opened with
-                   * O_NONBLOCK and there is no message available now.
-                   */
-
-                  return OK;
-                }
-              else
-                {
-                  gdbg("mq_receive failed: %d\n", errno);
-                  return ERROR;
-                }
-            }
-        }
-    }
-  while (nbytes < 0);
-
-  DEBUGASSERT(nbytes >= sizeof(struct nxclimsg_s));
-
-  /* Dispatch the message appropriately */
-
-  msg = (struct nxsvrmsg_s *)buffer;
-  gvdbg("Received msgid=%d\n", msg->msgid);
-  switch (msg->msgid)
-    {
-    case NX_CLIMSG_CONNECTED:
-      nx_connected(conn);
-      break;
-
-    case NX_CLIMSG_DISCONNECTED:
-      nx_disconnected(conn);
-      errno = EHOSTDOWN;
-      return ERROR;
-
-    case NX_CLIMSG_REDRAW:
-      {
-        FAR struct nxclimsg_redraw_s *redraw = (FAR struct nxclimsg_redraw_s *)buffer;
-        wnd = redraw->wnd;
-        DEBUGASSERT(wnd);
-        if (wnd->cb->redraw)
-          {
-            wnd->cb->redraw((NXWINDOW)wnd, &redraw->rect, redraw->more, wnd->arg);
-          }
-      }
-      break;
-
-    case NX_CLIMSG_NEWPOSITION:
-      {
-        FAR struct nxclimsg_newposition_s *postn = (FAR struct nxclimsg_newposition_s *)buffer;
-        wnd = postn->wnd;
-        DEBUGASSERT(wnd);
-        if (wnd->cb->position)
-          {
-            wnd->cb->position((NXWINDOW)wnd, &postn->size, &postn->pos, &postn->bounds, wnd->arg);
-          }
-      }
-      break;
-
-#ifdef CONFIG_NX_MOUSE
-    case NX_CLIMSG_MOUSEIN:
-      {
-        FAR struct nxclimsg_mousein_s *mouse = (FAR struct nxclimsg_mousein_s *)buffer;
-        wnd = mouse->wnd;
-        DEBUGASSERT(wnd);
-        if (wnd->cb->mousein)
-          {
-            wnd->cb->mousein((NXWINDOW)wnd, &mouse->pos, mouse->buttons, wnd->arg);
-          }
-        }
-      break;
-#endif
-
-#ifdef CONFIG_NX_KBD
-    case NX_CLIMSG_KBDIN:
-      {
-        FAR struct nxclimsg_kbdin_s *kbd = (FAR struct nxclimsg_kbdin_s *)buffer;
-        wnd = kbd->wnd;
-        DEBUGASSERT(wnd);
-        if (wnd->cb->kbdin)
-          {
-            wnd->cb->kbdin((NXWINDOW)wnd, kbd->nch, kbd->ch, wnd->arg);
-          }
-        }
-      break;
-#endif
-
-    case NX_CLIMSG_BLOCKED:
-      {
-        FAR struct nxclimsg_blocked_s *blocked = (FAR struct nxclimsg_blocked_s *)buffer;
-        wnd = blocked->wnd;
-        DEBUGASSERT(wnd);
-        if (wnd->cb->blocked)
-          {
-            wnd->cb->blocked((NXWINDOW)wnd, wnd->arg, blocked->arg);
-          }
-        }
-      break;
-
-    default:
-      gdbg("Unrecognized message opcode: %d\n", ((FAR struct nxsvrmsg_s *)buffer)->msgid);
-      break;
-    }
-
-  return OK;
-}
-
diff --git a/nuttx/graphics/nxmu/nx_eventnotify.c b/nuttx/graphics/nxmu/nx_eventnotify.c
deleted file mode 100644
index 556c9fa93..000000000
--- a/nuttx/graphics/nxmu/nx_eventnotify.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
- * graphics/nxmu/nx_eventnotify.c
- *
- *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdlib.h>
-#include <mqueue.h>
-#include <assert.h>
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/nx/nx.h>
-#include "nxfe.h"
-
-#ifndef CONFIG_DISABLE_SIGNALS
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_eventnotify
- *
- * Description:
- *   Rather than calling nx_eventhandler periodically, the client may
- *   register to receive a signal when a server event is available.  The
- *   client can then call nv_eventhandler() only when incoming events are
- *   available.
- *
- *   Only one such event is issued.  Upon receipt of the signal, if the client
- *   wishes further notifications, it must call nx_eventnotify again.
- *
- * Input Parameters:
- *   handle - the handle returned by nx_connect
- *
- * Return:
- *      OK: No errors occurred.  If CONFIG_NX_BLOCKING is defined, then
- *          one or more server message was processed.
- *   ERROR: An error occurred and errno has been set appropriately
- *
- ****************************************************************************/
-
-int nx_eventnotify(NXHANDLE handle, int signo)
-{
-  FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
-  struct sigevent se;
-
-  se.sigev_notify          = SIGEV_SIGNAL;
-  se.sigev_signo           = signo;
-  se.sigev_value.sival_ptr = (FAR void *)handle;
-
-  return mq_notify(conn->crdmq, &se);
-}
-
-#endif /* CONFIG_DISABLE_SIGNALS */
diff --git a/nuttx/graphics/nxsu/nx_constructwindow.c b/nuttx/graphics/nxsu/nx_constructwindow.c
index 0703ab644..6a0595181 100644
--- a/nuttx/graphics/nxsu/nx_constructwindow.c
+++ b/nuttx/graphics/nxsu/nx_constructwindow.c
@@ -83,10 +83,10 @@
  *   inheritance:  The caller's window structure may include extensions that
  *   are not visible to NX.
  *
- *   NOTE:  hwnd must have been allocated using kmalloc() (or related allocators)
- *   Once provided to nx_constructwindow() that memory is owned and managed
- *   by NX.  On certain error conditions or when the window is closed, NX will
- *   free the window.
+ *   NOTE:  hwnd must have been allocated using a user-space allocator that
+ *   permits user access to the window.  Once provided to nx_constructwindow()
+ *   that memory is owned and managed by NX.  On certain error conditions or
+ *   when the window is closed, NX will free the window.
  *
  * Input Parameters:
  *   handle - The handle returned by nx_connect
diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c
index 773210853..b1e632937 100644
--- a/nuttx/graphics/nxsu/nx_openwindow.c
+++ b/nuttx/graphics/nxsu/nx_openwindow.c
@@ -80,7 +80,7 @@
  *
  * Input Parameters:
  *   handle - The handle returned by nx_connect
- *   cb     - Callbacks used to process windo events
+ *   cb     - Callbacks used to process window events
  *   arg    - User provided value that will be returned with NX callbacks.
  *
  * Return: