Move WindowDriver implementations to platform folder

This commit is contained in:
2025-06-21 01:23:54 +10:00
parent ccd5306636
commit d89f8de08f
8 changed files with 9 additions and 9 deletions

View File

@@ -0,0 +1,186 @@
/**
* Copyright (c) 2025, Jayden Grubb <contact@jaydengrubb.com>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifdef NOVA_X11
#include "platform/linux/x11/window_driver.h"
#ifdef NOVA_VULKAN
#include "drivers/vulkan/render_driver.h"
#include <vulkan/vulkan.h>
#include <vulkan/vulkan_xlib.h>
#endif
#include <nova/core/debug.h>
#include <nova/render/render_driver.h>
#include <ranges>
using namespace Nova;
X11WindowDriver::X11WindowDriver() {
NOVA_AUTO_TRACE();
m_display = XOpenDisplay(nullptr);
if (!m_display) {
throw std::runtime_error("Failed to connect to X server");
}
m_window_close_atom = XInternAtom(m_display, "WM_DELETE_WINDOW", False);
}
X11WindowDriver::~X11WindowDriver() {
NOVA_AUTO_TRACE();
for (X11::Window window : std::views::keys(m_windows)) {
XDestroyWindow(m_display, window);
}
if (m_display) {
XCloseDisplay(m_display);
m_display = nullptr;
}
}
WindowAPI X11WindowDriver::get_api() const {
return WindowAPI::X11;
}
std::string X11WindowDriver::get_api_name() const {
return "X11";
}
void X11WindowDriver::poll_events() {
while (XPending(m_display)) {
XEvent event;
XNextEvent(m_display, &event);
auto iter = m_windows.find(event.xany.window);
if (iter == m_windows.end()) {
continue;
}
WindowID window = iter->second;
switch (event.type) {
case ConfigureNotify: {
XConfigureEvent xce = event.xconfigure;
if (xce.width != window->width || xce.height != window->height) {
window->width = xce.width;
window->height = xce.height;
NOVA_DEBUG("Window event: RESIZED ({}x{})", xce.width, xce.height);
}
break;
}
case ClientMessage: {
if (event.xclient.data.l[0] == static_cast<long>(m_window_close_atom)) {
NOVA_DEBUG("Window event: CLOSED");
destroy_window(window);
}
break;
}
case DestroyNotify:
case UnmapNotify:
case MapNotify:
case ReparentNotify:
// Ignore these events
break;
default:
NOVA_WARN("Unhandled X11 event: {}", event.type);
break;
}
}
}
void X11WindowDriver::beep() {
XBell(m_display, 100);
}
u32 X11WindowDriver::get_window_count() const {
return static_cast<u32>(m_windows.size());
}
WindowID X11WindowDriver::create_window(const std::string_view p_title, const u32 p_width, const u32 p_height) {
NOVA_AUTO_TRACE();
X11::Window handle = XCreateSimpleWindow(m_display, DefaultRootWindow(m_display), 0, 0, p_width, p_height, 0, 0, 0);
Window* window = new Window();
window->width = p_width;
window->height = p_height;
window->handle = handle;
XSetWMProtocols(m_display, handle, &m_window_close_atom, 1);
XSelectInput(m_display, handle, StructureNotifyMask);
XStoreName(m_display, handle, p_title.data());
XMapWindow(m_display, handle);
XFlush(m_display);
m_windows[handle] = window;
return window;
}
void X11WindowDriver::destroy_window(WindowID p_window) {
NOVA_AUTO_TRACE();
NOVA_ASSERT(p_window);
XDestroyWindow(m_display, p_window->handle);
m_windows.erase(p_window->handle);
}
void X11WindowDriver::set_window_title(WindowID p_window, const std::string_view p_title) {
NOVA_AUTO_TRACE();
NOVA_ASSERT(p_window);
XStoreName(m_display, p_window->handle, p_title.data());
}
void X11WindowDriver::set_window_size(WindowID p_window, const u32 p_width, const u32 p_height) {
NOVA_AUTO_TRACE();
NOVA_ASSERT(p_window);
XResizeWindow(m_display, p_window->handle, p_width, p_height);
}
void X11WindowDriver::set_window_position(WindowID p_window, const i32 p_x, const i32 p_y) {
NOVA_AUTO_TRACE();
NOVA_ASSERT(p_window);
XMoveWindow(m_display, p_window->handle, p_x, p_y);
}
const char* X11WindowDriver::get_surface_extension() const {
#ifdef NOVA_VULKAN
return VK_KHR_XLIB_SURFACE_EXTENSION_NAME;
#else
return nullptr;
#endif
}
SurfaceID X11WindowDriver::create_surface(WindowID p_window, RenderDriver* p_driver) {
NOVA_AUTO_TRACE();
NOVA_ASSERT(p_window);
NOVA_ASSERT(p_driver);
NOVA_ASSERT(p_driver->get_api() == RenderAPI::VULKAN);
#ifdef NOVA_VULKAN
VkXlibSurfaceCreateInfoKHR create {};
create.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
create.dpy = m_display;
create.window = p_window->handle;
const auto vkrd = static_cast<VulkanRenderDriver*>(p_driver);
Surface* surface = new Surface();
if (vkCreateXlibSurfaceKHR(vkrd->get_instance(), &create, vkrd->get_allocator(VK_OBJECT_TYPE_SURFACE_KHR), &surface->handle)
!= VK_SUCCESS) {
throw std::runtime_error("Failed to create Vulkan surface");
}
return surface;
#else
return nullptr;
#endif
}
#endif // NOVA_X11

View File

@@ -0,0 +1,58 @@
/**
* Copyright (c) 2025, Jayden Grubb <contact@jaydengrubb.com>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#pragma once
#ifdef NOVA_X11
#include <X11/Xlib.h>
#include <nova/platform/window_driver.h>
#include <unordered_map>
namespace X11 {
using Window = ::Window;
using Display = ::Display;
using Atom = ::Atom;
} // namespace X11
namespace Nova {
struct Window {
X11::Window handle = 0;
int width = 0;
int height = 0;
};
class X11WindowDriver final : public WindowDriver {
public:
X11WindowDriver();
~X11WindowDriver() override;
[[nodiscard]] WindowAPI get_api() const override;
[[nodiscard]] std::string get_api_name() const override;
void poll_events() override;
void beep() override;
[[nodiscard]] u32 get_window_count() const override;
[[nodiscard]] WindowID create_window(std::string_view title, u32 width, u32 height) override;
void destroy_window(WindowID window) override;
void set_window_title(WindowID window, std::string_view title) override;
void set_window_size(WindowID window, u32 width, u32 height) override;
void set_window_position(WindowID window, i32 x, i32 y) override;
[[nodiscard]] const char* get_surface_extension() const override;
[[nodiscard]] SurfaceID create_surface(WindowID window, RenderDriver* driver) override;
private:
X11::Display* m_display = nullptr;
X11::Atom m_window_close_atom = 0;
std::unordered_map<X11::Window, WindowID> m_windows;
};
} // namespace Nova
#endif // NOVA_X11