Completes first cut at task bar

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

2 files changed, 434 insertions, 0 deletions

diff --git a/NxWidgets/UnitTests/nxwm/Makefile b/NxWidgets/UnitTests/nxwm/Makefile
new file mode 100644
index 000000000..d9cf2d051
--- /dev/null
+++ b/NxWidgets/UnitTests/nxwm/Makefile
@@ -0,0 +1,172 @@
+#################################################################################
+# NxWidgets/Unitests/nxwm/Makefile
+#
+#   Copyright (C) 2012 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, NxWidgets, nor the names of its contributors
+#    me 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.
+#
+#################################################################################
+
+TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# Add the path to the NXWidget include directory to the CFLAGS
+
+NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+
+INCDIR=$(TOPDIR)/tools/incdir.sh
+ifeq ($(WINTOOL),y)
+  CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
+  CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
+else
+  CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
+  CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
+endif
+
+# Get the path to the archiver tool
+
+TESTTOOL_DIR="$(TESTDIR)/../../tools"
+ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+
+# Hello, World! C++ Example
+
+ASRCS		=
+CSRCS		=
+CXXSRCS		= main.cxx
+
+AOBJS		= $(ASRCS:.S=$(OBJEXT))
+COBJS		= $(CSRCS:.c=$(OBJEXT))
+CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
+
+SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
+OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
+
+POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+ifeq ($(WINTOOL),y)
+  BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
+else
+  BIN		= $(POSIX_BIN)
+endif
+
+ROOTDEPPATH	= --dep-path .
+
+# helloxx built-in application info
+
+APPNAME		= nxwm
+PRIORITY	= SCHED_PRIORITY_DEFAULT
+STACKSIZE	= 2048
+
+# Common build
+
+VPATH		= 
+
+all: .built
+.PHONY:	clean depend context disclean chkcxx chklib
+
+# Object file creation targets
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(CXXOBJS): %$(OBJEXT): %.cxx
+	$(call COMPILEXX, $<, $@)
+
+# Verify that the NuttX configuration is setup to support C++
+
+chkcxx:
+ifneq ($(CONFIG_HAVE_CXX),y)
+	@echo ""
+	@echo "In order to use this example, you toolchain must support must"
+	@echo ""
+	@echo "  (1) Explicitly select CONFIG_HAVE_CXX to build in C++ support"
+	@echo "  (2) Define CXX, CXXFLAGS, and COMPILEXX in the Make.defs file"
+	@echo "      of the configuration that you are using."
+	@echo ""
+	@exit 1
+endif
+
+# Verify that the NXWidget library has been built
+
+chklib:
+	@( \
+		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
+			echo "$(NXWIDGETS_LIB) does not exist."; \
+			echo "Please go to $(NXWIDGETS_DIR)"; \
+			echo "and rebuild the library"; \
+			exit 1; \
+		fi; \
+	  )
+
+# Library creation targets
+
+$(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
+
+.built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $(BIN), $${obj}); \
+	   done ; )
+ifeq ($(WINTOOL),y)
+	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+else
+	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+endif
+	@touch .built
+
+# Standard housekeeping targets
+
+.context:
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+endif
+	@touch $@
+
+context: .context
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+depend: .depend
+
+clean:
+	@rm -f *.o *~ .*.swp .built
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/NxWidgets/UnitTests/nxwm/main.cxx b/NxWidgets/UnitTests/nxwm/main.cxx
new file mode 100644
index 000000000..dffa7b600
--- /dev/null
+++ b/NxWidgets/UnitTests/nxwm/main.cxx
@@ -0,0 +1,262 @@
+/////////////////////////////////////////////////////////////////////////////
+// NxWidgets/UnitTests/nxwm/main.cxx
+//
+//   Copyright (C) 2012 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, NxWidgets, nor the names of its contributors
+//    me 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 "ctaskbar.hxx"
+#include "cstartwindow.hxx"
+
+/////////////////////////////////////////////////////////////////////////////
+// Pre-processor Definitions
+/////////////////////////////////////////////////////////////////////////////
+
+// What is the entry point called?
+
+#ifdef CONFIG_NSH_BUILTIN_APPS
+#  define MAIN_NAME nxwm_main
+#  define MAIN_STRING "nxwm_main: "
+#else
+#  define MAIN_NAME user_start
+#  define MAIN_STRING "user_start: "
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// Private Types
+/////////////////////////////////////////////////////////////////////////////
+
+struct nxwm_test_s
+{
+  NxWM::CTaskbar     *taskbar;     // The task bar
+  NxWM::CStartWindow *startwindow; // The start window
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Private Data
+/////////////////////////////////////////////////////////////////////////////
+
+static struct nxwm_test_s g_nxwmtest;
+
+/////////////////////////////////////////////////////////////////////////////
+// Public Function Prototypes
+/////////////////////////////////////////////////////////////////////////////
+
+// Suppress name-mangling
+
+extern "C" int MAIN_NAME(int argc, char *argv[]);
+
+/////////////////////////////////////////////////////////////////////////////
+// Public Functions
+/////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////
+// user_start/nxwm_main
+/////////////////////////////////////////////////////////////////////////////
+
+int MAIN_NAME(int argc, char *argv[])
+{
+  // Create an instance of the Task Bar.
+  //
+  // The general sequence for initializing the task bar is:
+  //
+  // 1. Create the CTaskbar instance,
+  // 2. Call the CTaskbar::connect() method to connect to the NX server (CTaskbar
+  //    inherits the connect method from CNxServer),
+  // 3. Call the CTaskbar::initWindowManager() method to initialize the task bar.
+  // 3. Call CTaskBar::startApplication repeatedly to add applications to the task bar
+  // 4. Call CTaskBar::startWindowManager to start the display with applications in place
+
+  printf(MAIN_STRING "Create CTaskbar instance\n");
+  g_nxwmtest.taskbar = new CTaskbar();
+  if (!g_nxwmtest.taskbar)
+    {
+      printf(MAIN_STRING "ERROR: Failed to instantiate CTaskbar\n");
+      return EXIT_FAILURE;
+    }
+
+  // Connect to the NX server
+
+  printf(MAIN_STRING "Connect the CTaskbar instance to the NX server\n");
+  if (!g_nxwmtest.taskbar->connect())
+    {
+      printf(MAIN_STRING "ERROR: Failed to connect the CTaskbar instance to the NX server\n");
+      delete g_nxwmtest.taskbar;
+      return EXIT_FAILURE;
+    }
+
+  // Initialize the task bar
+  //
+  // Taskbar::initWindowManager() prepares the task bar to receive applications.
+  // CTaskBar::startWindowManager() brings the window manager up with those applications
+  // in place.
+
+  printf(MAIN_STRING "Initialize the CTaskbar instance\n");
+  if (!g_nxwmtest.taskbar->initWindowManager())
+    {
+      printf(MAIN_STRING "ERROR: Failed to intialize the CTaskbar instance\n");
+      delete g_nxwmtest.taskbar;
+      return EXIT_FAILURE;
+    }
+  
+  // Create the start window.  The general sequence for setting up the start window is:
+  //
+  // 1. Call CTaskBar::openApplicationWindow to create a window for the start window,
+  // 2. Use the window to instantiate Cstartwindow
+  // 3. Call Cstartwindow::addApplication numerous times to install applications
+  //    in the start window.
+  // 4. Call CTaskBar::startApplication (initially minimized) to start the start
+  //    window application.
+
+  printf(MAIN_STRING "Opening the start window application window\n");
+  CApplicationWindow *window = g_nxwmtest.taskbar->openApplicationWindow();
+  if (!window)
+    {
+      printf(MAIN_STRING "ERROR: Failed to create CApplicationWindow for the start window\n");
+      delete g_nxwmtest.taskbar;
+      return EXIT_FAILURE;
+    }
+
+  printf(MAIN_STRING "Creating the start window application\n");
+  g_nxwmtest.startwindow = new NxWM::CStartWindow(g_nxwmtest.taskbar, window);
+  if (!g_nxwmtest.taskbar)
+    {
+      printf(MAIN_STRING "ERROR: Failed to instantiate CStartWindow\n");
+      delete window;
+      delete g_nxwmtest.taskbar;
+      return EXIT_FAILURE;
+    }
+
+  // Add the NxConsole application to the start window
+
+#if 0
+  printf(MAIN_STRING "Opening the NxConsole application window\n");
+  window = g_nxwmtest.taskbar->openApplicationWindow();
+  if (!window)
+    {
+      printf(MAIN_STRING "ERROR: Failed to create CApplicationWindow for the NxConsole\n");
+      goto noconsole;
+    }
+
+  printf(MAIN_STRING "Creating the NxConsole application\n");
+  NxWM::CNxConsole *console = new CNxConsole(window);
+  if (!console)
+    {
+      printf(MAIN_STRING "ERROR: Failed to instantiate CNxConsole\n");
+      delete window;
+      goto noconsole;
+    }
+
+  printf(MAIN_STRING "Adding the NxConsole application to the start window\n");
+  if (!g_nxwmtest.startwindow->addApplication(console))
+    {
+      printf(MAIN_STRING "ERROR: Failed to add CNxConsole to the start menu\n");
+      delete window;
+    }
+
+noconsole:
+#endif
+
+  // Add the calculator application to the start window
+
+#if 0
+  printf(MAIN_STRING "Opening the calculator application window\n");
+  window = g_nxwmtest.taskbar->openApplicationWindow();
+  if (!window)
+    {
+      printf(MAIN_STRING "ERROR: Failed to create CApplicationWindow for the calculator\n");
+      goto nocalculator;
+    }
+
+  printf(MAIN_STRING "Creating the calculator application\n");
+  NxWM::CCalculator *calculator = new CCalculator(window);
+  if (!calculator)
+    {
+      printf(MAIN_STRING "ERROR: Failed to instantiate calculator\n");
+      delete window;
+      goto nocalculator;
+    }
+
+  printf(MAIN_STRING "Adding the calculator application to the start window\n");
+  if (!g_nxwmtest.startwindow->addApplication(calculator))
+    {
+      printf(MAIN_STRING "ERROR: Failed to add calculator to the start menu\n");
+      delete window;
+    }
+
+nocalculator:
+#endif
+
+  // Call CTaskBar::startApplication to start the start window application.  The initial
+  // state of the start window is minimized.
+
+  printf(MAIN_STRING "Start the start window application\n");
+  if (!g_nxwmtest.taskbar->startApplication(g_nxwmtest.startwindow, true))
+    {
+      printf(MAIN_STRING "ERROR: Failed to start the start window application\n");
+
+      // Delete the task bar then the start window.  the order is important because
+      // we must bet all of the application references out of the task bar before
+      // deleting the start window.  When the start window is deleted, it will
+      // also delete of of the resouces contained within the start window.
+
+      delete g_nxwmtest.taskbar;
+      delete g_nxwmtest.startwindow;
+      return EXIT_FAILURE;
+    }
+
+  // Call CTaskBar::startWindowManager to start the display with applications in place.
+  // This method will not return but will enter the task bar's modal loop.
+
+  printf(MAIN_STRING "Start the window manager\n");
+  if (!g_nxwmtest.taskbar->startWindowManager())
+    {
+      printf(MAIN_STRING "ERROR: Failed to start the window manager\n");
+
+      // Delete the task bar then the start window.  the order is important because
+      // we must bet all of the application references out of the task bar before
+      // deleting the start window.  When the start window is deleted, it will
+      // also delete of of the resouces contained within the start window.
+
+      delete g_nxwmtest.taskbar;
+      delete g_nxwmtest.startwindow;
+      return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;    
+}
+