More NxWM support

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

11 files changed, 362 insertions, 215 deletions

diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx
index 3d868e576..adeac30dc 100644
--- a/NxWidgets/nxwm/include/capplicationwindow.hxx
+++ b/NxWidgets/nxwm/include/capplicationwindow.hxx
@@ -165,7 +165,27 @@ namespace NxWM
     {
       m_callback = callback;
     }
-  };
+
+    /**
+     * Simulate a mouse click on the minimize icon.  This inline method is only
+     * used during automated testing of NxWM.
+     */
+
+    inline void clickMinimizeIcon(int index)
+    {
+       m_minimizeImage->click(0,0);
+    }
+
+    /**
+     * Simulate a mouse click on the stop applicaiton icon.  This inline method is only
+     * used during automated testing of NxWM.
+     */
+
+    inline void clickStopIcon(int index)
+    {
+       m_stopImage->click(0,0);
+    }
+   };
 }
 
 #endif // __cplusplus
diff --git a/NxWidgets/nxwm/include/cnxconsole.hxx b/NxWidgets/nxwm/include/cnxconsole.hxx
index 99a9b92f2..7754276a7 100644
--- a/NxWidgets/nxwm/include/cnxconsole.hxx
+++ b/NxWidgets/nxwm/include/cnxconsole.hxx
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_CNXCONSOLE_NXX
-#define __INCLUDE_CNXCONSOLE_NXX
+#ifndef __INCLUDE_CNXCONSOLE_HXX
+#define __INCLUDE_CNXCONSOLE_HXX
 
 /****************************************************************************
  * Included Files
@@ -77,12 +77,19 @@ namespace NxWM
 
   class CNxConsole : public IApplication, private IApplicationCallback
   {
-  protected:
+  private:
     CTaskbar            *m_taskbar;  /**< Reference to the "parent" taskbar */
     CApplicationWindow  *m_window;   /**< Reference to the application window */
     NXCONSOLE            m_nxcon;    /**< NxConsole handle */
     pid_t                m_pid;      /**< Task ID of the NxConsole thread */
 
+   /**
+    * This is the NxConsole task.  This function first redirects output to the
+    * console window.
+    */
+
+    static int nxconsole(int argc, char *argv[]);
+
     /**
      * Called when the window minimize button is pressed.
      */
@@ -170,4 +177,4 @@ namespace NxWM
 }
 #endif // __cplusplus
 
-#endif // __INCLUDE_CNXCONSOLE_NXX
+#endif // __INCLUDE_CNXCONSOLE_HXX
diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx
index ab6b6f926..649bf3247 100644
--- a/NxWidgets/nxwm/include/cstartwindow.hxx
+++ b/NxWidgets/nxwm/include/cstartwindow.hxx
@@ -116,12 +116,6 @@ namespace NxWM
 
     void handleClickEvent(const NXWidgets::CWidgetEventArgs &e);
 
-    /**
-     * CStartWindow Constructor
-     */
-
-    ~CStartWindow(void);
-
   public:
 
     /**
@@ -134,6 +128,12 @@ namespace NxWM
     CStartWindow(CTaskbar *taskbar, CApplicationWindow *window);
 
     /**
+     * CStartWindow Constructor
+     */
+
+    ~CStartWindow(void);
+
+    /**
      * Each implementation of IApplication must provide a method to recover
      * the contained CApplicationWindow instance.
      */
@@ -185,7 +185,7 @@ namespace NxWM
      * CTaskbar when the application window must be displayed
      */
 
-    virtual void redraw(void) = 0;
+    void redraw(void);
 
     /**
      * Add the application to the start window.  The general sequence for
@@ -203,6 +203,19 @@ namespace NxWM
      */
 
     bool addApplication(IApplication *app);
+
+    /**
+     * Simulate a mouse click on the icon at index.  This inline method is only
+     * used during automated testing of NxWM.
+     */
+
+    inline void clickIcon(int index)
+    {
+      if (index < m_slots.size())
+       {
+         m_slots.at(index).image->click(0,0);
+       }
+    }
   };
 }
 
diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx
index 1de4a7491..f5bef2054 100644
--- a/NxWidgets/nxwm/include/ctaskbar.hxx
+++ b/NxWidgets/nxwm/include/ctaskbar.hxx
@@ -101,18 +101,6 @@ namespace NxWM
     TNxArray<struct STaskbarSlot> m_slots;      /**< List of application slots in the task bar */
 
     /**
-     * Connect to the server
-     */
- 
-    bool connect(void);
-
-    /**
-     * Disconnect from the server
-     */
-
-    void disconnect(void);
-
-    /**
      * Create a raw window. 
      *
      * 1) Create a dumb CWigetControl instance
@@ -202,20 +190,32 @@ namespace NxWM
 
     void handleClickEvent(const NXWidgets::CWidgetEventArgs &e);
 
+  public:
+    /**
+     * CTaskbar Constructor
+     *
+     * @param hWnd - NX server handle
+     */
+
+    CTaskbar(void);
+
     /**
      * CTaskbar Destructor
      */
 
     ~CTaskbar(void);
 
-  public:
     /**
-     * CTaskbar Constructor
-     *
-     * @param hWnd - NX server handle
+     * Connect to the server
      */
+ 
+    bool connect(void);
 
-    CTaskbar(void);
+    /**
+     * Disconnect from the server
+     */
+
+    void disconnect(void);
 
     /**
      * Initialize task bar.  Task bar initialization is separate from
@@ -341,6 +341,19 @@ namespace NxWM
      */
 
     bool stopApplication(IApplication *app);
+
+    /**
+     * Simulate a mouse click on the icon at index.  This inline method is only
+     * used duringautomated testing of NxWM.
+     */
+
+    inline void clickIcon(int index)
+    {
+      if (index < m_slots.size())
+       {
+         m_slots.at(index).image->click(0,0);
+       }
+    }
   };
 }
 
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index a683dbd5f..d76b08098 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -50,11 +50,41 @@
  ****************************************************************************/
 /* General Configuration ****************************************************/
 /**
+ * Required settings:
+ *
+ * CONFIG_HAVE_CXX        : C++ support is required
+ * CONFIG_NX              : NX must enabled
+ * CONFIG_NX_MULTIUSER=y  : NX must be configured in multiuse mode
+ * CONFIG_NXCONSOLE=y     : For NxConsole support
+ *
+ * General settings:
+ *
+ * CONFIG_NXWM_DEFAULT_FONTID - the NxWM default font ID. Default:
+ *   NXFONT_DEFAULT
+ */
+
+#ifndef CONFIG_HAVE_CXX
+#  error "C++ support is required (CONFIG_HAVE_CXX)"
+#endif
+
+/**
  * NX Multi-user support is required
  */
 
+#ifndef CONFIG_NX
+#  error "NX support is required (CONFIG_NX)"
+#endif
+
 #ifndef CONFIG_NX_MULTIUSER
-#  warning "NX multi-user support is required (CONFIG_NX_MULTIUSER)"
+#  error "NX multi-user support is required (CONFIG_NX_MULTIUSER)"
+#endif
+
+/**
+ * NxConsole support is (probably) required
+ */
+
+#ifndef CONFIG_NXCONSOLE
+#  warning "NxConsole support may be needed (CONFIG_NXCONSOLE)"
 #endif
 
 /**
@@ -67,6 +97,27 @@
 
 /* Colors *******************************************************************/
 /**
+ * Color configuration
+ *
+ * CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR - Normal background color.  Default:
+ *    MKRGB(160,160,160)
+ * CONFIG_NXWM_DEFAULT_SELECTEDBACKGROUNDCOLOR - Select background color. 
+ *    Default:  MKRGB(120,192,192)
+ * CONFIG_NXWM_DEFAULT_FOREGROUNDCOLOR - Normal "foreground" color.  Default:
+ *    MKRGB(192,192,192)
+ * CONFIG_NXWM_DEFAULT_SELECTEDFOREGROUNDCOLOR - Selected "foreground" color.
+ *    Default: MKRGB(192,192,192)
+ * CONFIG_NXWM_DEFAULT_SHINEEDGECOLOR - Color of the bright edge of a border.
+ *    Default: MKRGB(255,255,255)
+ * CONFIG_NXWM_DEFAULT_SHADOWEDGECOLOR - Color of the shadowed edge of a border.
+ *    Default: MKRGB(0,0,0)
+ * CONFIG_NXWM_DEFAULT_FONTCOLOR - Default fong color.  Default:
+ *    MKRGB(0,0,0)
+ * CONFIG_NXWM_TRANSPARENT_COLOR - The "transparent" color.  Default:
+ *    MKRGB(0,0,0)
+ */
+
+/**
  * Normal background color
  */
 
@@ -129,6 +180,23 @@
 /* Task Bar Configuation  ***************************************************/
 /**
  * Horizontal and vertical spacing of icons in the task bar.
+ *
+ * CONFIG_NXWM_TASKBAR_VSPACING - Vertical spacing.  Default: 2 pixels
+ * CONFIG_NXWM_TASKBAR_HSPACING - Horizontal spacing.  Default: 2 rows
+ *
+ * Task bar location.  Default is CONFIG_NXWM_TASKBAR_TOP.
+ *
+ * CONFIG_NXWM_TASKBAR_TOP - Task bar is at the top of the display
+ * CONFIG_NXWM_TASKBAR_BOTTOM - Task bar is at the bottom of the display
+ * CONFIG_NXWM_TASKBAR_LEFT - Task bar is on the left side of the display
+ * CONFIG_NXWM_TASKBAR_RIGHT - Task bar is on the right side of the display
+ *
+ * CONFIG_NXWM_TASKBAR_WIDTH - Task bar thickness (either vertical or
+ *   horizontal).  Default: 25 + 2*spacing
+ */
+
+/**
+ * Horizontal and vertical spacing of icons in the task bar.
  */
 
 #ifndef CONFIG_NXWM_TASKBAR_VSPACING
@@ -152,7 +220,7 @@
 #    warning "Multiple task bar positions specified"
 #  endif
 #elif defined(CONFIG_NXWM_TASKBAR_LEFT)
-#  if defined defined (CONFIG_NXWM_TASKBAR_RIGHT)
+#  if defined (CONFIG_NXWM_TASKBAR_RIGHT)
 #    warning "Multiple task bar positions specified"
 #  endif
 #elif !defined(CONFIG_NXWM_TASKBAR_RIGHT)
@@ -174,12 +242,20 @@
 #endif
 
 /* Tool Bar Configuration ***************************************************/
+/**
+ * CONFIG_NXWM_TOOLBAR_HEIGHT.  The height of the tool bar in each
+ *   application window.  Default:  Same as the thickness of the task bar.
+ */
 
 #ifndef CONFIG_NXWM_TOOLBAR_HEIGHT
 #  define CONFIG_NXWM_TOOLBAR_HEIGHT CONFIG_NXWM_TASKBAR_WIDTH
 #endif
 
 /* Background Image **********************************************************/
+/**
+ * CONFIG_NXWM_BACKGROUND_IMAGE - The name of the image to use in the
+ *   background window.  Default:NXWidgets::g_nuttxBitmap
+ */
 
 #ifndef CONFIG_NXWM_BACKGROUND_IMAGE
 #  define CONFIG_NXWM_BACKGROUND_IMAGE NXWidgets::g_nuttxBitmap
@@ -188,6 +264,9 @@
 /* Start Window Configuration ***********************************************/
 /**
  * Horizontal and vertical spacing of icons in the task bar.
+ *
+ * CONFIG_NXWM_STARTWINDOW_VSPACING - Vertical spacing.  Default: 2 pixels
+ * CONFIG_NXWM_STARTWINDOW_HSPACING - Horizontal spacing.  Default: 2 rows
  */
 
 #ifndef CONFIG_NXWM_STARTWINDOW_VSPACING
@@ -199,6 +278,20 @@
 #endif
 
 /* NxConsole Window *********************************************************/
+/**
+ * NxConsole Window Configuration
+ *
+ * CONFIG_NXWM_NXCONSOLE_PRIO - Priority of the NxConsole task.  Default:
+ *   SCHED_PRIORITY_DEFAULT
+ * CONFIG_NXWM_NXCONSOLE_STACKSIZE - The stack size to use when starting the
+ *   NxConsole task.  Default: 2048 bytes.
+ * CONFIG_NXWM_NXCONSOLE_WCOLOR - The color of the NxConsole window background.
+ *   Default:  MKRGB(192,192,192)
+ * CONFIG_NXWM_NXCONSOLE_FONTCOLOR - The color of the fonts to use in the
+ *   NxConsole window.  Default: MKRGB(0,0,0)
+ * CONFIG_NXWM_NXCONSOLE_FONTID - The ID of the font to use in the NxConsole
+ *   window.  Default: CONFIG_NXWM_DEFAULT_FONTID
+ */
 
 #ifndef CONFIG_NXWM_NXCONSOLE_PRIO
 #  define CONFIG_NXWM_NXCONSOLE_PRIO  SCHED_PRIORITY_DEFAULT
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx
index 857b67983..5fe81d844 100644
--- a/NxWidgets/nxwm/src/cnxconsole.cxx
+++ b/NxWidgets/nxwm/src/cnxconsole.cxx
@@ -41,9 +41,9 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cunistd>
 #include <ctime>
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <semaphore.h>
 #include <sched.h>
@@ -53,8 +53,8 @@
 #include "cwidgetcontrol.hxx"
 
 #include "nxwmconfig.hxx"
-#include "cnxconsole.hxx"
 #include "nxwmglyphs.hxx"
+#include "cnxconsole.hxx"
 
 /********************************************************************************************
  * Pre-Processor Definitions
@@ -66,119 +66,36 @@
 
 namespace NxWM
 {
-  /**
-   * This structure is used to pass start up parameters to nxcon_task and to assure the
-   * the NxConsole is successfully started.
-   */
+    /**
+     * This structure is used to pass start up parameters to the NxConsole task and to assure the
+     * the NxConsole is successfully started.
+     */
 
-  struct nxcon_task_s
-  {
-    sem_t      sem;     // Sem that will be posted when the task is successfully initialized
-    NXTKWINDOW hwnd;    // Window handle
-    NXCONSOLE  nxcon;   // NxConsole handle
-    int        minor;   // Next device minor number
-    bool       result;  // True if successfully initialized
-  };
+    struct SNxConsole
+    {
+      sem_t      sem;     /**< Sem that will be posted when the task is successfully initialized */
+      NXTKWINDOW hwnd;    /**< Window handle */
+      NXCONSOLE  nxcon;   /**< NxConsole handle */
+      int        minor;   /**< Next device minor number */
+      bool       result;  /**< True if successfully initialized */
+    };
 
 /********************************************************************************************
  * Private Data
  ********************************************************************************************/
 
   /**
-   * This global data structure is used to pass start parameters to nxcon_task and to
+   * This global data structure is used to pass start parameters to NxConsole task and to
    * assure that the NxConsole is successfully started.
    */
 
-  static struct nxcon_task_s g_nxconvars;
+  static struct SNxConsole g_nxconvars;
+}
 
 /********************************************************************************************
  * Private Functions
  ********************************************************************************************/
 
-  /**
-   * This is the NxConsole task.  This function first redirects output to the console window.
-   */
-
-  static int nxcon_task(int argc, char *argv[])
-  {
-    // Configure NxConsole
-
-    struct nxcon_window_s wndo;      /* Describes the window */
-    wndo.wcolor[0] = CONFIG_NXWM_NXCONSOLE_WCOLOR;
-    wndo.fcolor[0] = CONFIG_NXWM_NXCONSOLE_FONTCOLOR;
-    wndo.fontid    = CONFIG_NXWM_NXCONSOLE_FONTID;
-
-    // To stop compiler complaining about "jump to label crosses initialization of 'int fd'
-
-    int fd = -1;
-
-    // Use the window handle to create the NX console
-
-    g_nxconvars.nxcon = nxtk_register(g_nxconvars.hwnd, &wndo, g_nxconvars.minor);
-    if (!g_nxconvars.nxcon)
-      {
-        goto errout;
-      }
-
-    // Construct the driver name using this minor number
-
-    char devname[32];
-    snprintf(devname, 32, "/dev/nxcon%d", g_nxconvars.minor);
-
-    // Increment the minor number while it is protect by the semaphore
-
-    g_nxconvars.minor++;
-
-    // Open the NxConsole driver
-
-    fd = open(devname, O_WRONLY);
-    if (fd < 0)
-      {
-        goto errout_with_nxcon;
-      }
-
-    // Now re-direct stdout and stderr so that they use the NX console driver.
-    // Note that stdin is retained (file descriptor 0, probably the the serial console).
-
-    (void)fflush(stdout);
-    (void)fflush(stderr);
-
-    (void)fclose(stdout);
-    (void)fclose(stderr);
-
-    (void)dup2(fd, 1);
-    (void)dup2(fd, 2);
-
-    // And we can close our original driver file descriptor
-
-    close(fd);
-
-    // Inform the parent thread that we successfully initialize
-
-    g_nxconvars.result = true;
-    sem_post(&g_nxconvars.sem);
-
-    // Run the NSH console
-
-#ifdef CONFIG_NSH_CONSOLE
-  (void)nsh_consolemain(argc, argv);
-#endif
-
-    // We get here if console exits
-#warning "Missing logic"
-    return EXIT_SUCCESS;
-
-  errout_with_nxcon:
-    nxcon_unregister(g_nxconvars.nxcon);
-
-  errout:
-    g_nxconvars.nxcon  = 0;
-    g_nxconvars.result = false;
-    sem_post(&g_nxconvars.sem);
-    return EXIT_FAILURE;
-  }
-}
-
 /********************************************************************************************
  * CNxConsole Method Implementations
  ********************************************************************************************/
@@ -328,7 +245,7 @@ bool CNxConsole::run(void)
 
   sched_lock();
   m_pid = TASK_CREATE("NxConsole", CONFIG_NXWM_NXCONSOLE_PRIO,
-                      CONFIG_NXWM_NXCONSOLE_STACKSIZE, nxcon_task,
+                      CONFIG_NXWM_NXCONSOLE_STACKSIZE, nxconsole,
                       (FAR const char **)0);
 
   // Did we successfully start the NxConsole task?
@@ -424,6 +341,90 @@ void CNxConsole::redraw(void)
 }
 
 /**
+ * This is the NxConsole task.  This function first redirects output to the
+ * console window.
+ */
+
+int CNxConsole::nxconsole(int argc, char *argv[])
+{
+  // Configure NxConsole
+
+  struct nxcon_window_s wndo;      /* Describes the window */
+  wndo.wcolor[0] = CONFIG_NXWM_NXCONSOLE_WCOLOR;
+  wndo.fcolor[0] = CONFIG_NXWM_NXCONSOLE_FONTCOLOR;
+  wndo.fontid    = CONFIG_NXWM_NXCONSOLE_FONTID;
+
+  // To stop compiler complaining about "jump to label crosses initialization of 'int fd'
+
+  int fd = -1;
+
+  // Use the window handle to create the NX console
+
+  g_nxconvars.nxcon = nxtk_register(g_nxconvars.hwnd, &wndo, g_nxconvars.minor);
+  if (!g_nxconvars.nxcon)
+    {
+      goto errout;
+    }
+
+  // Construct the driver name using this minor number
+
+  char devname[32];
+  snprintf(devname, 32, "/dev/nxcon%d", g_nxconvars.minor);
+
+  // Increment the minor number while it is protect by the semaphore
+
+  g_nxconvars.minor++;
+
+  // Open the NxConsole driver
+
+  fd = open(devname, O_WRONLY);
+  if (fd < 0)
+    {
+      goto errout_with_nxcon;
+    }
+
+  // Now re-direct stdout and stderr so that they use the NX console driver.
+  // Note that stdin is retained (file descriptor 0, probably the the serial console).
+
+  (void)std::fflush(stdout);
+  (void)std::fflush(stderr);
+
+  (void)std::fclose(stdout);
+  (void)std::fclose(stderr);
+
+  (void)std::dup2(fd, 1);
+  (void)std::dup2(fd, 2);
+
+  // And we can close our original driver file descriptor
+
+  std::close(fd);
+
+  // Inform the parent thread that we successfully initialize
+
+  g_nxconvars.result = true;
+  sem_post(&g_nxconvars.sem);
+
+  // Run the NSH console
+
+#ifdef CONFIG_NSH_CONSOLE
+  (void)nsh_consolemain(argc, argv);
+#endif
+
+  // We get here if console exits
+#warning "Missing logic"
+  return EXIT_SUCCESS;
+
+errout_with_nxcon:
+  nxcon_unregister(g_nxconvars.nxcon);
+
+errout:
+  g_nxconvars.nxcon  = 0;
+  g_nxconvars.result = false;
+  sem_post(&g_nxconvars.sem);
+  return EXIT_FAILURE;
+}
+
+/**
  * Called when the window minimize button is pressed.
  */
 
diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx
index 8d2907266..faac2fa76 100644
--- a/NxWidgets/nxwm/src/ctaskbar.cxx
+++ b/NxWidgets/nxwm/src/ctaskbar.cxx
@@ -83,6 +83,84 @@ CTaskbar::~CTaskbar(void)
 }
 
 /**
+ * Connect to the server
+ */
+ 
+bool CTaskbar::connect(void)
+{
+  // Connect to the server
+
+  bool nxConnected = CNxServer::connect();
+  if (nxConnected)
+    {
+      // Set the background color
+
+      if (!setBackgroundColor(CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR))
+        {
+          // Failed
+        }
+    }
+
+  return nxConnected;
+}
+
+/**
+ * Disconnect from the server
+ */
+
+void CTaskbar::disconnect(void)
+{
+  // Stop all applications and remove them from the task bar.  Clearly, there 
+  // are some ordering issues here... On an orderly system shutdown, disconnection
+  // should really occur priority to deleting instances
+
+  while (!m_slots.empty())
+    {
+       IApplication *app = m_slots.at(0).app;
+       stopApplication(app);
+    }
+
+  // Close the windows
+
+  NXWidgets::CWidgetControl *control;
+  if (m_taskbar)
+    {
+      // Delete the contained widget control.  We are responsible for it
+      // because we created it
+
+      control = m_taskbar->getWidgetControl();
+      if (control)
+        {
+          delete control;
+        }
+
+      // Then delete the task bar window
+
+      delete m_taskbar;
+    }
+
+  if (m_background)
+    {
+      // Delete the contained widget control.  We are responsible for it
+      // because we created it
+
+      control = m_background->getWidgetControl();
+      if (control)
+        {
+          delete control;
+        }
+
+      // Then delete the background
+
+      delete m_background;
+    }
+
+  // And disconnect from the server
+
+  CNxServer::disconnect();
+}
+
+/**
  * Initialize task bar.  Task bar initialization is separate from
  * object instantiation so that failures can be reported.  The window
  * manager start-up sequence is:
@@ -427,84 +505,6 @@ bool CTaskbar::stopApplication(IApplication *app)
 }
 
 /**
- * Connect to the server
- */
- 
-bool CTaskbar::connect(void)
-{
-  // Connect to the server
-
-  bool nxConnected = CNxServer::connect();
-  if (nxConnected)
-    {
-      // Set the background color
-
-      if (!setBackgroundColor(CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR))
-        {
-          // Failed
-        }
-    }
-
-  return nxConnected;
-}
-
-/**
- * Disconnect from the server
- */
-
-void CTaskbar::disconnect(void)
-{
-  // Stop all applications and remove them from the task bar.  Clearly, there 
-  // are some ordering issues here... On an orderly system shutdown, disconnection
-  // should really occur priority to deleting instances
-
-  while (!m_slots.empty())
-    {
-       IApplication *app = m_slots.at(0).app;
-       stopApplication(app);
-    }
-
-  // Close the windows
-
-  NXWidgets::CWidgetControl *control;
-  if (m_taskbar)
-    {
-      // Delete the contained widget control.  We are responsible for it
-      // because we created it
-
-      control = m_taskbar->getWidgetControl();
-      if (control)
-        {
-          delete control;
-        }
-
-      // Then delete the task bar window
-
-      delete m_taskbar;
-    }
-
-  if (m_background)
-    {
-      // Delete the contained widget control.  We are responsible for it
-      // because we created it
-
-      control = m_background->getWidgetControl();
-      if (control)
-        {
-          delete control;
-        }
-
-      // Then delete the background
-
-      delete m_background;
-    }
-
-  // And disconnect from the server
-
-  CNxServer::disconnect();
-}
-
-/**
  * Create a raw window. 
  *
  * 1) Create a dumb CWigetControl instance
@@ -893,7 +893,7 @@ bool CTaskbar::redrawTaskbarWindow(void)
       // For vertical task bars, the icons will be centered horizontally
 
       iconPos.x = (windowSize.w - rect.getWidth()) >> 1;
-      iconPos.y = taskbarPos.y
+      iconPos.y = taskbarPos.y;
 #endif
 
       // Set the position of the icon bitmap
diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx
index 8c4228279..f86015367 100644
--- a/NxWidgets/nxwm/src/glyph_minimize.cxx
+++ b/NxWidgets/nxwm/src/glyph_minimize.cxx
@@ -170,7 +170,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] =
  * Public Bitmap Structure Defintions
  ********************************************************************************************/
 
-const struct NXWidgets::SRlePaletteBitmap g_minimizeBitmap =
+const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap =
 {
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx
index 8e9b0746d..5ddeb9008 100644
--- a/NxWidgets/nxwm/src/glyph_nsh.cxx
+++ b/NxWidgets/nxwm/src/glyph_nsh.cxx
@@ -196,7 +196,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_nshRleEntries[] =
  * Public Bitmap Structure Defintions
  ********************************************************************************************/
 
-const struct NXWidgets::SRlePaletteBitmap g_nshBitmap =
+const struct NXWidgets::SRlePaletteBitmap NxWM::g_nshBitmap =
 {
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx
index a81d6b19f..85457799d 100644
--- a/NxWidgets/nxwm/src/glyph_start.cxx
+++ b/NxWidgets/nxwm/src/glyph_start.cxx
@@ -197,7 +197,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_startRleEntries[] =
  * Public Bitmap Structure Defintions
  ********************************************************************************************/
 
-const struct NXWidgets::SRlePaletteBitmap g_startBitmap =
+const struct NXWidgets::SRlePaletteBitmap NxWM::g_startBitmap =
 {
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx
index 5c4c5477e..fdb08fa51 100644
--- a/NxWidgets/nxwm/src/glyph_stop.cxx
+++ b/NxWidgets/nxwm/src/glyph_stop.cxx
@@ -209,7 +209,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_stopRleEntries[] =
  * Public Bitmap Structure Defintions
  ********************************************************************************************/
 
-const struct NXWidgets::SRlePaletteBitmap g_stopBitmap =
+const struct NXWidgets::SRlePaletteBitmap NxWM::g_stopBitmap =
 {
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format