Add API for sf::WindowBase

src/SFML/ConvertEvent.h

@@ -35,88 +35,88 @@
 ////////////////////////////////////////////////////////////
 // Define a function to convert a sf::Event to a sfEvent
 ////////////////////////////////////////////////////////////
-inline void convertEvent(const sf::Event& SFMLEvent, sfEvent* event)
+inline void convertEvent(const sf::Event& sfmlEvent, sfEvent* event)
 {
     // Convert its type
-    event->type = static_cast<sfEventType>(SFMLEvent.type);
+    event->type = static_cast<sfEventType>(sfmlEvent.type);
 
     // Fill its fields
     switch (event->type)
     {
         case sfEvtResized :
-            event->size.width  = SFMLEvent.size.width;
-            event->size.height = SFMLEvent.size.height;
+            event->size.width  = sfmlEvent.size.width;
+            event->size.height = sfmlEvent.size.height;
             break;
 
         case sfEvtTextEntered :
-            event->text.unicode = SFMLEvent.text.unicode;
+            event->text.unicode = sfmlEvent.text.unicode;
             break;
 
         case sfEvtKeyReleased :
         case sfEvtKeyPressed :
-            event->key.code     = static_cast<sfKeyCode>(SFMLEvent.key.code);
-            event->key.scancode = static_cast<sfScancode>(SFMLEvent.key.scancode);
-            event->key.alt      = SFMLEvent.key.alt     ? sfTrue : sfFalse;
-            event->key.control  = SFMLEvent.key.control ? sfTrue : sfFalse;
-            event->key.shift    = SFMLEvent.key.shift   ? sfTrue : sfFalse;
-            event->key.system   = SFMLEvent.key.system  ? sfTrue : sfFalse;
+            event->key.code     = static_cast<sfKeyCode>(sfmlEvent.key.code);
+            event->key.scancode = static_cast<sfScancode>(sfmlEvent.key.scancode);
+            event->key.alt      = sfmlEvent.key.alt     ? sfTrue : sfFalse;
+            event->key.control  = sfmlEvent.key.control ? sfTrue : sfFalse;
+            event->key.shift    = sfmlEvent.key.shift   ? sfTrue : sfFalse;
+            event->key.system   = sfmlEvent.key.system  ? sfTrue : sfFalse;
             break;
 
         case sfEvtMouseWheelMoved :
-            event->mouseWheel.delta = SFMLEvent.mouseWheel.delta;
-            event->mouseWheel.x     = SFMLEvent.mouseWheel.x;
-            event->mouseWheel.y     = SFMLEvent.mouseWheel.y;
+            event->mouseWheel.delta = sfmlEvent.mouseWheel.delta;
+            event->mouseWheel.x     = sfmlEvent.mouseWheel.x;
+            event->mouseWheel.y     = sfmlEvent.mouseWheel.y;
             break;
 
         case sfEvtMouseWheelScrolled :
-            event->mouseWheelScroll.wheel = static_cast<sfMouseWheel>(SFMLEvent.mouseWheelScroll.wheel);
-            event->mouseWheelScroll.delta = SFMLEvent.mouseWheelScroll.delta;
-            event->mouseWheelScroll.x     = SFMLEvent.mouseWheelScroll.x;
-            event->mouseWheelScroll.y     = SFMLEvent.mouseWheelScroll.y;
+            event->mouseWheelScroll.wheel = static_cast<sfMouseWheel>(sfmlEvent.mouseWheelScroll.wheel);
+            event->mouseWheelScroll.delta = sfmlEvent.mouseWheelScroll.delta;
+            event->mouseWheelScroll.x     = sfmlEvent.mouseWheelScroll.x;
+            event->mouseWheelScroll.y     = sfmlEvent.mouseWheelScroll.y;
             break;
 
         case sfEvtMouseButtonPressed :
         case sfEvtMouseButtonReleased :
-            event->mouseButton.button = static_cast<sfMouseButton>(SFMLEvent.mouseButton.button);
-            event->mouseButton.x      = SFMLEvent.mouseButton.x;
-            event->mouseButton.y      = SFMLEvent.mouseButton.y;
+            event->mouseButton.button = static_cast<sfMouseButton>(sfmlEvent.mouseButton.button);
+            event->mouseButton.x      = sfmlEvent.mouseButton.x;
+            event->mouseButton.y      = sfmlEvent.mouseButton.y;
             break;
 
         case sfEvtMouseMoved :
-            event->mouseMove.x = SFMLEvent.mouseMove.x;
-            event->mouseMove.y = SFMLEvent.mouseMove.y;
+            event->mouseMove.x = sfmlEvent.mouseMove.x;
+            event->mouseMove.y = sfmlEvent.mouseMove.y;
             break;
 
         case sfEvtJoystickButtonPressed :
         case sfEvtJoystickButtonReleased :
-            event->joystickButton.joystickId = SFMLEvent.joystickButton.joystickId;
-            event->joystickButton.button     = SFMLEvent.joystickButton.button;
+            event->joystickButton.joystickId = sfmlEvent.joystickButton.joystickId;
+            event->joystickButton.button     = sfmlEvent.joystickButton.button;
             break;
 
         case sfEvtJoystickMoved :
-            event->joystickMove.joystickId = SFMLEvent.joystickMove.joystickId;
-            event->joystickMove.axis       = static_cast<sfJoystickAxis>(SFMLEvent.joystickMove.axis);
-            event->joystickMove.position   = SFMLEvent.joystickMove.position;
+            event->joystickMove.joystickId = sfmlEvent.joystickMove.joystickId;
+            event->joystickMove.axis       = static_cast<sfJoystickAxis>(sfmlEvent.joystickMove.axis);
+            event->joystickMove.position   = sfmlEvent.joystickMove.position;
             break;
 
         case sfEvtJoystickConnected :
         case sfEvtJoystickDisconnected :
-            event->joystickConnect.joystickId = SFMLEvent.joystickConnect.joystickId;
+            event->joystickConnect.joystickId = sfmlEvent.joystickConnect.joystickId;
             break;
 
         case sfEvtTouchBegan :
         case sfEvtTouchMoved :
         case sfEvtTouchEnded :
-            event->touch.finger = SFMLEvent.touch.finger;
-            event->touch.x = SFMLEvent.touch.x;
-            event->touch.y = SFMLEvent.touch.y;
+            event->touch.finger = sfmlEvent.touch.finger;
+            event->touch.x = sfmlEvent.touch.x;
+            event->touch.y = sfmlEvent.touch.y;
             break;
 
         case sfEvtSensorChanged :
-            event->sensor.sensorType = static_cast<sfSensorType>(SFMLEvent.sensor.type);
-            event->sensor.x = SFMLEvent.sensor.x;
-            event->sensor.y = SFMLEvent.sensor.y;
-            event->sensor.z = SFMLEvent.sensor.z;
+            event->sensor.sensorType = static_cast<sfSensorType>(sfmlEvent.sensor.type);
+            event->sensor.x = sfmlEvent.sensor.x;
+            event->sensor.y = sfmlEvent.sensor.y;
+            event->sensor.z = sfmlEvent.sensor.z;
             break;
 
         default :

src/SFML/Graphics/RenderWindow.cpp

@@ -150,15 +150,15 @@ sfBool sfRenderWindow_pollEvent(sfRenderWindow* renderWindow, sfEvent* event)
     CSFML_CHECK_RETURN(event,        sfFalse);
 
     // Get the event
-    sf::Event SFMLEvent;
-    sfBool ret = renderWindow->This.pollEvent(SFMLEvent);
+    sf::Event sfmlEvent;
+    sfBool ret = renderWindow->This.pollEvent(sfmlEvent);
 
     // No event, return
     if (!ret)
         return sfFalse;
 
     // Convert the sf::Event event to a sfEvent
-    convertEvent(SFMLEvent, event);
+    convertEvent(sfmlEvent, event);
 
     return sfTrue;
 }
@@ -171,15 +171,15 @@ sfBool sfRenderWindow_waitEvent(sfRenderWindow* renderWindow, sfEvent* event)
     CSFML_CHECK_RETURN(event,        sfFalse);
 
     // Get the event
-    sf::Event SFMLEvent;
-    sfBool ret = renderWindow->This.waitEvent(SFMLEvent);
+    sf::Event sfmlEvent;
+    sfBool ret = renderWindow->This.waitEvent(sfmlEvent);
 
     // Error, return
     if (!ret)
         return sfFalse;
 
     // Convert the sf::Event event to a sfEvent
-    convertEvent(SFMLEvent, event);
+    convertEvent(sfmlEvent, event);
 
     return sfTrue;
 }

src/SFML/Window/CMakeLists.txt

@@ -32,8 +32,11 @@ set(SRC
     ${SRCROOT}/Vulkan.cpp
     ${INCROOT}/Vulkan.h
     ${SRCROOT}/Window.cpp
+    ${SRCROOT}/WindowBase.cpp
     ${SRCROOT}/WindowStruct.h
+    ${SRCROOT}/WindowBaseStruct.h
     ${INCROOT}/Window.h
+    ${INCROOT}/WindowBase.h
     ${INCROOT}/WindowHandle.h
 )
 

src/SFML/Window/Window.cpp

@@ -132,15 +132,15 @@ sfBool sfWindow_pollEvent(sfWindow* window, sfEvent* event)
     CSFML_CHECK_RETURN(event, sfFalse);
 
     // Get the event
-    sf::Event SFMLEvent;
-    sfBool ret = window->This.pollEvent(SFMLEvent);
+    sf::Event sfmlEvent;
+    sfBool ret = window->This.pollEvent(sfmlEvent);
 
     // No event, return
     if (!ret)
         return sfFalse;
 
     // Convert the sf::Event event to a sfEvent
-    convertEvent(SFMLEvent, event);
+    convertEvent(sfmlEvent, event);
 
     return sfTrue;
 }
@@ -153,15 +153,15 @@ sfBool sfWindow_waitEvent(sfWindow* window, sfEvent* event)
     CSFML_CHECK_RETURN(event, sfFalse);
 
     // Get the event
-    sf::Event SFMLEvent;
-    sfBool ret = window->This.waitEvent(SFMLEvent);
+    sf::Event sfmlEvent;
+    sfBool ret = window->This.waitEvent(sfmlEvent);
 
     // Error, return
     if (!ret)
         return sfFalse;
 
     // Convert the sf::Event event to a sfEvent
-    convertEvent(SFMLEvent, event);
+    convertEvent(sfmlEvent, event);
 
     return sfTrue;
 }

src/SFML/Window/WindowBase.cpp

@@ -0,0 +1,272 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2023 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Window/WindowBase.h>
+#include <SFML/Window/WindowBaseStruct.h>
+#include <SFML/Internal.h>
+#include <SFML/Window/CursorStruct.h>
+#include <SFML/ConvertEvent.h>
+
+
+////////////////////////////////////////////////////////////
+sfWindowBase* sfWindowBase_create(sfVideoMode mode, const char* title, sfUint32 style)
+{
+    // Convert video mode
+    sf::VideoMode videoMode(mode.width, mode.height, mode.bitsPerPixel);
+
+    // Create the window
+    sfWindowBase* windowBase = new sfWindowBase;
+    windowBase->This.create(videoMode, title, style);
+
+    return windowBase;
+}
+
+
+////////////////////////////////////////////////////////////
+sfWindowBase* sfWindowBase_createUnicode(sfVideoMode mode, const sfUint32* title, sfUint32 style)
+{
+    // Convert video mode
+    sf::VideoMode videoMode(mode.width, mode.height, mode.bitsPerPixel);
+
+    // Create the window
+    sfWindowBase* windowBase = new sfWindowBase;
+    windowBase->This.create(videoMode, title, style);
+
+    return windowBase;
+}
+
+
+////////////////////////////////////////////////////////////
+sfWindowBase* sfWindowBase_createFromHandle(sfWindowHandle handle)
+{
+    // Create the window
+    sfWindowBase* windowBase = new sfWindowBase;
+    windowBase->This.create(handle);
+
+    return windowBase;
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_destroy(sfWindowBase* windowBase)
+{
+    delete windowBase;
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_close(sfWindowBase* windowBase)
+{
+    CSFML_CALL(windowBase, close());
+}
+
+
+////////////////////////////////////////////////////////////
+sfBool sfWindowBase_isOpen(const sfWindowBase* windowBase)
+{
+    CSFML_CALL_RETURN(windowBase, isOpen(), sfFalse);
+}
+
+
+////////////////////////////////////////////////////////////
+sfBool sfWindowBase_pollEvent(sfWindowBase* windowBase, sfEvent* event)
+{
+    CSFML_CHECK_RETURN(windowBase, sfFalse);
+    CSFML_CHECK_RETURN(event, sfFalse);
+
+    // Get the event
+    sf::Event sfmlEvent;
+    sfBool ret = windowBase->This.pollEvent(sfmlEvent);
+
+    // No event, return
+    if (!ret)
+        return sfFalse;
+
+    // Convert the sf::Event event to a sfEvent
+    convertEvent(sfmlEvent, event);
+
+    return sfTrue;
+}
+
+
+////////////////////////////////////////////////////////////
+sfBool sfWindowBase_waitEvent(sfWindowBase* windowBase, sfEvent* event)
+{
+    CSFML_CHECK_RETURN(windowBase, sfFalse);
+    CSFML_CHECK_RETURN(event, sfFalse);
+
+    // Get the event
+    sf::Event sfmlEvent;
+    sfBool ret = windowBase->This.waitEvent(sfmlEvent);
+
+    // Error, return
+    if (!ret)
+        return sfFalse;
+
+    // Convert the sf::Event event to a sfEvent
+    convertEvent(sfmlEvent, event);
+
+    return sfTrue;
+}
+
+
+////////////////////////////////////////////////////////////
+sfVector2i sfWindowBase_getPosition(const sfWindowBase* windowBase)
+{
+    sfVector2i position = {0, 0};
+    CSFML_CHECK_RETURN(windowBase, position);
+
+    sf::Vector2i sfmlPos = windowBase->This.getPosition();
+    position.x = sfmlPos.x;
+    position.y = sfmlPos.y;
+
+    return position;
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setPosition(sfWindowBase* windowBase, sfVector2i position)
+{
+    CSFML_CALL(windowBase, setPosition(sf::Vector2i(position.x, position.y)));
+}
+
+
+////////////////////////////////////////////////////////////
+sfVector2u sfWindowBase_getSize(const sfWindowBase* windowBase)
+{
+    sfVector2u size = {0, 0};
+    CSFML_CHECK_RETURN(windowBase, size);
+
+    sf::Vector2u sfmlSize = windowBase->This.getSize();
+    size.x = sfmlSize.x;
+    size.y = sfmlSize.y;
+
+    return size;
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setSize(sfWindowBase* windowBase, sfVector2u size)
+{
+    CSFML_CALL(windowBase, setSize(sf::Vector2u(size.x, size.y)));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setTitle(sfWindowBase* windowBase, const char* title)
+{
+    CSFML_CALL(windowBase, setTitle(title));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setUnicodeTitle(sfWindowBase* windowBase, const sfUint32* title)
+{
+    CSFML_CALL(windowBase, setTitle(title));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setIcon(sfWindowBase* windowBase, unsigned int width, unsigned int height, const sfUint8* pixels)
+{
+    CSFML_CALL(windowBase, setIcon(width, height, pixels));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setVisible(sfWindowBase* windowBase, sfBool visible)
+{
+    CSFML_CALL(windowBase, setVisible(visible == sfTrue));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setMouseCursorVisible(sfWindowBase* windowBase, sfBool visible)
+{
+    CSFML_CALL(windowBase, setMouseCursorVisible(visible == sfTrue));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setMouseCursorGrabbed(sfWindowBase* windowBase, sfBool grabbed)
+{
+    CSFML_CALL(windowBase, setMouseCursorGrabbed(grabbed == sfTrue));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setMouseCursor(sfWindowBase* windowBase, const sfCursor* cursor)
+{
+    CSFML_CHECK(cursor);
+
+    CSFML_CALL(windowBase, setMouseCursor(cursor->This));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setKeyRepeatEnabled(sfWindowBase* windowBase, sfBool enabled)
+{
+    CSFML_CALL(windowBase, setKeyRepeatEnabled(enabled == sfTrue));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_setJoystickThreshold(sfWindowBase* windowBase, float threshold)
+{
+    CSFML_CALL(windowBase, setJoystickThreshold(threshold));
+}
+
+
+////////////////////////////////////////////////////////////
+void sfWindowBase_requestFocus(sfWindowBase* windowBase)
+{
+    CSFML_CALL(windowBase, requestFocus());
+}
+
+
+////////////////////////////////////////////////////////////
+sfBool sfWindowBase_hasFocus(const sfWindowBase* windowBase)
+{
+    CSFML_CALL_RETURN(windowBase, hasFocus(), sfFalse);
+}
+
+
+////////////////////////////////////////////////////////////
+sfWindowHandle sfWindowBase_getSystemHandle(const sfWindowBase* windowBase)
+{
+    CSFML_CHECK_RETURN(windowBase, 0);
+
+    return static_cast<sfWindowHandle>(windowBase->This.getSystemHandle());
+}
+
+////////////////////////////////////////////////////////////
+sfBool sfWindowBase_createVulkanSurface(sfWindowBase* windowBase, const VkInstance* instance, VkSurfaceKHR* surface, const VkAllocationCallbacks* allocator)
+{
+    CSFML_CHECK_RETURN(instance, sfFalse);
+    CSFML_CHECK_RETURN(surface, sfFalse);
+    CSFML_CALL_RETURN(windowBase, createVulkanSurface(*instance, *surface, allocator), sfFalse);
+}

src/SFML/Window/WindowBaseStruct.h

@@ -0,0 +1,43 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2023 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_WINDOWBASESTRUCT_H
+#define SFML_WINDOWBASESTRUCT_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Window/WindowBase.hpp>
+
+
+////////////////////////////////////////////////////////////
+// Internal structure of sfWindowBase
+////////////////////////////////////////////////////////////
+struct sfWindowBase
+{
+    sf::WindowBase This;
+};
+
+
+#endif // SFML_WINDOWBASESTRUCT_H