Everything makes far more sense after this refactor!

Author: devshgraphicsprogramming

include/nbl/system/ISystem.h

@@ -224,7 +224,7 @@ class NBL_API2 ISystem : public core::IReferenceCounted
         struct SRequestParams_NOOP
         {
             using retval_t = void;
-            inline void operator()(core::StorageTrivializer<retval_t>* retval, ICaller* _caller) {}
+            inline void operator()(core::StorageTrivializer<retval_t>* retval, ICaller* _caller) {assert(false);}
         };
         struct SRequestParams_CREATE_FILE
         {

include/nbl/ui/ICursorControl.h

@@ -9,7 +9,7 @@
 namespace nbl::ui
 {
 
-class ICursorControl : public core::IReferenceCounted
+class ICursorControl : public virtual core::IReferenceCounted
 {
 	public:
 		struct SPosition

include/nbl/ui/IGraphicalApplicationFramework.h

@@ -1,6 +1,8 @@
 #ifndef _NBL_UI_I_GRAPHICAL_APPLICATION_FRAMEWORK_H_INCLUDED_
 #define _NBL_UI_I_GRAPHICAL_APPLICATION_FRAMEWORK_H_INCLUDED_
 
+#include "nbl/ui/IWindow.h"
+
 #include <vector>
 #include <string>
 

include/nbl/ui/IWindowManager.h

@@ -6,7 +6,7 @@
 namespace nbl::ui
 {
 
-class NBL_API2 IWindowManager : public core::IReferenceCounted
+class NBL_API2 IWindowManager : public virtual core::IReferenceCounted
 {
 	public:
 		virtual core::smart_refctd_ptr<IWindow> createWindow(IWindow::SCreationParams&& creationParams) = 0;

include/nbl/ui/declarations.h

@@ -1,16 +1,15 @@
 // Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-
-#ifndef __NBL_UI_DECLARATIONS_H_INCLUDED__
-#define __NBL_UI_DECLARATIONS_H_INCLUDED__
+#ifndef _NBL_UI_DECLARATIONS_H_INCLUDED_
+#define _NBL_UI_DECLARATIONS_H_INCLUDED_
 
 // dependencies
 #include "nbl/system/declarations.h"
 
 // windows
 #if defined(_NBL_PLATFORM_WINDOWS_)
-#	include "nbl/ui/CWindowManagerWin32.h"
+#	include "nbl/ui/IWindowManagerWin32.h"
 #elif defined(_NBL_BUILD_WITH_WAYLAND) && defined(_NBL_TEST_WAYLAND)
 #	include "nbl/ui/CWindowManagerWayland.h"
 #elif defined(_NBL_PLATFORM_LINUX_)

include/nbl/ui/definitions.h

@@ -1,20 +1,10 @@
 // Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-
-#ifndef __NBL_UI_DEFINITIONS_H_INCLUDED__
-#define __NBL_UI_DEFINITIONS_H_INCLUDED__
+#ifndef _NBL_UI_DEFINITIONS_H_INCLUDED_
+#define _NBL_UI_DEFINITIONS_H_INCLUDED_
 
 // dependencies
 #include "nbl/system/definitions.h"
 
-// windows
-#include "nbl/ui/CWindowManagerWin32.h"
-//#include "nbl/ui/CWindowManagerX11.h"
-#include "nbl/ui/CWindowWin32.h"
-// TODO
-//#include "nbl/ui/CWindowAndroid.h"
-//#include "nbl/ui/CWindowX11.h"
-//#include "nbl/ui/CWindowWayland.h"
-
 #endif

src/nbl/CMakeLists.txt

@@ -185,8 +185,7 @@ set(NBL_SYSTEM_SOURCES
 )
 set(NBL_UI_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/ui/CWindowWin32.cpp
-	${NBL_ROOT_PATH}/src/nbl/ui/CCursorControlWin32.cpp
-	${NBL_ROOT_PATH}/src/nbl/ui/CClipboardManagerWin32.cpp
+	${NBL_ROOT_PATH}/src/nbl/ui/CWindowManagerWin32.cpp
 	${NBL_ROOT_PATH}/src/nbl/ui/CWindowManagerAndroid.cpp
 	${NBL_ROOT_PATH}/src/nbl/ui/CGraphicalApplicationAndroid.cpp
 )

src/nbl/ui/CClipboardManagerWin32.cpp

@@ -0,0 +1,57 @@
+#ifndef _NBL_UI_C_CLIPBOARD_MANAGER_WIN32_INCLUDED_
+#define _NBL_UI_C_CLIPBOARD_MANAGER_WIN32_INCLUDED_
+
+#include "nbl/ui/IClipboardManager.h"
+
+#ifdef _NBL_PLATFORM_WINDOWS_
+#include <Windows.h>
+namespace nbl::ui
+{
+
+class NBL_API2 CClipboardManagerWin32 final : public IClipboardManager
+{
+		using base_t = IClipboardManager;
+	public:
+		inline CClipboardManagerWin32() = default;
+
+		inline std::string getClipboardText() override
+		{
+			int32_t res = OpenClipboard(0);
+			assert(res != 0);
+
+			std::string data = (const char*)GetClipboardData(CF_TEXT);
+
+			CloseClipboard();
+
+			return data;
+		}
+		virtual bool setClipboardText(const std::string_view& str) override
+		{
+			int32_t res = OpenClipboard(0);
+			if (res == 0)
+				return false;
+
+			EmptyClipboard();
+			const char* data = str.data();
+			const size_t data_size = strlen(data) + 1;
+			HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, data_size);
+			strcpy((char*)GlobalLock(h), LPCSTR(data));
+			GlobalUnlock(h);
+			SetClipboardData(CF_TEXT, h);
+
+			CloseClipboard();
+
+			return true;
+		}
+
+		//virtual core::smart_refctd_ptr<asset::ICPUImage> getClipboardImage() override;
+		//virtual bool setClipboardImage(asset::ICPUImage* image, asset::ICPUImage::SImageCopy data) override;
+	private:
+		//HGLOBAL* CPUImageToClipboardImage(asset::ICPUImage* image);
+};
+
+}
+
+
+#endif
+#endif