From 6402e6269bd2f9619b7a7b21bab9a1fedc6f360b Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 28 Mar 2012 01:52:00 +0000
Subject: More NX Console fixes... good progress but still not ready for prime
 time

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4533 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/examples/nxconsole/nxcon_internal.h |  2 +-
 apps/examples/nxtext/nxtext_internal.h   | 40 ++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

(limited to 'apps')

diff --git a/apps/examples/nxconsole/nxcon_internal.h b/apps/examples/nxconsole/nxcon_internal.h
index 06c989551..f5d88e600 100644
--- a/apps/examples/nxconsole/nxcon_internal.h
+++ b/apps/examples/nxconsole/nxcon_internal.h
@@ -71,7 +71,7 @@
 #  define CONFIG_EXAMPLES_NXCON_VPLANE 0
 #endif
 
-/* Pixel depth.  If non provided, pick the smallest enabled pixel depth */
+/* Pixel depth.  If none provided, pick the smallest enabled pixel depth */
 
 #ifndef CONFIG_EXAMPLES_NXCON_BPP
 #  if !defined(CONFIG_NX_DISABLE_1BPP)
diff --git a/apps/examples/nxtext/nxtext_internal.h b/apps/examples/nxtext/nxtext_internal.h
index caf8cd9fc..7a8159c98 100644
--- a/apps/examples/nxtext/nxtext_internal.h
+++ b/apps/examples/nxtext/nxtext_internal.h
@@ -64,10 +64,30 @@
 #    define CONFIG_EXAMPLES_NXTEXT_VPLANE 0
 #endif
 
+/* Pixel depth.  If none provided, pick the smallest enabled pixel depth */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_BPP
-#  define CONFIG_EXAMPLES_NXTEXT_BPP 32
+#  if !defined(CONFIG_NX_DISABLE_1BPP)
+#    define CONFIG_EXAMPLES_NXTEXT_BPP 1
+#  elif !defined(CONFIG_NX_DISABLE_2BPP)
+#    define CONFIG_EXAMPLES_NXTEXT_BPP 2
+#  elif !defined(CONFIG_NX_DISABLE_4BPP)
+#    define CONFIG_EXAMPLES_NXTEXT_BPP 4
+#  elif !defined(CONFIG_NX_DISABLE_8BPP)
+#    define CONFIG_EXAMPLES_NXTEXT_BPP 8
+#  elif !defined(CONFIG_NX_DISABLE_16BPP)
+#    define CONFIG_EXAMPLES_NXTEXT_BPP 16
+//#elif !defined(CONFIG_NX_DISABLE_24BPP)
+//#    define CONFIG_NXCONSOLE_BPP 24
+#  elif !defined(CONFIG_NX_DISABLE_32BPP)
+#    define CONFIG_EXAMPLES_NXTEXT_BPP 32
+#  else
+#    error "No pixel depth provided"
+#  endif
 #endif
 
+/* Background color */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_BGCOLOR
 #  if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
 #    define CONFIG_EXAMPLES_NXTEXT_BGCOLOR 0x007b68ee
@@ -78,10 +98,14 @@
 # endif
 #endif
 
+/* Pop-up font ID */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_PUFONTID
 #  define CONFIG_EXAMPLES_NXTEXT_PUFONTID NXFONT_DEFAULT
 #endif
 
+/* Pop-up window color */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_PUCOLOR
 #  if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
 #    define CONFIG_EXAMPLES_NXTEXT_PUCOLOR 0x00dcdcdc
@@ -92,10 +116,14 @@
 # endif
 #endif
 
+/* Background font ID */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_BGFONTID
 #  define CONFIG_EXAMPLES_NXTEXT_BGFONTID NXFONT_DEFAULT
 #endif
 
+/* Background font color */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR
 #  if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
 #    define CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR 0x00000000
@@ -106,6 +134,8 @@
 #  endif
 #endif
 
+/* Pop-up font color */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR
 #  if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
 #    define CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR 0x00000000
@@ -116,14 +146,20 @@
 #  endif
 #endif
 
+/* Character caching */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_BMCACHE
 #  define CONFIG_EXAMPLES_NXTEXT_BMCACHE 128
 #endif
 
+/* Font glyph caching */
+
 #ifndef CONFIG_EXAMPLES_NXTEXT_GLCACHE
-#  define CONFIG_EXAMPLES_NXTEXT_BMCACHE 16
+#  define CONFIG_EXAMPLES_NXTEXT_GLCACHE 16
 #endif
 
+/* NX muli-user mode */
+
 #ifdef CONFIG_NX_MULTIUSER
 #  ifdef CONFIG_DISABLE_MQUEUE
 #    error "The multi-threaded example requires MQ support (CONFIG_DISABLE_MQUEUE=n)"
-- 
cgit v1.2.3