From 9e11e2102fb1b9ec26dae1bfb1bc3941976a6653 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sun, 18 Feb 2007 17:21:50 +0000
Subject: [PATCH] - add property /sim/startup/terminal-ansi-colors {BOOL}. This
 is used   by debug.nas to turn on/off syntax coloring for dumped data (which 
  is desirable as compound data types can fill several screens with   rather
 hard to read data). Unfortunately, it can't be reliably deduced   from the OS
 whether ANSI colors are available or not. - move "multiplayer chat"
 properties to where they belong

---
 Nasal/debug.nas |  4 +---
 preferences.xml | 11 ++++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Nasal/debug.nas b/Nasal/debug.nas
index eb3693e55..75a248045 100644
--- a/Nasal/debug.nas
+++ b/Nasal/debug.nas
@@ -18,9 +18,7 @@
 
 
 
-# enable colors on Unix (checks second character in module path for colon)
-#
-if (caller(0)[2][1] != `:`) {
+if (getprop("/sim/startup/terminal-ansi-colors")) {
 	_c = func(color, s) { "\x1b[" ~ color ~ "m" ~ s ~ "\x1b[m" }
 } else {
 	_c = func(dummy, s) { s }
diff --git a/preferences.xml b/preferences.xml
index 7c6bd19f6..5edd0f558 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -12,11 +12,6 @@ Started September 2000 by David Megginson, david@megginson.com
 
  <!-- General simulation preferences -->
  <sim>
-  <!-- Multiplayer chat requires that these properties be defined -->
-  <multiplay>
-    <chat type="string">Hello</chat>
-    <transmission-freq-hz type="string">118500000</transmission-freq-hz>
-  </multiplay>
   <!-- hide some development tools, such as parts of the HUD adjustment dialog -->
   <devel type="bool">false</devel>
 
@@ -49,6 +44,7 @@ Started September 2000 by David Megginson, david@megginson.com
    <units>feet</units>
    <save-on-exit type="bool" userarchive="y">true</save-on-exit>
    <browser-app>netscape</browser-app><!--  help viewer -->
+   <terminal-ansi-colors type="bool">true</terminal-ansi-colors>
   </startup>
   <rendering>
    <debug type="bool">false</debug>
@@ -448,6 +444,11 @@ Started September 2000 by David Megginson, david@megginson.com
    <!-- <scenario>refueling_demo</scenario> -->
   </ai>
 
+  <multiplay>
+   <chat type="string">Hello</chat>
+   <transmission-freq-hz type="string">118500000</transmission-freq-hz>
+  </multiplay>
+
   <user>
    <callsign type="string">Golf Foxtrot Sierra</callsign>
   </user>