Update ChangeLog

ChangeLog.txt

@@ -533,3 +533,6 @@
   lost (2014-7-30).
 
 1.13 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+* Change all references to NxConsole to NxTerm.  This introduces an
+  incompatibility with versions prior to NuttX-7.5 (2014-9-20).

Kconfig

@@ -575,7 +575,7 @@ config NXWM_TOOLBAR_FONTID
 	int "Toolbar Font ID"
 	default 0
 	---help---
-		Use this default font ID in the NxConsole window instead of the
+		Use this default font ID in the NxTerm window instead of the
 		NxWM font ID (NXWM_DEFAULT_FONTID).  Default: 0 (maybe invalid)
 
 endif # NXWM_TOOLBAR_CUSTOM_FONTID
@@ -675,55 +675,55 @@ config NXWM_STARTWINDOW_STACKSIZE
 
 endmenu # Start Window Configuration
 
-menu "NxConsole Window Settings"
+menu "NxTerm Window Settings"
 
 config NXWM_NXTERM
-	bool "NxConsole Window"
+	bool "NxTerm Window"
 	default y
 	---help---
-		Enable support for the NxConsole window which provides a text window
+		Enable support for the NxTerm window which provides a text window
 		in which you can interact with NSH.
 
 if NXWM_NXTERM
 
 config NXWM_NXTERM_PRIO
-	int "NxConsole Task Priority"
+	int "NxTerm Task Priority"
 	default 100
 	---help---
-		Priority of the NxConsole task.  Default:  100.
+		Priority of the NxTerm task.  Default:  100.
 
 		NOTE:  This priority should be less than NXWIDGETS_SERVERPRIO or
 		else there may be data overrun errors. Such errors would most likely
 		appear as duplicated rows of data on the display.
 
 config NXWM_NXTERM_STACKSIZE
-	int "NxConsole Task Stack Size"
+	int "NxTerm Task Stack Size"
 	default 2048
 	---help---
-		The stack size to use when starting the NxConsole task.  Default:
+		The stack size to use when starting the NxTerm task.  Default:
 		2048 bytes.
 
 config NXWM_NXTERM_CUSTOM_COLORS
-	bool "Custom NxConsole Colors"
+	bool "Custom NxTerm Colors"
 	default n
 	---help---
-		Select custom default colors for the NxConsole window.  If defined,
+		Select custom default colors for the NxTerm window.  If defined,
-		the hexadecimal values for all NxConsole colors must be provided
+		the hexadecimal values for all NxTerm colors must be provided
 		(there are no default colors because the hexadecimal representation
 		of the default colors depend on the pixel depth). Default: n
 
 if NXWM_NXTERM_CUSTOM_COLORS
 
 config NXWM_NXTERM_WCOLOR
-	hex "NxConsole Background Color"
+	hex "NxTerm Background Color"
 	---help---
-		The color of the NxConsole window background. Default:
+		The color of the NxTerm window background. Default:
 		RGB(192,192,192)
 
 config NXWM_NXTERM_FONTCOLOR
-	hex "NxConsole Font Color"
+	hex "NxTerm Font Color"
 	---help---
-		The color of the fonts to use in the NxConsole window.
+		The color of the fonts to use in the NxTerm window.
 		Default: RGB(0,0,0)
 
 endif # NXWM_NXTERM_CUSTOM_COLORS
@@ -737,31 +737,31 @@ config NXWM_NXTERM_CUSTOM_FONTID
 if NXWM_NXTERM_CUSTOM_FONTID
 
 config NXWM_NXTERM_FONTID
-	int "NxConsole Font ID"
+	int "NxTerm Font ID"
 	default 0
 	---help---
-		Use this default font ID in the NxConsole window instead of the
+		Use this default font ID in the NxTerm window instead of the
 		NxWM font ID (NXWM_DEFAULT_FONTID).  Default: 0
 
 endif # NXWM_NXTERM_CUSTOM_FONTID
 
 config NXWM_CUSTOM_NXTERM_ICON
-	bool "Custom NxConsole Icon"
+	bool "Custom NxTerm Icon"
 	default n
 	---help---
-		Select to override the default NxConsole Window Icon: NxWM::g_cmdBitmap
+		Select to override the default NxTerm Window Icon: NxWM::g_cmdBitmap
 
 if NXWM_CUSTOM_NXTERM_ICON
 
 config NXWM_NXTERM_ICON
-	string "NxConsole Icon"
+	string "NxTerm Icon"
 	default "NxWM::g_cmdBitmap"
 	---help---
-		The glyph to use as the NxConsole icon.  Default: NxWM::g_cmdBitmap
+		The glyph to use as the NxTerm icon.  Default: NxWM::g_cmdBitmap
 
 endif # NXWM_NXTERM_ICON
 endif # NXWM_NXTERM
-endmenu # NxConsole Window Settings
+endmenu # NxTerm Window Settings
 
 menu "NxWM Touchscreen Configuration"
 

README.txt

@@ -91,7 +91,7 @@ nxwm
 
   There is a base class that defines an add-on application and an
   interface that supports incorporation of new application.  The only
-  application that is provided is NxConsole.  This is an  NSH session
+  application that is provided is NxTerm.  This is an  NSH session
   running in a window.  You should be able to select the NX icon in the start
   menu and create as many NSH sessions in windows as you want. (keybard input
   still comes through serial).

TODO.txt

@@ -27,7 +27,7 @@ NxWM
 ----
 
  (4) General NxWMIssues
- (0) NxConsole Issues
+ (0) NxTerm Issues
  (0) CHexCalculator Issues
  (3) CMediaPlayer Issues
  (1) Platform specific Issues
@@ -83,7 +83,7 @@ o General NxWM Issues
                to be productized, this change should be done in order to reduce
                stack memory consumption.
 
-o NxConsole Issues
+o NxTerm Issues
   ----------------
 
 o CHexCalculator Issues

UnitTests/nxwm/nxwm_main.cxx

@@ -52,7 +52,7 @@
 #include "cstartwindow.hxx"
 
 #ifdef CONFIG_NXWM_NXTERM
-#  include "cnxconsole.hxx"
+#  include "cnxterm.hxx"
 #endif
 
 #include "chexcalculator.hxx"
@@ -545,32 +545,32 @@ static bool createCalibration(void)
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: createNxConsole
+// Name: createNxTerm
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef CONFIG_NXWM_NXTERM
-static bool createNxConsole(void)
+static bool createNxTerm(void)
 {
-  // Add the NxConsole application to the start window
+  // Add the NxTerm application to the start window
 
-  printf("createNxConsole: Creating the NxConsole application\n");
+  printf("createNxTerm: Creating the NxTerm application\n");
-  NxWM::CNxConsoleFactory *console = new  NxWM::CNxConsoleFactory(g_nxwmtest.taskbar);
+  NxWM::CNxTermFactory *console = new  NxWM::CNxTermFactory(g_nxwmtest.taskbar);
   if (!console)
     {
-      printf("createNxConsole: ERROR: Failed to instantiate CNxConsoleFactory\n");
+      printf("createNxTerm: ERROR: Failed to instantiate CNxTermFactory\n");
       return false;
     }
-  showTestCaseMemory("createNxConsole: After creating the NxConsole application");
+  showTestCaseMemory("createNxTerm: After creating the NxTerm application");
 
-  printf("createNxConsole: Adding the NxConsole application to the start window\n");
+  printf("createNxTerm: Adding the NxTerm application to the start window\n");
   if (!g_nxwmtest.startwindow->addApplication(console))
     {
-      printf("createNxConsole: ERROR: Failed to add CNxConsoleFactory to the start window\n");
+      printf("createNxTerm: ERROR: Failed to add CNxTermFactory to the start window\n");
       delete console;
       return false;
     }
 
-  showTestCaseMemory("createNxConsole: After adding the NxConsole application");
+  showTestCaseMemory("createNxTerm: After adding the NxTerm application");
   return true;
 }
 #endif
@@ -734,12 +734,12 @@ int nxwm_main(int argc, char *argv[])
     }
 #endif
 
-  // Create the NxConsole application and add it to the start window
+  // Create the NxTerm application and add it to the start window
 
 #ifdef CONFIG_NXWM_NXTERM
-  if (!createNxConsole())
+  if (!createNxTerm())
     {
-      printf("nxwm_main: ERROR: Failed to create the NxConsole application\n");
+      printf("nxwm_main: ERROR: Failed to create the NxTerm application\n");
       testCleanUpAndExit(EXIT_FAILURE);
     }
 #endif
@@ -832,14 +832,14 @@ int nxwm_main(int argc, char *argv[])
   showTestCaseMemory("nxwm_main: After clicking the start window icon");
 
   // Wait bit to see the result of the button press.  Then press the first icon
-  // in the start menu.  That should be the NxConsole icon (if the NXCONSOLE
+  // in the start menu.  That should be the NxTerm icon (if the NxTerm
   // is not disabled).
 
   sleep(2);
   g_nxwmtest.startwindow->clickIcon(0, true);
   usleep(500*1000);
   g_nxwmtest.startwindow->clickIcon(0, false);
-  showTestCaseMemory("nxwm_main: After clicking the NxConsole icon");
+  showTestCaseMemory("nxwm_main: After clicking the NxTerm icon");
 #endif
 
   // Wait bit to see the result of the button press.

libnxwidgets/doc/mainpage.h

@@ -70,7 +70,7 @@
  *
  *  There is a base class that defines an add-on application and an interface
  *  that supports incorporation of new applications. The only application
- *  that is provided is NxConsole. This is an NSH session running in a window.
+ *  that is provided is NxTerm. This is an NSH session running in a window.
  *  You should be able to select the NX icon in the start menu and create as
  *  many NSH sessions in windows as you want. (keybard input still comes
  *  through serial).

libnxwidgets/include/cbgwindow.hxx

@@ -209,21 +209,21 @@ namespace NXWidgets
     /**
      * Each window implementation also inherits from CCallback.  CCallback,
      * by default, forwards NX keyboard input to the various widgets residing
-     * in the window. But NxConsole is a different usage model; In this case,
+     * in the window. But NxTerm is a different usage model; In this case,
-     * keyboard input needs to be directed to the NxConsole character driver.
+     * keyboard input needs to be directed to the NxTerm character driver.
      * This method can be used to enable (or disable) redirection of NX
-     * keyboard input from the window widgets to the NxConsole
+     * keyboard input from the window widgets to the NxTerm
      *
-     * @param handle.  The NXCONSOLE handle.  If non-NULL, NX keyboard
+     * @param handle.  The NXTERM handle.  If non-NULL, NX keyboard
-     *    input will be directed to the NxConsole driver using this
+     *    input will be directed to the NxTerm driver using this
      *    handle;  If NULL (the default), NX keyboard input will be
      *    directed to the widgets within the window.
      */
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-    inline void redirectNxConsole(NXCONSOLE handle)
+    inline void redirectNxTerm(NXTERM handle)
     {
-      setNxConsole(handle);
+      setNxTerm(handle);
     }
 #endif
 

libnxwidgets/include/ccallback.hxx

@@ -50,7 +50,7 @@
 #include <nuttx/nx/nx.h>
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-#  include <nuttx/nx/nxconsole.h>
+#  include <nuttx/nx/nxterm.h>
 #endif
 
 #include "crect.hxx"
@@ -94,7 +94,7 @@ namespace NXWidgets
     CWidgetControl      *m_widgetControl; /**< The widget control instance for this window */
     struct nx_callback_s m_callbacks;     /**< C-callable vtable of callback function pointers */
 #ifdef CONFIG_NXTERM_NXKBDIN
-    NXCONSOLE            m_nxconsole;      /**< The NxConsole handle for redirection of keyboard input */
+    NXTERM               m_nxterm;      /**< The NxTerm handle for redirection of keyboard input */
 #endif
 
     // Methods in the callback vtable
@@ -245,22 +245,22 @@ namespace NXWidgets
 
     /**
      * By default, NX keyboard input is given to the various widgets
-     * residing in the window. But NxConsole is a different usage model;
+     * residing in the window. But NxTerm is a different usage model;
-     * In this case, keyboard input needs to be directed to the NxConsole
+     * In this case, keyboard input needs to be directed to the NxTerm
      * character driver.  This method can be used to enable (or disable)
      * redirection of NX keyboard input from the window widgets to the
-     * NxConsole
+     * NxTerm
      *
-     * @param handle.  The NXCONSOLE handle.  If non-NULL, NX keyboard
+     * @param handle.  The NXTERM handle.  If non-NULL, NX keyboard
-     *    input will be directed to the NxConsole driver using this
+     *    input will be directed to the NxTerm driver using this
      *    handle;  If NULL (the default), NX keyboard input will be
      *    directed to the widgets within the window.
      */
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-    inline void setNxConsole(NXCONSOLE handle)
+    inline void setNxTerm(NXTERM handle)
     {
-      m_nxconsole = handle;
+      m_nxterm = handle;
     }
 #endif
   };

libnxwidgets/include/cnxtkwindow.hxx

@@ -230,21 +230,21 @@ namespace NXWidgets
     /**
      * Each window implementation also inherits from CCallback.  CCallback,
      * by default, forwards NX keyboard input to the various widgets residing
-     * in the window. But NxConsole is a different usage model; In this case,
+     * in the window. But NxTerm is a different usage model; In this case,
-     * keyboard input needs to be directed to the NxConsole character driver.
+     * keyboard input needs to be directed to the NxTerm character driver.
      * This method can be used to enable (or disable) redirection of NX
-     * keyboard input from the window widgets to the NxConsole
+     * keyboard input from the window widgets to the NxTerm
      *
-     * @param handle.  The NXCONSOLE handle.  If non-NULL, NX keyboard
+     * @param handle.  The NXTERM handle.  If non-NULL, NX keyboard
-     *    input will be directed to the NxConsole driver using this
+     *    input will be directed to the NxTerm driver using this
      *    handle;  If NULL (the default), NX keyboard input will be
      *    directed to the widgets within the window.
      */
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-    inline void redirectNxConsole(NXCONSOLE handle)
+    inline void redirectNxTerm(NXTERM handle)
     {
-      setNxConsole(handle);
+      setNxTerm(handle);
     }
 #endif
 

libnxwidgets/include/cnxtoolbar.hxx

@@ -199,21 +199,21 @@ namespace NXWidgets
     /**
      * Each window implementation also inherits from CCallback.  CCallback,
      * by default, forwards NX keyboard input to the various widgets residing
-     * in the window. But NxConsole is a different usage model; In this case,
+     * in the window. But NxTerm is a different usage model; In this case,
-     * keyboard input needs to be directed to the NxConsole character driver.
+     * keyboard input needs to be directed to the NxTerm character driver.
      * This method can be used to enable (or disable) redirection of NX
-     * keyboard input from the window widgets to the NxConsole
+     * keyboard input from the window widgets to the NxTerm
      *
-     * @param handle.  The NXCONSOLE handle.  If non-NULL, NX keyboard
+     * @param handle.  The NXTERM handle.  If non-NULL, NX keyboard
-     *    input will be directed to the NxConsole driver using this
+     *    input will be directed to the NxTerm driver using this
      *    handle;  If NULL (the default), NX keyboard input will be
      *    directed to the widgets within the window.
      */
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-    inline void redirectNxConsole(NXCONSOLE handle)
+    inline void redirectNxTerm(NXTERM handle)
     {
-      setNxConsole(handle);
+      setNxTerm(handle);
     }
 #endif
 

libnxwidgets/include/cnxwindow.hxx

@@ -203,21 +203,21 @@ namespace NXWidgets
     /**
      * Each window implementation also inherits from CCallback.  CCallback,
      * by default, forwards NX keyboard input to the various widgets residing
-     * in the window. But NxConsole is a different usage model; In this case,
+     * in the window. But NxTerm is a different usage model; In this case,
-     * keyboard input needs to be directed to the NxConsole character driver.
+     * keyboard input needs to be directed to the NxTerm character driver.
      * This method can be used to enable (or disable) redirection of NX
-     * keyboard input from the window widgets to the NxConsole
+     * keyboard input from the window widgets to the NxTerm
      *
-     * @param handle.  The NXCONSOLE handle.  If non-NULL, NX keyboard
+     * @param handle.  The NXTERM handle.  If non-NULL, NX keyboard
-     *    input will be directed to the NxConsole driver using this
+     *    input will be directed to the NxTerm driver using this
      *    handle;  If NULL (the default), NX keyboard input will be
      *    directed to the widgets within the window.
      */
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-    inline void redirectNxConsole(NXCONSOLE handle)
+    inline void redirectNxTerm(NXTERM handle)
     {
-      setNxConsole(handle);
+      setNxTerm(handle);
     }
 #endif
 

libnxwidgets/include/inxwindow.hxx

@@ -48,7 +48,7 @@
 #include <stdbool.h>
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-#  include <nuttx/nx/nxconsole.h>
+#  include <nuttx/nx/nxterm.h>
 #endif
 
 /****************************************************************************
@@ -175,19 +175,19 @@ namespace NXWidgets
     /**
      * Each window implementation also inherits from CCallback.  CCallback,
      * by default, forwards NX keyboard input to the various widgets residing
-     * in the window. But NxConsole is a different usage model; In this case,
+     * in the window. But NxTerm is a different usage model; In this case,
-     * keyboard input needs to be directed to the NxConsole character driver.
+     * keyboard input needs to be directed to the NxTerm character driver.
      * This method can be used to enable (or disable) redirection of NX
-     * keyboard input from the window widgets to the NxConsole
+     * keyboard input from the window widgets to the NxTerm
      *
-     * @param handle.  The NXCONSOLE handle.  If non-NULL, NX keyboard
+     * @param handle.  The NXTERM handle.  If non-NULL, NX keyboard
-     *    input will be directed to the NxConsole driver using this
+     *    input will be directed to the NxTerm driver using this
      *    handle;  If NULL (the default), NX keyboard input will be
      *    directed to the widgets within the window.
      */
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-    virtual void redirectNxConsole(NXCONSOLE handle) = 0;
+    virtual void redirectNxTerm(NXTERM handle) = 0;
 #endif
 
     /**

libnxwidgets/include/nxconfig.hxx

@@ -184,7 +184,7 @@
 #  error "Only a single color plane is supported (CONFIG_NX_NPLANES)"
 #endif
 
-/* NxConsole checks.  This just simplifies the conditional compilation by
+/* NxTerm checks.  This just simplifies the conditional compilation by
  * reducing the AND of these three conditions to a single condition.
  */
 

libnxwidgets/src/ccallback.cxx

@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-#  include <nuttx/nx/nxconsole.h>
+#  include <nuttx/nx/nxterm.h>
 #endif
 
 #include "cwidgetcontrol.hxx"
@@ -88,7 +88,7 @@ CCallback::CCallback(CWidgetControl *widgetControl)
   // Keyboard input is initially direct to the widgets within the window
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-  m_nxconsole          = (NXCONSOLE)0;
+  m_nxterm             = (NXTERM)0;
 #endif
 }
 
@@ -206,15 +206,15 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
   CCallback *This = (CCallback *)arg;
 
   // Is NX keyboard input being directed to the widgets within the window
-  // (default) OR is NX keyboard input being re-directed to an NxConsole
+  // (default) OR is NX keyboard input being re-directed to an NxTerm
   // driver?
 
 #ifdef CONFIG_NXTERM_NXKBDIN
-  if (This->m_nxconsole)
+  if (This->m_nxterm)
     {
-      // Keyboard input is going to an NxConsole
+      // Keyboard input is going to an NxTerm
 
-      nxcon_kbdin(This->m_nxconsole, str, nCh);
+      nxcon_kbdin(This->m_nxterm, str, nCh);
     }
   else
 #endif