More NX window manager pieces

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

5 files changed, 406 insertions, 7 deletions

diff --git a/NxWidgets/nxwm/include/cnxbackimage.hxx b/NxWidgets/nxwm/include/cnxbackimage.hxx
new file mode 100644
index 000000000..903a4880d
--- /dev/null
+++ b/NxWidgets/nxwm/include/cnxbackimage.hxx
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * NxWidgets/nxwm/include/cnxbackimage.hxx
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __NXWM_INCLUDE_CNXBACKIMAGE_HXX
+#define __NXWM_INCLUDE_CNXBACKIMAGE_HXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "nxconfig.hxx"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Implementation Class Definition
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NxWM
+{
+  /**
+   * This class describes the NX windo manager's background image.
+   */
+
+  class CNxBackImage : public NxWidgets::CImage
+  {
+  private:
+    NxWidgets::CWidgetControl    *m_widgetControl;  // The controlling widget for the window
+
+  public:
+    /**
+     * CNxBackImage Constructor
+     */
+
+    CNxBackImage(void);
+
+    /**
+     * CNxBackImage Destructor
+     */
+
+    ~CNxBackImage(void);
+  };
+}
+
+#endif // __cplusplus
+#endif // __NXWM_INCLUDE_CNXBACKIMAGE_HXX
diff --git a/NxWidgets/nxwm/include/cnxconsole.hxx b/NxWidgets/nxwm/include/cnxconsole.hxx
index eb76ba10b..793a46849 100644
--- a/NxWidgets/nxwm/include/cnxconsole.hxx
+++ b/NxWidgets/nxwm/include/cnxconsole.hxx
@@ -43,6 +43,7 @@
 #include <nuttx/config.h>
 
 #include "crlepalettebitmap.hxx"
+#include "inxwindow.hxx"
 #include "cnxapplication.hxx"
 
 /****************************************************************************
@@ -69,18 +70,21 @@ namespace NxWM
 
   class CNxConsole : public CNxApplication
   {
-    public:
+    protected:
       /**
-       * CNxConsole constructor
+       * CNxConsole destructor
        */
 
-      CNxConsole(void);
+      ~CNxConsole(void);
 
+    public:
       /**
-       * CNxConsole destructor
+       * CNxConsole constructor
+       *
+       * @param window.  The application window
        */
 
-      ~CNxConsole(void);
+      CNxConsole(NXWidgets::INxWindow *window);
 
       /**
        * Get the icon associated with the application
diff --git a/NxWidgets/nxwm/include/cnxstart.hxx b/NxWidgets/nxwm/include/cnxstart.hxx
new file mode 100644
index 000000000..42ea67b35
--- /dev/null
+++ b/NxWidgets/nxwm/include/cnxstart.hxx
@@ -0,0 +1,102 @@
+/****************************************************************************
+ * NxWidgets/nxwm/include/cnxstart.hxx
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_CNXSTART_NXX
+#define __INCLUDE_CNXSTART_NXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+ 
+#include <nuttx/config.h>
+
+#include "cnxapplication.hxx"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Abstract Base Classes
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NxWM
+{
+  class CNxStart : public INxApplication
+  {
+  protected:
+    CNxTaskbar *m_taskbar; /**< Reference to the "parent" taskbar */
+
+    /**
+     * CNxStart Constructor
+     */
+
+    ~CNxStart(void);
+
+  public:
+
+    /**
+     * CNxStart Constructor
+     */
+
+    CNxStart(CNxTaskbar *taskbar);
+
+    /**
+     * Get the icon associated with the application
+     *
+     * @return An instance if INxBitmap that may be used to rend the
+     *   application's icon.  This is an new INxBitmap instance that must
+     *   be deleted by the caller when it is no long needed.
+     */
+
+    NXWidgets::INxBitmap *getIcon(void);
+
+    /**
+     * Add the application to the start window
+     *
+     * @param application.  The new application to add to the start window
+     * @return true on success
+     */
+
+    bool addApplication(INxApplication *application);
+
+  };
+}
+
+#endif // __cplusplus
+
+#endif // __INCLUDE_CNXSTART_NXX
diff --git a/NxWidgets/nxwm/include/cnxtaskbar.hxx b/NxWidgets/nxwm/include/cnxtaskbar.hxx
new file mode 100644
index 000000000..ff8b7e4c1
--- /dev/null
+++ b/NxWidgets/nxwm/include/cnxtaskbar.hxx
@@ -0,0 +1,201 @@
+/****************************************************************************
+ * NxWidgets/nxwm/include/cnxtaskbar.hxx
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __NXWM_INCLUDE_CNXTASKBAR_HXX
+#define __NXWM_INCLUDE_CNXTASKBAR_HXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "nxconfig.hxx"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Implementation Class Definition
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NxWM
+{
+  /**
+   * This class describes the NX window manager's task bar
+   */
+
+  class CNxTaskBar : public  NxWidgets::CNxServer
+  {
+  private:
+    NxWidgets:INxWindow       *m_toolbar;        /**< The toolbar window */
+    NxWidgets:INxWindow       *m_background;     /**< The background window */
+    INxApplication            *m_start;          /**< The start window */
+
+    /**
+     * Connect to the server
+     */
+ 
+    bool connect(void);
+
+    /**
+     * Disconnect from the server
+     */
+
+    void disconnect(void);
+
+    /**
+     * Create a raw window. 
+     *
+     * 1) Create a dumb CWigetControl instance
+     * 2) Pass the dumb CWidgetControl instance to the window constructor
+     *    that inherits from INxWindow.  This will "smarten" the CWidgetControl
+     *    instance with some window knowlede
+     * 3) Call the open() method on the window to display the window.
+     * 4) After that, the fully smartened CWidgetControl instance can
+     *    be used to generate additional widgets by passing it to the
+     *    widget constructor
+     */
+
+    NXWidgets::INxWindow *openRawWindow(void);
+
+    /**
+     * Create a framed application window
+     *
+     * This may be used to provide the window parater to the INxApplication constructor
+     *
+     * @return A partially initialized application window instance.
+     */
+ 
+    NXWidgets::INxWindow *openFramedWindow(void);
+
+    /**
+     * Create the toolbar window.
+     *
+     * @return true on success
+     */
+
+    bool createToolbarWindow(void);
+
+    /**
+     * Create the background window. 
+     *
+     * @return true on success
+     */
+
+    bool createBackgroundWindow(void);
+
+    /**
+     * CNxTaskBar Destructor
+     */
+
+    ~CNxTaskBar(void);
+
+  public:
+    /**
+     * CNxTaskBar Constructor
+     *
+     * @param hWnd - NX server handle
+     */
+
+    CNxTaskBar(void);
+
+    /**
+     * Add the application to the start window.  The window manager start-up
+     * sequence is:
+     *
+     * 1. Create the CNxTaskBar instance,
+     * 2. Call addApplication repeatedly to add applications to the start window
+     * 3. Call startWindowManager to start the display
+     *
+     * @param application.  The new application to add to the start window
+     * @return true on success
+     */
+
+    bool addApplication(INxApplication *application);
+
+    /**
+     * Start the window manager and present the initial displays.  The window
+     * manager start-up sequence is:
+     *
+     * 1. Create the CNxTaskBar instance,
+     * 2. Call addApplication repeatedly to add applications to the start window
+     * 3. Call startWindowManager to start the display
+     *
+     * startWindowManager will present the taskar and the background image.  The
+     * initial taskbar will contain only the start window icon.
+     *
+     * @param application.  The new application to add to the start window
+     * @return true on success
+     */
+
+    bool startWindowManager(start);
+
+    /**
+     * Start an application and add its icon to the taskbar.  The applications's
+     * window is brought to the top.
+     *
+     * @param application.  The new application to add to the task bar
+     * @return true on success
+     */
+
+    bool startApplication(INxApplication *application);
+
+    /**
+     * Hide an application by moving its window to the bottom.
+     *
+     * @param application.  The new application to add to the task bar
+     * @return true on success
+     */
+
+    bool hideApplication(INxApplication *application);
+
+    /**
+     * Destroy an application.  Move its window to the bottom and remove its
+     * icon from the task bar.
+     *
+     * @param application.  The new application to remove from the task bar
+     * @return true on success
+     */
+
+    bool stopApplication(INxApplication *application);
+  };
+}
+
+#endif // __cplusplus
+#endif // __NXWM_INCLUDE_CNXTASKBAR_HXX
diff --git a/NxWidgets/nxwm/include/inxapplication.hxx b/NxWidgets/nxwm/include/inxapplication.hxx
index 367ba871f..ef7c52326 100644
--- a/NxWidgets/nxwm/include/inxapplication.hxx
+++ b/NxWidgets/nxwm/include/inxapplication.hxx
@@ -42,8 +42,6 @@
  
 #include <nuttx/config.h>
 
-#include "ibitmap.hxx"
-
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
@@ -68,6 +66,12 @@ namespace NxWM
        */
 
       virtual NXWidgets::INxBitmap *getIcon(void) = 0;
+
+      /**
+       * Start the application.
+       */
+
+      virtual run(void) = 0;
   };
 }