refactor a few windowing things

devshgraphicsprogramming · devshgraphicsprogramming · commit 8097e772e1fb · 2023-03-17T19:54:08.000+01:00
diff --git a/include/nbl/ui/IWindow.h b/include/nbl/ui/IWindow.h
@@ -41,6 +41,7 @@ class IWindow : public core::IReferenceCounted
         class IEventCallback : public core::IReferenceCounted
         {
             public:
+                // TODO: rethink our boolean returns
                 [[nodiscard]] inline bool onWindowShown(IWindow* w)
                 {
                     auto canShow = onWindowShown_impl();
@@ -107,6 +108,7 @@ class IWindow : public core::IReferenceCounted
                 {
                     return onWindowClosed_impl();
                 }
+
                 inline void onGainedMouseFocus(IWindow* w)
                 {
                     onGainedMouseFocus_impl();
@@ -160,18 +162,9 @@ class IWindow : public core::IReferenceCounted
                 NBL_API2 virtual void onKeyboardConnected_impl(core::smart_refctd_ptr<IKeyboardEventChannel>&& kbch) {}
                 NBL_API2 virtual void onKeyboardDisconnected_impl(IKeyboardEventChannel* mch) {}
         };
-        struct SCreationParams
-        {
-            //IWindow(core::smart_refctd_ptr<IEventCallback>&& _cb, core::smart_refctd_ptr<system::ISystem>&& _sys, uint32_t _w = 0u, uint32_t _h = 0u, E_CREATE_FLAGS _flags = static_cast<E_CREATE_FLAGS>(0)) :
-            core::smart_refctd_ptr<IEventCallback> callback;
-            core::smart_refctd_ptr<system::ISystem> system;
-            int32_t x, y;
-            uint32_t width = 0u, height = 0u;
-            E_CREATE_FLAGS flags = static_cast<E_CREATE_FLAGS>(0);
-            uint32_t eventChannelCapacityLog2[IInputEventChannel::ET_COUNT];
-            std::string windowCaption;
-        };
-        friend struct IEventCallback;
+
+        friend class IEventCallback;
+        inline void setEventCallback(core::smart_refctd_ptr<IEventCallback>&& evCb) { m_cb = std::move(evCb); }
 
         inline bool isFullscreen()        { return (m_flags.value & ECF_FULLSCREEN); }
         inline bool isHidden()            { return (m_flags.value & ECF_HIDDEN); }
@@ -193,28 +186,33 @@ class IWindow : public core::IReferenceCounted
 
         NBL_API2 virtual IClipboardManager* getClipboardManager() = 0;
         NBL_API2 virtual ICursorControl* getCursorControl() = 0;
-        NBL_API2 virtual IWindowManager* getManager() = 0;
+        NBL_API2 virtual IWindowManager* getManager() const = 0;
 
         inline IEventCallback* getEventCallback() const { return m_cb.get(); }
 
         NBL_API2 virtual void setCaption(const std::string_view& caption) = 0;
+
+        struct SCreationParams
+        {
+            core::smart_refctd_ptr<IEventCallback> callback;
+            int32_t x, y;
+            uint32_t width = 0u, height = 0u;
+            E_CREATE_FLAGS flags = E_CREATE_FLAGS::ECF_NONE;
+            uint32_t eventChannelCapacityLog2[IInputEventChannel::ET_COUNT];
+            std::string windowCaption;
+        };
     protected:
         // TODO need to update constructors of all derived CWindow* classes
         inline IWindow(SCreationParams&& params) :
-            m_cb(std::move(params.callback)), m_sys(std::move(params.system)), m_width(params.width), m_height(params.height), m_x(params.x), m_y(params.y), m_flags(params.flags)
+            m_cb(std::move(params.callback)), m_width(params.width), m_height(params.height), m_x(params.x), m_y(params.y), m_flags(params.flags)
         {
-
         }
-
-        NBL_API2 virtual ~IWindow() = default;
+        inline virtual ~IWindow() = default;
 
         core::smart_refctd_ptr<IEventCallback> m_cb;
-        core::smart_refctd_ptr<system::ISystem> m_sys;
         uint32_t m_width = 0u, m_height = 0u;
         int32_t m_x, m_y; // gonna add it here until further instructions XD
         core::bitflag<E_CREATE_FLAGS> m_flags = static_cast<E_CREATE_FLAGS>(0u);
-    public:
-        inline void setEventCallback(core::smart_refctd_ptr<IEventCallback>&& evCb) { m_cb = std::move(evCb); }
 };
 
 }
diff --git a/include/nbl/ui/IWindowAndroid.h b/include/nbl/ui/IWindowAndroid.h
@@ -4,28 +4,21 @@
 #include "nbl/ui/IWindow.h"
 
 #ifdef _NBL_PLATFORM_ANDROID_
-
-#include <android/native_window.h>
-
 namespace nbl::ui
 {
 
 class NBL_API2 IWindowAndroid : public IWindow
 {
-    protected:
-        virtual ~IWindowAndroid() = default;
-        inline IWindowAndroid(SCreationParams&& params) : IWindow(std::move(params)) {}
-
     public:
-        using IWindow::IWindow;
-
         using native_handle_t = struct ANativeWindow*;
-
         virtual const native_handle_t& getNativeHandle() const = 0;
+
+    protected:
+        virtual ~IWindowAndroid() = default;
+        inline IWindowAndroid(SCreationParams&& params) : IWindow(std::move(params)) {}
 };
 
 }
-
 #endif // _NBL_PLATFORM_ANDROID_
 
 #endif
diff --git a/include/nbl/ui/IWindowManager.h b/include/nbl/ui/IWindowManager.h
@@ -1,32 +1,26 @@
-#ifndef _NBL_UI_I_WINDOWMANAGER_
-#define _NBL_UI_I_WINDOWMANAGER_
+#ifndef _NBL_UI_I_WINDOWMANAGER_INCLUDED_
+#define _NBL_UI_I_WINDOWMANAGER_INCLUDED_
 
-#include <nbl/core/IReferenceCounted.h>
-#include "IWindow.h"
+#include "nbl/ui/IWindow.h"
 
 namespace nbl::ui
 {
 
-struct SDisplayInfo
-{
-	int32_t x;
-	int32_t y;
-	uint32_t resX;
-	uint32_t resY;
-	std::string name; // this one is really more of a placeholder right now
-};
-
 class NBL_API2 IWindowManager : public core::IReferenceCounted
 {
 	public:
 		virtual core::smart_refctd_ptr<IWindow> createWindow(IWindow::SCreationParams&& creationParams) = 0;
-		virtual SDisplayInfo getPrimaryDisplayInfo() const = 0;
 
-		virtual bool setWindowSize_impl(IWindow* window, uint32_t width, uint32_t height) = 0;
-		virtual bool setWindowPosition_impl(IWindow* window, int32_t x, int32_t y) = 0;
-		virtual bool setWindowRotation_impl(IWindow* window, bool landscape) = 0;
-		virtual bool setWindowVisible_impl(IWindow* window, bool visible) = 0;
-		virtual bool setWindowMaximized_impl(IWindow* window, bool maximized) = 0;
+		//!
+		struct SDisplayInfo
+		{
+			int32_t x;
+			int32_t y;
+			uint32_t resX;
+			uint32_t resY;
+			std::string name; // this one is really more of a placeholder right now
+		};
+		virtual SDisplayInfo getPrimaryDisplayInfo() const = 0;
 
 		inline bool setWindowSize(IWindow* window, const uint32_t width, const uint32_t height)
 		{
@@ -99,6 +93,12 @@ class NBL_API2 IWindowManager : public core::IReferenceCounted
 
 	protected:
 		virtual ~IWindowManager() = default;
+
+		virtual bool setWindowSize_impl(IWindow* window, uint32_t width, uint32_t height) = 0;
+		virtual bool setWindowPosition_impl(IWindow* window, int32_t x, int32_t y) = 0;
+		virtual bool setWindowRotation_impl(IWindow* window, bool landscape) = 0;
+		virtual bool setWindowVisible_impl(IWindow* window, bool visible) = 0;
+		virtual bool setWindowMaximized_impl(IWindow* window, bool maximized) = 0;
 };
 
 }
diff --git a/include/nbl/ui/IWindowManagerWin32.h b/include/nbl/ui/IWindowManagerWin32.h
@@ -0,0 +1,18 @@
+#ifndef _NBL_UI_I_WINDOWMANAGER_WIN32_INCLUDED_
+#define _NBL_UI_I_WINDOWMANAGER_WIN32_INCLUDED_
+
+#include "nbl/ui/IWindowManager.h"
+
+#ifdef _NBL_PLATFORM_WINDOWS_
+namespace nbl::ui
+{
+
+class IWindowManagerWin32 : public IWindowManager
+{
+	public:
+		NBL_API2 static core::smart_refctd_ptr<IWindowManagerWin32> create();
+};
+
+}
+#endif
+#endif
diff --git a/include/nbl/ui/IWindowWin32.h b/include/nbl/ui/IWindowWin32.h
@@ -1,64 +1,24 @@
-#ifndef __NBL_I_WINDOW_WIN32_H_INCLUDED__
-#define __NBL_I_WINDOW_WIN32_H_INCLUDED__
-
-#include "nbl/system/DefaultFuncPtrLoader.h"
-
-#include "nbl/ui/IWindow.h"
+#ifndef _NBL_I_WINDOW_WIN32_H_INCLUDED_
+#define _NBL_I_WINDOW_WIN32_H_INCLUDED_
 
+#include "nbl/ui/IWindowManagerWin32.h"
 
 #ifdef _NBL_PLATFORM_WINDOWS_
+// forward declare HWND
+struct HWND__;
 
 namespace nbl::ui
 {
 
 class NBL_API2 IWindowWin32 : public IWindow
 {
-    protected:
-        virtual ~IWindowWin32() = default;
-        inline IWindowWin32(SCreationParams&& params) : IWindow(std::move(params)) {}
-
     public:
-        using IWindow::IWindow;
-
-        using native_handle_t = HWND;
-
+        using native_handle_t = HWND__*;
         virtual const native_handle_t& getNativeHandle() const = 0;
-
-		static DWORD getWindowStyle(IWindow::E_CREATE_FLAGS flags)
-		{
-			DWORD style = WS_POPUP;
-
-			if ((flags & IWindow::ECF_FULLSCREEN) == 0)
-			{
-				if ((flags & IWindow::ECF_BORDERLESS) == 0)
-				{
-					style |= WS_BORDER;
-					style |= (WS_SYSMENU | WS_CAPTION);
-				}
-				// ? not sure about those below
-				style |= WS_CLIPCHILDREN;
-				style |= WS_CLIPSIBLINGS;
-			}
-			if (flags & IWindow::ECF_MINIMIZED)
-			{
-				style |= WS_MINIMIZE;
-			}
-			if (flags & IWindow::ECF_MAXIMIZED)
-			{
-				style |= WS_MAXIMIZE;
-			}
-			if (flags & IWindow::ECF_ALWAYS_ON_TOP)
-			{
-				style |= WS_EX_TOPMOST;
-			}
-			if ((flags & IWindow::ECF_HIDDEN) == 0)
-			{
-				style |= WS_VISIBLE;
-			}
-			style |= WS_OVERLAPPEDWINDOW;
-
-			return style;
-		}
+        
+    protected:
+        inline IWindowWin32(SCreationParams&& params) : IWindow(std::move(params)) {}
+        virtual ~IWindowWin32() = default;
 };
 
 }
diff --git a/include/nbl/ui/KeyCodes.h b/include/nbl/ui/KeyCodes.h
diff --git a/include/nbl/ui/SInputEvent.h b/include/nbl/ui/SInputEvent.h
