Splash screen added

ivanpmartell · Aug 7, 2024 · 39e1c70 · 39e1c70
1 parent ff73bc1
commit 39e1c70
Show file tree

Hide file tree

Showing 6 changed files with 291 additions and 21 deletions.
diff --git a/LittleWarGameClient/Fullscreen.cs b/LittleWarGameClient/Fullscreen.cs
diff --git a/LittleWarGameClient/GameForm.cs b/LittleWarGameClient/GameForm.cs
@@ -186,9 +186,14 @@ private void GameForm_LocationChanged(object sender, EventArgs e)
 
         private void GameForm_Load(object sender, EventArgs e)
         {
+            SplashScreen.Instance.InvokeUI(() =>
+            {
+                SplashScreen.Instance.Close();
+            });
             OverlayForm.Instance.Size = webBrowser.Size;
             var webViewBounds = new Rectangle(webBrowser.PointToScreen(Point.Empty), webBrowser.Size);
             OverlayForm.Instance.Location = webViewBounds.Location;
+            Activate();
         }
 
         private void webView_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e)

diff --git a/LittleWarGameClient/Program.cs b/LittleWarGameClient/Program.cs
@@ -16,9 +16,9 @@ internal static class Program
     {
         [DllImport("user32.dll")]
         [return: MarshalAs(UnmanagedType.Bool)]
-        static extern bool SetForegroundWindow(IntPtr hWnd);
+        private static extern bool SetForegroundWindow(IntPtr hWnd);
         [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+        private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
 
         [DllImport("User32.dll")]
         [return: MarshalAs(UnmanagedType.Bool)]
@@ -30,12 +30,23 @@ internal static class Program
         private static List<WinStruct> _WinStructList = new List<WinStruct>();
 
         internal static FontFamily? LWG_FONT;
+        internal static bool IsDoubleInstance = false;
         /// <summary>
         ///  The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
+            (new Thread(() =>
+            {
+                string font_filename = "lwgFont.ttf";
+                if (!File.Exists(font_filename))
+                    File.WriteAllBytes(font_filename, Resources.LcdSolidFont);
+                PrivateFontCollection pfc = new();
+                pfc.AddFontFile(font_filename);
+                LWG_FONT = pfc.Families[0];
+                Application.Run(SplashScreen.Instance);
+            })).Start();
             bool createdNew = true;
             using (Mutex mutex = new Mutex(true, "Global\\LittleWarGameClient", out createdNew))
             {
@@ -44,16 +55,11 @@ static void Main()
                     // To customize application configuration such as set high DPI settings or default font,
                     // see https://aka.ms/applicationconfiguration.
                     ApplicationConfiguration.Initialize();
-                    string font_filename = "lwgFont.ttf";
-                    if (!File.Exists(font_filename))
-                        File.WriteAllBytes(font_filename, Resources.LcdSolidFont);
-                    PrivateFontCollection pfc = new PrivateFontCollection();
-                    pfc.AddFontFile(font_filename);
-                    LWG_FONT = pfc.Families[0];
                     Application.Run(OverlayForm.Instance);
                 }
                 else
                 {
+                    IsDoubleInstance = true;
                     Process current = Process.GetCurrentProcess();
                     foreach (Process process in Process.GetProcessesByName(current.ProcessName))
                     {

diff --git a/LittleWarGameClient/SplashScreen.Designer.cs b/LittleWarGameClient/SplashScreen.Designer.cs
diff --git a/LittleWarGameClient/SplashScreen.cs b/LittleWarGameClient/SplashScreen.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LittleWarGameClient
+{
+    public partial class SplashScreen : Form
+    {
+        private static SplashScreen? formInstance;
+        internal static SplashScreen Instance
+        {
+            get
+            {
+                if (formInstance == null || formInstance.IsDisposed)
+                    formInstance = new SplashScreen();
+                return formInstance;
+            }
+        }
+
+        public SplashScreen()
+        {
+            InitializeComponent();
+            if (Program.LWG_FONT != null)
+            {
+                splashText.Font = new Font(Program.LWG_FONT, 24F, FontStyle.Regular, GraphicsUnit.Point);
+                splashText.ForeColor = Color.White;
+            }
+        }
+
+        internal void InvokeUI(Action a)
+        {
+            if (formInstance != null && formInstance.InvokeRequired)
+            {
+                if (formInstance.IsHandleCreated)
+                    formInstance.BeginInvoke(new MethodInvoker(a));
+            }
+            else
+            {
+                a.Invoke();
+            }
+        }
+
+        private void SplashScreen_Load(object sender, EventArgs e)
+        {
+            if (Program.IsDoubleInstance)
+            {
+                Application.Exit();
+            }
+        }
+    }
+}
diff --git a/LittleWarGameClient/SplashScreen.resx b/LittleWarGameClient/SplashScreen.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>