Separation of Event Management from Window Base to a custom type

examples/Examples.sln

@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFML.Window", "..\src\SFML.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "netcore", "netcore\netcore.csproj", "{93B8425A-AC40-4486-96AF-20027B738C09}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "custom_eventman", "custom_eventman\custom_eventman.csproj", "{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -183,6 +185,18 @@ Global
 		{93B8425A-AC40-4486-96AF-20027B738C09}.Release|x64.Build.0 = Release|Any CPU
 		{93B8425A-AC40-4486-96AF-20027B738C09}.Release|x86.ActiveCfg = Release|Any CPU
 		{93B8425A-AC40-4486-96AF-20027B738C09}.Release|x86.Build.0 = Release|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Debug|x64.Build.0 = Debug|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Debug|x86.Build.0 = Debug|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Release|x64.ActiveCfg = Release|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Release|x64.Build.0 = Release|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Release|x86.ActiveCfg = Release|Any CPU
+		{03A24BD1-B960-4E4A-AF8A-22BA8DA9BAFC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

examples/custom_eventman/Program.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using SFML.Graphics;
+using SFML.Window;
+namespace Program;
+
+public struct SimpleEventPasser : IEventMan
+{
+    private readonly List<Event> _events;
+    public SimpleEventPasser() => _events = new();
+    public void HandleEvent(Event eve)
+    {
+        switch (eve.Type)
+        {
+            case EventType.Closed:
+            case EventType.LostFocus:
+            case EventType.GainedFocus:
+            case EventType.KeyPressed:
+            case EventType.KeyReleased:
+                _events.Add(eve);
+                break;
+            default: // Filtering out all other events
+                break;
+        }
+    }
+    public void PrepareFrame() => _events.Clear();
+    public IEnumerable<Event> ProcessEvents() => _events;
+}
+public static class Program
+{
+    public static void Main()
+    {
+        var event_man = new SimpleEventPasser();
+        var window = new RenderWindow(
+            new(640, 480),
+            "Custom Event Manager example",
+            Styles.Default,
+            event_man
+        );
+        while (window.IsOpen)
+        {
+            window.Clear(Color.Black);
+            window.DispatchEvents();
+            window.Display();
+            foreach (var e in event_man.ProcessEvents())
+            {
+                System.Console.WriteLine(e.ToString());
+                if (e.Type == EventType.Closed)
+                {
+                    window.Close();
+                }
+            }
+        }
+    }
+}

examples/custom_eventman/custom_eventman.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SFML.Net\SFML.Net.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

examples/netcore/Program.cs

@@ -18,7 +18,7 @@ static void Main(string[] args)
             var sound = new Sound(GenerateSineWave(frequency: 440.0, volume: .25, seconds: 1));
 
             var window = new RenderWindow(new VideoMode(800, 600), "SFML running in .NET Core");
-            window.Closed += (_, __) => window.Close();
+            (window.SfmlEventManager as SubscribeManager).Closed += (_, __) => window.Close();
 
             sound.Play();
 

examples/opengl/OpenGL.cs

@@ -31,9 +31,10 @@ static void Main()
             //GraphicsContext context = new GraphicsContext(new ContextHandle(IntPtr.Zero), null);
 
             // Setup event handlers
-            window.Closed += new EventHandler(OnClosed);
-            window.KeyPressed += new EventHandler<KeyEventArgs>(OnKeyPressed);
-            window.Resized += new EventHandler<SizeEventArgs>(OnResized);
+            var handler = window.SfmlEventManager as SubscribeManager;
+            handler.Closed += new EventHandler(OnClosed);
+            handler.KeyPressed += new EventHandler<KeyEventArgs>(OnKeyPressed);
+            handler.Resized += new EventHandler<SizeEventArgs>(OnResized);
 
             // Create a sprite for the background
             var background = new Sprite(new Texture("resources/background.jpg"));

examples/shader/Shader.cs

@@ -280,8 +280,9 @@ static void Main()
             window.SetVerticalSyncEnabled(true);
 
             // Setup event handlers
-            window.Closed += OnClosed;
-            window.KeyPressed += OnKeyPressed;
+            var handler = window.SfmlEventManager as SubscribeManager;
+            handler.Closed += OnClosed;
+            handler.KeyPressed += OnKeyPressed;
 
             // Load the application font and pass it to the Effect class
             var font = new Font("resources/sansation.ttf");

examples/visualbasic/OpenGL.vb

@@ -177,15 +177,15 @@
     ''' <summary>
     ''' Function called when the window is closed
     ''' </summary>
-    Sub App_Closed(ByVal sender As Object, ByVal e As EventArgs) Handles window.Closed
+    Sub App_Closed(ByVal sender As Object, ByVal e As EventArgs) Handles window.SfmlEventManager.Closed
         Dim window = CType(sender, RenderWindow)
         window.Close()
     End Sub
 
     ''' <summary>
     ''' Function called when a key is pressed
     ''' </summary>
-    Sub App_KeyPressed(ByVal sender As Object, ByVal e As KeyEventArgs) Handles window.KeyPressed
+    Sub App_KeyPressed(ByVal sender As Object, ByVal e As KeyEventArgs) Handles window.SfmlEventManager.KeyPressed
         Dim window = CType(sender, RenderWindow)
         If e.Code = Keyboard.Key.Escape Then
             window.Close()
@@ -195,7 +195,7 @@
     ''' <summary>
     ''' Function called when the window is resized
     ''' </summary>
-    Sub App_Resized(ByVal sender As Object, ByVal e As SizeEventArgs) Handles window.Resized
+    Sub App_Resized(ByVal sender As Object, ByVal e As SizeEventArgs) Handles window.SfmlEventManager.Resized
         GL.Viewport(0, 0, e.Width, e.Height)
     End Sub
 

examples/window/Program.cs

@@ -20,7 +20,7 @@ public void Run()
         {
             var mode = new SFML.Window.VideoMode(800, 600);
             var window = new SFML.Graphics.RenderWindow(mode, "SFML works!");
-            window.KeyPressed += Window_KeyPressed;
+            (window.SfmlEventManager as SFML.Window.SubscribeManager).KeyPressed += Window_KeyPressed;
 
             var circle = new SFML.Graphics.CircleShape(100f)
             {

src/SFML.Graphics/RenderWindow.cs

@@ -21,9 +21,10 @@ public class RenderWindow : Window.Window, RenderTarget
         /// </summary>
         /// <param name="mode">Video mode to use</param>
         /// <param name="title">Title of the window</param>
+        /// <param name="manager">A custom event manager. By default, a SubscribeManager object is created</param>
         ////////////////////////////////////////////////////////////
-        public RenderWindow(VideoMode mode, string title) :
-            this(mode, title, Styles.Default, new ContextSettings(0, 0))
+        public RenderWindow(VideoMode mode, string title, IEventMan manager = null) :
+            this(mode, title, Styles.Default, new ContextSettings(0, 0), manager)
         {
         }
 
@@ -34,9 +35,10 @@ public RenderWindow(VideoMode mode, string title) :
         /// <param name="mode">Video mode to use</param>
         /// <param name="title">Title of the window</param>
         /// <param name="style">Window style (Resize | Close by default)</param>
+        /// <param name="manager">A custom event manager. By default, a SubscribeManager object is created</param>
         ////////////////////////////////////////////////////////////
-        public RenderWindow(VideoMode mode, string title, Styles style) :
-            this(mode, title, style, new ContextSettings(0, 0))
+        public RenderWindow(VideoMode mode, string title, Styles style, IEventMan manager = null) :
+            this(mode, title, style, new ContextSettings(0, 0), manager)
         {
         }
 
@@ -48,9 +50,10 @@ public RenderWindow(VideoMode mode, string title, Styles style) :
         /// <param name="title">Title of the window</param>
         /// <param name="style">Window style (Resize | Close by default)</param>
         /// <param name="settings">Creation parameters</param>
+        /// <param name="manager">A custom event manager. By default, a SubscribeManager object is created</param>
         ////////////////////////////////////////////////////////////
-        public RenderWindow(VideoMode mode, string title, Styles style, ContextSettings settings) :
-            base(IntPtr.Zero, 0)
+        public RenderWindow(VideoMode mode, string title, Styles style, ContextSettings settings, IEventMan manager = null) :
+            base(manager, IntPtr.Zero)
         {
             // Copy the string to a null-terminated UTF-32 byte array
             byte[] titleAsUtf32 = Encoding.UTF32.GetBytes(title + '\0');
@@ -70,9 +73,10 @@ public RenderWindow(VideoMode mode, string title, Styles style, ContextSettings
         /// Create the window from an existing control with default creation settings
         /// </summary>
         /// <param name="handle">Platform-specific handle of the control</param>
+        /// <param name="manager">A custom event manager. By default, a SubscribeManager object is created</param>
         ////////////////////////////////////////////////////////////
-        public RenderWindow(IntPtr handle) :
-            this(handle, new ContextSettings(0, 0))
+        public RenderWindow(IntPtr handle, IEventMan manager = null) :
+            this(handle, new ContextSettings(0, 0), manager)
         {
         }
 
@@ -82,9 +86,10 @@ public RenderWindow(IntPtr handle) :
         /// </summary>
         /// <param name="handle">Platform-specific handle of the control</param>
         /// <param name="settings">Creation parameters</param>
+        /// <param name="manager">A custom event manager. By default, a SubscribeManager object is created</param>
         ////////////////////////////////////////////////////////////
-        public RenderWindow(IntPtr handle, ContextSettings settings) :
-            base(sfRenderWindow_createFromHandle(handle, ref settings), 0)
+        public RenderWindow(IntPtr handle, ContextSettings settings, IEventMan manager = null) :
+            base(manager, sfRenderWindow_createFromHandle(handle, ref settings))
         {
             Initialize();
         }

src/SFML.Window/IEventMan.cs

@@ -0,0 +1,21 @@
+namespace SFML.Window
+{
+    /// <summary>An instance that manages events within a SFML.Window</summary>
+    public interface IEventMan
+    {
+
+        ////////////////////////////////////////////////////////////
+        /// <summary>
+        /// This method is called by the window before
+        /// detecting the events from the new. Use for any
+        /// setup and cleanup of previous batch (if needed)
+        /// </summary>
+        ////////////////////////////////////////////////////////////
+        void PrepareFrame();
+        ////////////////////////////////////////////////////////////
+        /// <summary>Handles the event which was passed to it by the Window class</summary>
+        /// <param name="eve">The event object recieved</param>
+        ////////////////////////////////////////////////////////////
+        void HandleEvent(Event eve);
+    }
+}