From e1d5ef14344713f6910c4629947b1a54ad73556d Mon Sep 17 00:00:00 2001
From: inb <inorton@gmail.com>
Date: Sun, 12 Jul 2020 09:36:59 +0100
Subject: [PATCH] tidy up tests

---
 EDMCOverlay/EDMCOverlay/OverlayJsonServer.cs  |  2 +-
 EDMCOverlay/EDMCOverlay/OverlayRenderer.cs    | 21 +++++++++----------
 .../EDMCOverlay/Properties/AssemblyInfo.cs    |  4 ++--
 README.md                                     |  2 +-
 test_selftest.py                              | 12 +++++------
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/EDMCOverlay/EDMCOverlay/OverlayJsonServer.cs b/EDMCOverlay/EDMCOverlay/OverlayJsonServer.cs
index 9e01d1e..760db2e 100644
--- a/EDMCOverlay/EDMCOverlay/OverlayJsonServer.cs
+++ b/EDMCOverlay/EDMCOverlay/OverlayJsonServer.cs
@@ -59,7 +59,7 @@ public void Start()
                 Logger.LogMessage("JSON server thread startup");
                 var banner = new Graphic
                 {
-                    TTL = 5,
+                    TTL = 15,
                     Id = "_",
                     Color = "yellow",
                     Size = GraphicType.FONT_LARGE,
diff --git a/EDMCOverlay/EDMCOverlay/OverlayRenderer.cs b/EDMCOverlay/EDMCOverlay/OverlayRenderer.cs
index ac77c20..e189e3c 100644
--- a/EDMCOverlay/EDMCOverlay/OverlayRenderer.cs
+++ b/EDMCOverlay/EDMCOverlay/OverlayRenderer.cs
@@ -56,21 +56,17 @@ public void Start(OverlayJsonServer service)
             {
                 this.StartUpdate();
             });
-        }
 
-        [DllImport("user32.dll")]
-        static extern IntPtr GetForegroundWindow();
+        }
 
-        [DllImport("user32.dll")]
-        static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
 
         private static string GetActiveWindowTitle()
         {
             const int nChars = 256;
             StringBuilder Buff = new StringBuilder(nChars);
-            IntPtr handle = GetForegroundWindow();
+            IntPtr handle = WindowUtils.GetForegroundWindow();
 
-            if (GetWindowText(handle, Buff, nChars) > 0)
+            if (WindowUtils.GetWindowText(handle, Buff, nChars) > 0)
             {
                 return Buff.ToString();
             }
@@ -186,7 +182,6 @@ private void Draw(Graphics draw)
             }
 
             // this causes flickering
-            //Glass.TopMost = true;
             Clear(draw);
             foreach (var id in Graphics.Keys.ToArray())
             {
@@ -305,12 +300,16 @@ private void StartUpdate()
                         Thread.Sleep(500);
                         continue;
                     }
-                    IntPtr activeWindow = GetForegroundWindow();
+                    IntPtr activeWindow = WindowUtils.GetForegroundWindow();
 
                     bool foreground = (activeWindow == Glass.Follow.MainWindowHandle);
 
-                    if (!foreground)
-                        Debug.WriteLine("window obscured");
+                    if (foreground)
+                    {
+                        Debug.WriteLine(DateTime.Now + " window foreground");
+                    } else { 
+                        Debug.WriteLine(DateTime.Now + " window obscured");
+                    }
 
                     bool render = (foreground && (Graphics.Values.Count > 0)) || this.ForceRender;
 
diff --git a/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs b/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs
index ab5cb13..5458be4 100644
--- a/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs
+++ b/EDMCOverlay/EDMCOverlay/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Patch Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/README.md b/README.md
index ec513c3..cbb0b2e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# EDMC Overlay (c) 2017 Ian Norton
+# EDMC Overlay (c) 2020 Ian Norton
 ## About
 
 EDMC Overlay is a helper program for Elite:Dangerous, It provides a means for 
diff --git a/test_selftest.py b/test_selftest.py
index b6bbcf2..709e50d 100644
--- a/test_selftest.py
+++ b/test_selftest.py
@@ -15,17 +15,17 @@ def test_raw_messages():
 
     overlay = edmcoverlay.Overlay()
     overlay.connect()
-    for i in range(1, 200):
+    for i in range(1, 100):
+        print("test {}".format(i))
+        time.sleep(0.1)
         overlay.send_raw({
             "id": "foo{}".format(i),
-            "x": random.randint(10, 1024),
-            "y": (6 * i) % 960,
-            "color": "#ff0000",
+            "x": random.randint(10, 1140),
+            "y": (8 * i) % 960,
+            "color": "#ff{:02x}00".format(random.randint(32, 240)),
             "text": "msg{}".format(i),
             "ttl": 60,
         })
-
-    time.sleep(2)
     for i in range(1, 200):
         overlay.send_raw({
             "id": "foo{}".format(i),