Add a simulated touchscreen driver

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3989 42af7a65-404d-4744-a932-0658087f49c3

arch/sim/src/Makefile

@@ -53,6 +53,10 @@ else
   CSRCS += up_framebuffer.c
 ifeq ($(CONFIG_SIM_X11FB),y)
   HOSTSRCS += up_x11framebuffer.c
+ifeq ($(CONFIG_SIM_TOUCHSCREEN),y)
+  CSRCS += up_touchscreen.c
+  HOSTSRCS += up_x11eventloop.c
+endif
 endif
 endif
 

arch/sim/src/up_framebuffer.c

@@ -113,21 +113,6 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursorattr
 static int up_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcursor_s *setttings);
 #endif
 
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifdef CONFIG_SIM_X11FB
-extern int up_x11initialize(unsigned short width, unsigned short height,
-                            void **fbmem, unsigned int *fblen, unsigned char *bpp,
-                            unsigned short *stride);
-#ifdef CONFIG_FB_CMAP
-extern int up_x11cmap(unsigned short first, unsigned short len,
-                      unsigned char *red, unsigned char *green,
-                      unsigned char *blue, unsigned char  *transp);
-#endif
-#endif
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/

arch/sim/src/up_initialize.c

@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs.h>
 
+#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************
@@ -98,10 +99,32 @@ void up_initialize(void)
   devnull_register();       /* Standard /dev/null */
   devzero_register();       /* Standard /dev/zero */
   up_devconsole();          /* Our private /dev/console */
+
 #if defined(CONFIG_FS_FAT) && !defined(CONFIG_DISABLE_MOUNTPOINT)
   up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */
 #endif
+
 #ifdef CONFIG_NET
   uipdriver_init();         /* Our "real" netwok driver */
 #endif
+
+  /* Start the X11 event loop and register the touchscreen driver */
+
+#if defined(CONFIG_SIM_X11FB) && defined(CONFIG_SIM_TOUCHSCREEN)
+  {
+    int ret;
+
+    /* Start the X11 event loop */
+
+    ret = KERNEL_THREAD("evloop", CONFIG_SIM_EVLOOPPRIORITY,
+                        CONFIG_SIM_EVLOOPSTACKSIZE,
+                        (main_t)up_x11eventloop, (const char **)NULL);
+    ASSERT(ret != ERROR);
+
+    /* Register the touchscreen driver */
+
+    ret = up_tcregister(0);
+    ASSERT(ret == OK);
+  }
+#endif
 }

arch/sim/src/up_internal.h

@@ -1,7 +1,7 @@
 /**************************************************************************
  * up_internal.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,26 +45,56 @@
 #include <nuttx/irq.h>
 
 /**************************************************************************
- * Public Definitions
+ * Pre-processor Definitions
  **************************************************************************/
+/* Configuration **********************************************************/
 
-/* Storage order: %ebx, $esi, %edi, %ebp, sp, and return PC */
-#ifdef __ASSEMBLY__
-# define JB_EBX (0*4)
-# define JB_ESI (1*4)
-# define JB_EDI (2*4)
-# define JB_EBP (3*4)
-# define JB_SP  (4*4)
-# define JB_PC  (5*4)
+#ifndef CONFIG_SIM_X11FB
+#  ifdef CONFIG_SIM_TOUCHSCREEN
+#    error "CONFIG_SIM_TOUCHSCREEN depends on CONFIG_SIM_X11FB"
+#    undef CONFIG_SIM_TOUCHSCREEN
+#  endif
+#endif
+
+#ifndef CONFIG_INPUT
+#  ifdef CONFIG_SIM_TOUCHSCREEN
+#    error "CONFIG_SIM_TOUCHSCREEN depends on CONFIG_INPUT"
+#    undef CONFIG_SIM_TOUCHSCREEN
+#  endif
+#endif
+
+#ifdef CONFIG_SIM_TOUCHSCREEN
+#  ifndef CONFIG_SIM_EVLOOPPRIORITY
+#    define CONFIG_SIM_EVLOOPPRIORITY 50
+#  endif
+#  ifndef CONFIG_SIM_EVLOOPSTACKSIZE
+#    define CONFIG_SIM_EVLOOPSTACKSIZE 4096
+#  endif
 #else
-# define JB_EBX (0)
-# define JB_ESI (1)
-# define JB_EDI (2)
-# define JB_EBP (3)
-# define JB_SP  (4)
-# define JB_PC  (5)
+#  undef CONFIG_SIM_EVLOOPPRIORITY
+#  undef CONFIG_SIM_EVLOOPSTACKSIZE
+#endif
+
+/* Context Switching Definitions ******************************************/
+/* Storage order: %ebx, $esi, %edi, %ebp, sp, and return PC */
+
+#ifdef __ASSEMBLY__
+#  define JB_EBX (0*4)
+#  define JB_ESI (1*4)
+#  define JB_EDI (2*4)
+#  define JB_EBP (3*4)
+#  define JB_SP  (4*4)
+#  define JB_PC  (5*4)
+#else
+#  define JB_EBX (0)
+#  define JB_ESI (1)
+#  define JB_EDI (2)
+#  define JB_EBP (3)
+#  define JB_SP  (4)
+#  define JB_PC  (5)
 #endif /* __ASSEMBLY__ */
 
+/* Simulated Heap Definitions **********************************************/
 /* Size of the simulated heap */
 
 #if CONFIG_MM_SMALL
@@ -73,6 +103,7 @@
 #  define SIM_HEAP_SIZE (4*1024*1024)
 #endif
 
+/* File System Definitions **************************************************/
 /* These definitions characterize the compressed filesystem image */
 
 #define BLOCK_COUNT         1024
@@ -126,6 +157,37 @@ extern size_t up_hostwrite(const void *buffer, size_t len);
 extern unsigned long up_getwalltime( void );
 #endif
 
+/* up_x11framebuffer.c ******************************************************/
+
+#ifdef CONFIG_SIM_X11FB
+extern int up_x11initialize(unsigned short width, unsigned short height,
+                            void **fbmem, unsigned int *fblen, unsigned char *bpp,
+                            unsigned short *stride);
+#ifdef CONFIG_FB_CMAP
+extern int up_x11cmap(unsigned short first, unsigned short len,
+                      unsigned char *red, unsigned char *green,
+                      unsigned char *blue, unsigned char  *transp);
+#endif
+#endif
+
+/* up_eventloop.c ***********************************************************/
+
+#ifdef CONFIG_SIM_X11FB
+#ifdef CONFIG_SIM_TOUCHSCREEN
+extern int up_x11eventloop(int argc, char *argv[]);
+#endif
+#endif
+
+/* up_eventloop.c ***********************************************************/
+
+#ifdef CONFIG_SIM_X11FB
+#ifdef CONFIG_SIM_TOUCHSCREEN
+extern int up_tcregister(int minor);
+extern int up_tcenter(int x, int y, int buttons);
+extern int up_tcleave(int x, int y, int buttons);
+#endif
+#endif
+
 /* up_tapdev.c ************************************************************/
 
 #if defined(CONFIG_NET) && !defined(__CYGWIN__)

arch/sim/src/up_x11eventloop.c

@@ -0,0 +1,168 @@
+/****************************************************************************
+ * arch/sim/src/up_x11eventloop.c
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 <stdio.h>
+#include <X11/Xlib.h>
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Type Declarations
+ ***************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+extern int up_tcenter(int x, int y, int buttons);
+extern int up_tcleave(int x, int y, int buttons);
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/* Defined in up_x11framebuffer.c */
+
+extern Display *g_display;
+extern Window g_window;
+
+/****************************************************************************
+ * Private Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ***************************************************************************/
+
+/****************************************************************************
+ * Name: up_x11eventloop
+ ***************************************************************************/
+
+static int up_buttonmap(int state)
+{
+  int ret = 0;
+
+  /* Remove any X11 dependencies.  Possible bit settings include:  Button1Mask,
+   * Button2Mask, Button3Mask, Button4Mask, Button5Mask, ShiftMask, LockMask,
+   * ControlMask, Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask.  I assume
+   * that for a mouse device Button1Mask, Button2Mask, and Button3Mask are
+   * sufficient.
+   */
+
+  if ((state & Button1Mask) != 0)
+    {
+      ret |= 1;
+    }
+
+  if ((state & Button2Mask) != 0)
+    {
+      ret |= 2;
+    }
+
+  if ((state & Button3Mask) != 0)
+    {
+      ret |= 4;
+    }
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ***************************************************************************/
+
+/****************************************************************************
+ * Name: up_x11eventloop
+ ***************************************************************************/
+
+int up_x11eventloop(int argc, char *argv[])
+{
+  XEvent event;
+  int ret;
+
+  /* Grab the pointer (mouse) */
+
+  ret = XGrabPointer(g_display, g_window, 0,
+                     EnterWindowMask|LeaveWindowMask,
+                     GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+  if (ret != GrabSuccess)
+    {
+      fprintf(stderr, "Failed grap pointer\n");
+      return -1;
+    }
+
+  /* Then loop forever, waiting for events and processing events as they are
+   * received.
+   */
+ 
+  for (;;)
+    {
+      XNextEvent(g_display, &event);
+      switch (event.type)
+        {
+          case EnterNotify:
+            {
+              fprintf(stderr, "EnterNotify event: (%d,%d) %08x\n",
+                      event.xcrossing.x, event.xcrossing.y, event.xcrossing.state);
+              up_tcenter(event.xcrossing.x, event.xcrossing.y,
+                         up_buttonmap(event.xcrossing.state));
+            }
+            break;
+
+          case LeaveNotify :
+            {
+              fprintf(stderr, "LeaveNotify event: (%d,%d) %08x\n",
+                      event.xcrossing.x, event.xcrossing.y, event.xcrossing.state);
+              up_tcleave(event.xcrossing.x, event.xcrossing.y,
+                         up_buttonmap(event.xcrossing.state));
+            }
+            break;
+
+          default :
+            fprintf(stderr, "Unrecognized event: %d\n", event.type);
+            break;
+        }
+    }
+  return 0;
+}

arch/sim/src/up_x11framebuffer.c

@@ -64,16 +64,19 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Global Variables
+ * Public Variables
  ****************************************************************************/
 
+/* Also used in up_x11eventloop */
+
+Display *g_display;
+Window g_window;
+
 /****************************************************************************
  * Private Variables
  ****************************************************************************/
 
-static Display *g_display;
 static int g_screen;
-static Window g_window;
 static GC g_gc;
 #ifndef CONFIG_SIM_X11NOSHM
 static XShmSegmentInfo g_xshminfo;
@@ -438,4 +441,3 @@ void up_x11update(void)
     }
   XSync(g_display, 0);
 }
-