Add API for sf::WindowBase

SFML · Nov 19, 2023 · e240141 · e240141
1 parent d90cd6f
commit e240141
Show file tree

Hide file tree

Showing 10 changed files with 768 additions and 64 deletions.
diff --git a/include/SFML/Window/Types.h b/include/SFML/Window/Types.h
@@ -29,6 +29,7 @@
 typedef struct sfContext sfContext;
 typedef struct sfCursor sfCursor;
 typedef struct sfWindow sfWindow;
+typedef struct sfWindowBase sfWindowBase;
 
 
 #endif // SFML_WINDOW_TYPES_H
diff --git a/include/SFML/Window/Vulkan.h b/include/SFML/Window/Vulkan.h
@@ -28,6 +28,21 @@
 #include <SFML/Window/Export.h>
 
 
+typedef struct VkInstance_T* VkInstance;
+
+#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
+
+typedef struct VkSurfaceKHR_T* VkSurfaceKHR;
+
+#else
+
+typedef uint64_t VkSurfaceKHR;
+
+#endif
+
+struct VkAllocationCallbacks;
+
+
 typedef void (*sfVulkanFunctionPointer)();
 
 ////////////////////////////////////////////////////////////

diff --git a/include/SFML/Window/Window.h b/include/SFML/Window/Window.h
@@ -31,26 +31,12 @@
 #include <SFML/Window/Export.h>
 #include <SFML/Window/Event.h>
 #include <SFML/Window/VideoMode.h>
+#include <SFML/Window/WindowBase.h>
 #include <SFML/Window/WindowHandle.h>
 #include <SFML/Window/Types.h>
 #include <SFML/System/Vector2.h>
 
 
-////////////////////////////////////////////////////////////
-/// \brief Enumeration of window creation styles
-///
-////////////////////////////////////////////////////////////
-typedef enum
-{
-    sfNone         = 0,      ///< No border / title bar (this flag and all others are mutually exclusive)
-    sfTitlebar     = 1 << 0, ///< Title bar + fixed border
-    sfResize       = 1 << 1, ///< Titlebar + resizable border + maximize button
-    sfClose        = 1 << 2, ///< Titlebar + close button
-    sfFullscreen   = 1 << 3, ///< Fullscreen mode (this flag and all others are mutually exclusive)
-    sfDefaultStyle = sfTitlebar | sfResize | sfClose ///< Default window style
-} sfWindowStyle;
-
-
 ////////////////////////////////////////////////////////////
 /// \brief Enumeration of the context attribute flags
 ///
@@ -406,7 +392,7 @@ CSFML_WINDOW_API void sfWindow_setFramerateLimit(sfWindow* window, unsigned int
 /// \brief Change the joystick threshold
 ///
 /// The joystick threshold is the value below which
-/// no JoyMoved event will be generated.
+/// no JoystickMoved event will be generated.
 ///
 /// \param window    Window object
 /// \param threshold New threshold, in the range [0, 100]