From 5ff43e240c749e27b4a179f559a5d8136f901f52 Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Sun, 23 Nov 2025 04:04:53 +0100 Subject: [PATCH] integer math --- examples/HelloDrawing/main.cpp | 2 +- examples/HelloInput/README.md | 4 +- examples/HelloInput/main.cpp | 10 +- examples/HelloUI/main.cpp | 32 +- examples/HelloWindow/README.md | 4 +- examples/HelloWindow/main.cpp | 2 +- .../Crafter.Graphics-UiElement.cpp | 30 +- .../Crafter.Graphics-UiElementBuffer.cpp | 54 -- ...Crafter.Graphics-UiElementBufferBuffer.cpp | 33 ++ ...ter.Graphics-UiElementBufferBufferBase.cpp | 85 ++++ ...er.Graphics-UiElementBufferMouseBuffer.cpp | 33 ++ .../Crafter.Graphics-WindowFramebuffer.cpp | 55 -- ...ter.Graphics-WindowFramebuffer_wayland.cpp | 107 ---- .../Crafter.Graphics-WindowTitle_wayland.cpp | 42 -- .../Crafter.Graphics-Window_wayland.cpp | 427 +++++++++++++++- interfaces/Crafter.Graphics-Types.cppm | 80 ++- interfaces/Crafter.Graphics-UiElement.cppm | 106 +++- .../Crafter.Graphics-UiElementBuffer.cppm | 51 -- .../Crafter.Graphics-UiElementMouse.cppm | 37 -- interfaces/Crafter.Graphics-Window.cppm | 475 +++++------------- interfaces/Crafter.Graphics-WindowBase.cppm | 72 --- .../Crafter.Graphics-WindowFramebuffer.cppm | 61 --- .../Crafter.Graphics-WindowKeyboard.cppm | 35 -- interfaces/Crafter.Graphics-WindowMouse.cppm | 46 -- interfaces/Crafter.Graphics-WindowTitle.cppm | 40 -- interfaces/Crafter.Graphics.cppm | 4 - project.json | 6 +- 27 files changed, 922 insertions(+), 1011 deletions(-) delete mode 100644 implementations/Crafter.Graphics-UiElementBuffer.cpp create mode 100644 implementations/Crafter.Graphics-UiElementBufferBuffer.cpp create mode 100644 implementations/Crafter.Graphics-UiElementBufferBufferBase.cpp create mode 100644 implementations/Crafter.Graphics-UiElementBufferMouseBuffer.cpp delete mode 100644 implementations/Crafter.Graphics-WindowFramebuffer.cpp delete mode 100644 implementations/Crafter.Graphics-WindowFramebuffer_wayland.cpp delete mode 100644 implementations/Crafter.Graphics-WindowTitle_wayland.cpp delete mode 100644 interfaces/Crafter.Graphics-UiElementBuffer.cppm delete mode 100644 interfaces/Crafter.Graphics-UiElementMouse.cppm delete mode 100644 interfaces/Crafter.Graphics-WindowBase.cppm delete mode 100644 interfaces/Crafter.Graphics-WindowFramebuffer.cppm delete mode 100644 interfaces/Crafter.Graphics-WindowKeyboard.cppm delete mode 100644 interfaces/Crafter.Graphics-WindowMouse.cppm delete mode 100644 interfaces/Crafter.Graphics-WindowTitle.cppm diff --git a/examples/HelloDrawing/main.cpp b/examples/HelloDrawing/main.cpp index 663bc88..857baf3 100644 --- a/examples/HelloDrawing/main.cpp +++ b/examples/HelloDrawing/main.cpp @@ -6,7 +6,7 @@ int main() { constexpr std::uint_fast32_t width = 1280; constexpr std::uint_fast32_t height = 720; - Window window(width, height); + WindowWayland window(width, height, "Hello Drawing!"); for(std::uint_fast32_t x = 0; x < width; x++) { for(std::uint_fast32_t y = 0; y < height; y++) { diff --git a/examples/HelloInput/README.md b/examples/HelloInput/README.md index d0d0a41..10594c3 100644 --- a/examples/HelloInput/README.md +++ b/examples/HelloInput/README.md @@ -24,8 +24,8 @@ Make sure that the window has focus. ## Highlighted Code Snippet ```cpp -EventListener clickListener(&window.onMouseLeftClick, [](MousePoint point){ - std::cout << std::format("Clicked on X:{} Y:{}!", point.x, point.y); +EventListener clickListener(&window.onMouseLeftClick, [&window](MousePoint point){ + std::cout << std::format("Clicked on X:{} Y:{}!", MappedToPixel(point.x, window.width), MappedToPixel(point.y, window.height)); }); EventListener keyAListener(&window.onKeyDown['a'], [](){ diff --git a/examples/HelloInput/main.cpp b/examples/HelloInput/main.cpp index 1635721..a4ad99e 100644 --- a/examples/HelloInput/main.cpp +++ b/examples/HelloInput/main.cpp @@ -4,15 +4,13 @@ import std; using namespace Crafter; int main() { - // Create a Wayland window named "HelloWindow" with resolution 1280x720 - // (window creation explained in HelloWindow example) - Window window("HelloWindow", 1280, 720); + WindowWayland window(1280, 720, "Hello Input!"); // Listen for left mouse click events on the window // The callback receives the MousePoint struct containing the click coordinates in float pixels from the top left corner - EventListener clickListener(&window.onMouseLeftClick, [](MousePoint point){ + EventListener clickListener(&window.onMouseLeftClick, [&window](MousePoint point){ // Print the coordinates where the user clicked - std::cout << std::format("Clicked on X:{} Y:{}!", point.x, point.y) << std::endl; + std::cout << std::format("Clicked on X:{} Y:{}!", MappedToPixel(point.x, window.width), MappedToPixel(point.y, window.height)) << std::endl; }); // Listen specifically for the 'a' key being pressed down @@ -29,6 +27,6 @@ int main() { std::cout << std::format("Pressed the {} key!", key) << std::endl; }); - // Start the window event loop, unless the window is started events will not trigger. + //Start the window event loop, unless the window is started events will not trigger. window.StartSync(); } diff --git a/examples/HelloUI/main.cpp b/examples/HelloUI/main.cpp index be87e72..d91a35d 100644 --- a/examples/HelloUI/main.cpp +++ b/examples/HelloUI/main.cpp @@ -4,27 +4,31 @@ import std; using namespace Crafter; int main() { - Window window(1280, 720); + WindowWayland window(1280, 720, "Hello Input!"); - UiElement& element = window.CreateElement( + UiElementBufferMouseBuffer* element = new UiElementBufferMouseBuffer( 2, //bufferWidth: the width of this elements pixel buffer 1, //bufferHeight: the height of this elements pixel buffer - 0.5, //anchorX: relative position where this elements x anchor (top-left) is placed to its parent x anchor - 0.5, //anchorY: relative position where this elements y anchor (top-left) is placed to its parent y anchor - 0.5f, //relativeSizeX: the relative x size this element should be scaled to compared to its parent - 0.5f, //relativeSizeY: the relative y size this element should be scaled to compared to its parent - 0.5, //anchorOffsetX: the amount this element's anchor should be offset from the top left corner (0.5 to in the middle) - 0.5, //anchorOffsetY: the amount this element's anchor should be offset from the top left corner (0.5 to place it in the middle) + FractionalToMapped(0.5), //anchorX: relative position where this elements x anchor (top-left) is placed to its parent x anchor + FractionalToMapped(0.5), //anchorY: relative position where this elements y anchor (top-left) is placed to its parent y anchor + FractionalToMapped(0.5), //relativeSizeX: the relative x size this element should be scaled to compared to its parent + FractionalToMapped(0.5), //relativeSizeY: the relative y size this element should be scaled to compared to its parent + FractionalToMapped(0.5), //anchorOffsetX: the amount this element's anchor should be offset from the top left corner (0.5 to in the middle) + FractionalToMapped(0.5), //anchorOffsetY: the amount this element's anchor should be offset from the top left corner (0.5 to place it in the middle) 0, //z: this elements Z position false //ignoreScaling: wether this element ignores the scaling of the window, if true its size will be scaled according to the window scale ); - // EventListener clickListener(&element.onMouseLeftClick, [](MousePoint point){ - // // Print the coordinates where the user clicked relative to the element's top left corner. - // std::cout << std::format("Clicked on X:{} Y:{}!", point.x, point.y) << std::endl; - // }); + window.elements.push_back(element); - element.buffer.buffer = {{255, 0, 0 ,255}, {0, 255, 0 ,255}}; - window.framebuffer.Render(); + element->UpdatePosition(window); + + EventListener clickListener(&element.onMouseLeftClick, [](MousePoint point){ + // Print the coordinates where the user clicked relative to the element's top left corner. + std::cout << std::format("Clicked on X:{} Y:{}!", point.x, point.y) << std::endl; + }); + + element->buffer = {{255, 0, 0 ,255}, {0, 255, 0 ,255}}; + window.Render(); window.StartSync(); } diff --git a/examples/HelloWindow/README.md b/examples/HelloWindow/README.md index 6582c22..6015798 100644 --- a/examples/HelloWindow/README.md +++ b/examples/HelloWindow/README.md @@ -11,9 +11,7 @@ A empty window with the title "HelloWindow" shows onscreen. ## Highlighted Code Snippet ```cpp -Window window; -window.framebuffer.Create(1280, 720); -window.title.Set("HelloWindow"); +WindowWayland window(1280, 720, "Hello Window!"); window.StartSync(); ``` diff --git a/examples/HelloWindow/main.cpp b/examples/HelloWindow/main.cpp index 1a1774c..eb754a7 100644 --- a/examples/HelloWindow/main.cpp +++ b/examples/HelloWindow/main.cpp @@ -3,6 +3,6 @@ import std; using namespace Crafter; int main() { - Window window(1280, 720, "HelloWindow"); + WindowWayland window(1280, 720, "Hello Window!"); window.StartSync(); } diff --git a/implementations/Crafter.Graphics-UiElement.cpp b/implementations/Crafter.Graphics-UiElement.cpp index 88484bc..5f65a57 100644 --- a/implementations/Crafter.Graphics-UiElement.cpp +++ b/implementations/Crafter.Graphics-UiElement.cpp @@ -20,10 +20,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module Crafter.Graphics:UiElement_impl; import :UiElement; +import :Window; +import :Types; import std; using namespace Crafter; -UiElementBase::UiElementBase(float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX, float anchorOffsetY, float z, bool ignoreScaling) : anchorX(anchorX), anchorY(anchorY), relativeWidth(relativeWidth), relativeHeight(relativeHeight), anchorOffsetX(anchorOffsetX), anchorOffsetY(anchorOffsetY), z(z), ignoreScaling(ignoreScaling) { +UiElement::UiElement(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : anchorX(anchorX), anchorY(anchorY), relativeWidth(relativeWidth), relativeHeight(relativeHeight), anchorOffsetX(anchorOffsetX), anchorOffsetY(anchorOffsetY), z(z), ignoreScaling(ignoreScaling) { -} \ No newline at end of file +} + +UiElementBuffer::UiElementBuffer(std::uint_fast32_t width, std::uint_fast32_t height) : width(width), height(height) { + +} + +// void UiElement::UpdatePosition(Window& window) { +// // scaled.width = relativeWidth; +// // scaled.height = relativeHeight; +// // scaled.x = anchorX - (anchorOffsetX * scaled.width); +// // scaled.y = anchorY - (anchorOffsetY * scaled.height); +// // for(UiElement* child : children) { +// // UpdatePosition(*child); +// // } +// } + +// void UiElement::UpdatePosition(UiElement& parent) { +// // scaled.width = parent.scaled.width / relativeWidth; +// // scaled.height = parent.scaled.height / relativeHeight; +// // scaled.x = (parent.scaled.width / anchorX) - (anchorOffsetX * scaled.width); +// // scaled.y = (parent.scaled.height / anchorY) - (anchorOffsetY * scaled.height); +// // for(UiElement* child : children) { +// // UpdatePosition(*child); +// // } +// } \ No newline at end of file diff --git a/implementations/Crafter.Graphics-UiElementBuffer.cpp b/implementations/Crafter.Graphics-UiElementBuffer.cpp deleted file mode 100644 index f0b4f77..0000000 --- a/implementations/Crafter.Graphics-UiElementBuffer.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -module Crafter.Graphics:UiElementBuffer_impl; -import :UiElementBuffer; -import :UiElement; -import :WindowFramebuffer; -import std; - -namespace Crafter { - UiElementBuffer::UiElementBuffer(UiElementBase& parent, std::uint_fast32_t width, std::uint_fast32_t height) : parent(parent), width(width), height(height) { - - } - - void UiElementBuffer::DrawNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const { - for (std::uint_fast32_t y = 0; y < dstHeight; y++) { - std::uint_fast32_t srcY = y * height / dstHeight; - for (std::uint_fast32_t x = 0; x < dstWidth; x++) { - std::uint_fast32_t srcX = x * width / dstWidth; - dst[y * dstWidth + x] = buffer[srcY * width + srcX]; - } - } - } - - ScaleData UiElementBuffer::ScaleElement(const UiElementBase& element, ScaleData own, WindowFramebuffer& window) const { - ScaleData data; - if(element.ignoreScaling) { - data.width = element.relativeWidth*own.width; - data.height = element.relativeHeight*own.height; - } else { - data.width = element.relativeWidth*own.width*window.scale; - data.height = element.relativeHeight*own.height*window.scale; - } - data.x = ((element.anchorX*own.width)-(element.anchorOffsetX*data.width))+own.x; - data.y = ((element.anchorY*own.height)-(element.anchorOffsetY*data.height))+own.y; - return data; - } -} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-UiElementBufferBuffer.cpp b/implementations/Crafter.Graphics-UiElementBufferBuffer.cpp new file mode 100644 index 0000000..3e9cdc3 --- /dev/null +++ b/implementations/Crafter.Graphics-UiElementBufferBuffer.cpp @@ -0,0 +1,33 @@ +/* +Crafter®.Graphics +Copyright (C) 2025 Catcrafts® +Catcrafts.net + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 3.0 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +module Crafter.Graphics:UiElementBufferBuffer_impl; +import :UiElement; +import std; + +using namespace Crafter; + +UiElementBufferBuffer::UiElementBufferBuffer(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : UiElement(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { + +} + +UiElementBufferBuffer::UiElementBufferBuffer(std::uint_fast32_t width, std::uint_fast32_t height, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : UiElement(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), UiElementBufferBufferBase(width, height){ + +} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-UiElementBufferBufferBase.cpp b/implementations/Crafter.Graphics-UiElementBufferBufferBase.cpp new file mode 100644 index 0000000..7cf2169 --- /dev/null +++ b/implementations/Crafter.Graphics-UiElementBufferBufferBase.cpp @@ -0,0 +1,85 @@ +/* +Crafter®.Graphics +Copyright (C) 2025 Catcrafts® +Catcrafts.net + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 3.0 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +module Crafter.Graphics:UiElementBufferBufferBase_impl; +import :UiElement; +import std; + +using namespace Crafter; + +UiElementBufferBufferBase::UiElementBufferBufferBase(std::uint_fast32_t width, std::uint_fast32_t height) : UiElementBuffer(width, height), buffer(width*height) { + +} +void UiElementBufferBufferBase::Create(std::uint_fast32_t width, std::uint_fast32_t height) { + buffer.resize(width*height); +} +void UiElementBufferBufferBase::Resize(std::uint_fast32_t width, std::uint_fast32_t height) { + buffer.resize(width*height); +} +void UiElementBufferBufferBase::Resize(std::uint_fast32_t width, std::uint_fast32_t height, std::uint_fast32_t offsetX, std::uint_fast32_t offsetY) { + +} +void UiElementBufferBufferBase::ResizeNearestNeighbour(std::uint_fast32_t width, std::uint_fast32_t height) { + +} +void UiElementBufferBufferBase::ResizeBicubic(std::uint_fast32_t width, std::uint_fast32_t height) { + +} +void UiElementBufferBufferBase::Destroy() { + buffer.clear(); + width = 0; + height = 0; +} + +void UiElementBufferBufferBase::Copy(Pixel_BU8_GU8_RU8_AU8* dst) const { + std::memcpy(dst, buffer.data(), width*height*sizeof(Pixel_BU8_GU8_RU8_AU8)); +} + +void UiElementBufferBufferBase::CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const { + for (std::uint_fast32_t y = 0; y < dstHeight; y++) { + std::uint_fast32_t srcY = y * height / dstHeight; + for (std::uint_fast32_t x = 0; x < dstWidth; x++) { + std::uint_fast32_t srcX = x * width / dstWidth; + dst[y * dstWidth + x] = buffer[srcY * width + srcX]; + } + } +} + +void UiElementBufferBufferBase::CopyBicubic(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const { + +} +void UiElementBufferBufferBase::Write(Pixel_BU8_GU8_RU8_AU8* pixels) { + std::memcpy(buffer.data(), pixels, width*height*sizeof(Pixel_BU8_GU8_RU8_AU8)); +} +void UiElementBufferBufferBase::Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel) { + buffer[y * width + x] = pixel; +} +Pixel_BU8_GU8_RU8_AU8 UiElementBufferBufferBase::Read(std::uint_fast32_t x, std::uint_fast32_t y) const { + return buffer[y * width + x]; +} +const Pixel_BU8_GU8_RU8_AU8* UiElementBufferBufferBase::Read() const { + return buffer.data(); +} +Pixel_BU8_GU8_RU8_AU8* UiElementBufferBufferBase::Get() { + return buffer.data(); +} +void UiElementBufferBufferBase::Store() { + +} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-UiElementBufferMouseBuffer.cpp b/implementations/Crafter.Graphics-UiElementBufferMouseBuffer.cpp new file mode 100644 index 0000000..4b75b0f --- /dev/null +++ b/implementations/Crafter.Graphics-UiElementBufferMouseBuffer.cpp @@ -0,0 +1,33 @@ +/* +Crafter®.Graphics +Copyright (C) 2025 Catcrafts® +Catcrafts.net + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 3.0 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +module Crafter.Graphics:UiElementBufferMouseBuffer_impl; +import :UiElement; +import std; + +using namespace Crafter; + +UiElementBufferMouseBuffer::UiElementBufferMouseBuffer(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : UiElementBufferBuffer(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { + +} + +UiElementBufferMouseBuffer::UiElementBufferMouseBuffer(std::uint_fast32_t width, std::uint_fast32_t height, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX, std::int_fast32_t anchorOffsetY, std::int_fast32_t z, bool ignoreScaling) : UiElementBufferBuffer(width, height, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling) { + +} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-WindowFramebuffer.cpp b/implementations/Crafter.Graphics-WindowFramebuffer.cpp deleted file mode 100644 index b70df04..0000000 --- a/implementations/Crafter.Graphics-WindowFramebuffer.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -module Crafter.Graphics:WindowFramebuffer_impl; -import :WindowFramebuffer; -import :Window; -import std; -import :Types; -import :UiElement; -import Crafter.Event; - -namespace Crafter { - WindowFramebuffer::WindowFramebuffer(WindowBase& window) : window(window) { - - } - - WindowFramebuffer::WindowFramebuffer(WindowBase& window, std::uint_fast32_t width, std::uint_fast32_t height) : window(window) { - Create(width, height); - } - - WindowFramebuffer::~WindowFramebuffer() { - Destroy(); - } - - ScaleData WindowFramebuffer::ScaleElement(const UiElementBase& element) { - ScaleData data; - if(element.ignoreScaling) { - data.width = element.relativeWidth*width; - data.height = element.relativeHeight*height; - } else { - data.width = element.relativeWidth*width*scale; - data.height = element.relativeHeight*height*scale; - } - data.x = ((element.anchorX*width)-(element.anchorOffsetX*data.width)); - data.y = ((element.anchorY*height)-(element.anchorOffsetY*data.height)); - return data; - } - -} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-WindowFramebuffer_wayland.cpp b/implementations/Crafter.Graphics-WindowFramebuffer_wayland.cpp deleted file mode 100644 index 70a88cb..0000000 --- a/implementations/Crafter.Graphics-WindowFramebuffer_wayland.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -module; - -#include -#include -#include -#include -#include - -module Crafter.Graphics:WindowFramebuffer_wayland_impl; -import :WindowFramebuffer; -import :Window; -import :UiElement; -import std; -import :Types; -import :Shm; -import Crafter.Event; - -namespace Crafter { - void WindowFramebuffer::Create(std::uint_fast32_t width, std::uint_fast32_t height) { - this->width = width; - this->height = height; - int stride = width * 4; - int size = stride * height; - - int fd = create_shm_file(size); - if (fd < 0) { - fprintf(stderr, "creating a buffer file for %d B failed: %m\n", size); - } - - framebuffer = reinterpret_cast(mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)); - if (framebuffer == MAP_FAILED) { - fprintf(stderr, "mmap failed: %m\n"); - close(fd); - } - - wl_shm_pool *pool = wl_shm_create_pool(window.shm, fd, size); - buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, WL_SHM_FORMAT_ARGB8888); - wl_shm_pool_destroy(pool); - close(fd); - - if (buffer == NULL) { - exit(EXIT_FAILURE); - } - - wl_surface_attach(window.surface, buffer, 0, 0); - wl_surface_commit(window.surface); - } - - void WindowFramebuffer::Resize(std::uint_fast32_t width, std::uint_fast32_t height) { - - } - - void WindowFramebuffer::Destroy() { - wl_buffer_destroy(buffer); - } - - void WindowFramebuffer::Render() { - std::vector drawOrder; - drawOrder.reserve(elements.size()); - for (const UiElementBuffer* e : elements) drawOrder.push_back(e); - std::sort(drawOrder.begin(), drawOrder.end(), [](const UiElementBuffer* a, const UiElementBuffer* b){ return a->parent.z < b->parent.z; }); - - for(const UiElementBuffer* element : drawOrder) { - ScaleData data = ScaleElement(element->parent); - std::vector scaled(data.width*data.height); - element->DrawNearestNeighbour(scaled.data(), data.width, data.height); - for (std::int32_t x = data.x; x - data.x < data.width; x++) { - for (std::int32_t y = data.y; y - data.y < data.height; y++) { - if (x >= 0 && x < width && y >= 0 && y < height) { - Pixel_BU8_GU8_RU8_AU8& dst = framebuffer[y * width + x]; - const Pixel_BU8_GU8_RU8_AU8& src = scaled[(y - data.y) * data.width + (x - data.x)]; - - float srcA = src.a / 255.0f; - float dstA = dst.a / 255.0f; - - float outA = srcA + dstA * (1.0f - srcA); - if (outA > 0.0f) { - dst.r = static_cast((src.r * srcA + dst.r * dstA * (1.0f - srcA)) / outA); - dst.g = static_cast((src.g * srcA + dst.g * dstA * (1.0f - srcA)) / outA); - dst.b = static_cast((src.b * srcA + dst.b * dstA * (1.0f - srcA)) / outA); - dst.a = static_cast(outA * 255); - } - } - } - } - //RenderElements(window, *element, data); - } - } -} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-WindowTitle_wayland.cpp b/implementations/Crafter.Graphics-WindowTitle_wayland.cpp deleted file mode 100644 index 4b22807..0000000 --- a/implementations/Crafter.Graphics-WindowTitle_wayland.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -module; - -#include -#include "../lib/xdg-shell-client-protocol.h" - -module Crafter.Graphics:WindowTitle_impl; -import :WindowTitle; -import :Window; -import std; -import :Types; -import :Shm; -import Crafter.Event; - -namespace Crafter { - WindowTitle::WindowTitle(WindowBase& window) : window(window) { - - } - WindowTitle::WindowTitle(WindowBase& window, const std::string_view title) : window(window) { - Set(title); - } - void WindowTitle::Set(const std::string_view title) { - xdg_toplevel_set_title(window.xdgToplevel, title.data()); - } -} \ No newline at end of file diff --git a/implementations/Crafter.Graphics-Window_wayland.cpp b/implementations/Crafter.Graphics-Window_wayland.cpp index cb0ff8f..743c691 100644 --- a/implementations/Crafter.Graphics-Window_wayland.cpp +++ b/implementations/Crafter.Graphics-Window_wayland.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA module; -#ifdef CRAFTER_GRAPHICS_WAYLAND #include #include #include @@ -37,30 +36,432 @@ module; #include #include #include -#endif -export module Crafter.Graphics:Window_impl; +module Crafter.Graphics:Window_wayland_impl; import :Window; +import :UiElement; import std; -import :WindowKeyboard; -import :WindowFramebuffer; import :Types; import :Shm; import Crafter.Event; using namespace Crafter; -void WindowBase::StartSync() { - while (open && wl_display_dispatch(display) != -1) { - std::cout << "bruh3" << std::endl; +WindowFramebuffer::WindowFramebuffer(std::uint_fast32_t width, std::uint_fast32_t height) : width(width), height(height) { + +} + +WindowWayland::WindowWayland(std::uint_fast32_t width, std::uint_fast32_t height) : WindowFramebuffer(width, height) { + display = wl_display_connect(NULL); + if (display == NULL) { + std::cerr << "failed to create display" << std::endl; + } + + wl_registry* registry = wl_display_get_registry(display); + wl_registry_add_listener(registry, ®istry_listener, this); + if (wl_display_roundtrip(display) == -1) { + exit(EXIT_FAILURE); + } + if (shm == NULL || compositor == NULL || xdgWmBase == NULL) { + std::cerr << "no wl_shm, wl_compositor or xdg_wm_base support" << std::endl; + exit(EXIT_FAILURE); + } + + surface = wl_compositor_create_surface(compositor); + xdgSurface = xdg_wm_base_get_xdg_surface(xdgWmBase, surface); + xdgToplevel = xdg_surface_get_toplevel(xdgSurface); + + xdg_surface_add_listener(xdgSurface, &xdg_surface_listener, this); + xdg_toplevel_add_listener(xdgToplevel, &xdg_toplevel_listener, this); + wl_surface_commit(surface); + + while (wl_display_dispatch(display) != -1 && !configured) {} + + wl_surface_commit(surface); + + zxdg_toplevel_decoration_v1* decoration = zxdg_decoration_manager_v1_get_toplevel_decoration(manager, xdgToplevel); + zxdg_toplevel_decoration_v1_set_mode(decoration, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + + // Create a wl_buffer, attach it to the surface and commit the surface + int stride = width * 4; + int size = stride * height; + + // Allocate a shared memory file with the right size + int fd = create_shm_file(size); + if (fd < 0) { + fprintf(stderr, "creating a buffer file for %d B failed: %m\n", size); + } + + // Map the shared memory file + framebuffer = reinterpret_cast(mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)); + if (framebuffer == MAP_FAILED) { + fprintf(stderr, "mmap failed: %m\n"); + close(fd); + } + + // Create a wl_buffer from our shared memory file descriptor + wl_shm_pool *pool = wl_shm_create_pool(shm, fd, size); + buffer = wl_shm_pool_create_buffer(pool, 0, width, height, stride, WL_SHM_FORMAT_ARGB8888); + wl_shm_pool_destroy(pool); + + // Now that we've mapped the file and created the wl_buffer, we no longer + // need to keep file descriptor opened + close(fd); + + if (buffer == NULL) { + exit(EXIT_FAILURE); + } + + wl_surface_attach(surface, buffer, 0, 0); + wl_surface_commit(surface); +} + +WindowWayland::WindowWayland(std::uint_fast32_t width, std::uint_fast32_t height, const std::string_view title) : WindowWayland(width, height) { + xdg_toplevel_set_title(xdgToplevel, title.data()); +} + +WindowWayland::~WindowWayland() { + xdg_toplevel_destroy(xdgToplevel); + xdg_surface_destroy(xdgSurface); + wl_surface_destroy(surface); + wl_buffer_destroy(buffer); +} + +void WindowWayland::StartSync() { + while (open && wl_display_dispatch(display) != -1) { + + } +} + + + +void RenderElement(UiElementBufferBuffer* element, ScaleData data , WindowWayland* window) { + std::vector scaled(data.width*data.height); + element->CopyNearestNeighbour(scaled.data(), data.width, data.height); + + for (std::int32_t x = data.x; x - data.x < data.width; x++) { + for (std::int32_t y = data.y; y - data.y < data.height; y++) { + if (x >= 0 && x < window->width && y >= 0 && y < window->height) { + Pixel_BU8_GU8_RU8_AU8& dst = window->framebuffer[y * window->width + x]; + const Pixel_BU8_GU8_RU8_AU8& src = scaled[(y - data.y) * data.width + (x - data.x)]; + + float srcA = src.a / 255.0f; + float dstA = dst.a / 255.0f; + + float outA = srcA + dstA * (1.0f - srcA); + if (outA > 0.0f) { + dst.r = static_cast((src.r * srcA + dst.r * dstA * (1.0f - srcA)) / outA); + dst.g = static_cast((src.g * srcA + dst.g * dstA * (1.0f - srcA)) / outA); + dst.b = static_cast((src.b * srcA + dst.b * dstA * (1.0f - srcA)) / outA); + dst.a = static_cast(outA * 255); + } + } + } + } + std::sort(element->children.begin(), element->children.end(), [](UiElement* a, UiElement* b){ return a->z < b->z; }); + for(UiElement* child : element->children) { + std::int32_t scaledWidth = MappedToPixel(element->relativeWidth, data.width); + std::int32_t scaledHeight = MappedToPixel(element->relativeHeight, data.height); + std::int32_t scaledX = MappedToPixel(element->anchorX, data.width) - MappedToPixel(element->anchorOffsetX, scaledWidth) - data.x; + std::int32_t scaledY = MappedToPixel(element->anchorY, data.height) - MappedToPixel(element->anchorOffsetY, scaledHeight) - data.y; + RenderElement(element, { + scaledX, + scaledY, + scaledWidth, + scaledHeight + }, window); + } +} + +void WindowWayland::Render() { + std::sort(elements.begin(), elements.end(), [](UiElementBufferBuffer* a, UiElementBufferBuffer* b){ return a->z < b->z; }); + + for(UiElementBufferBuffer* element : elements) { + std::int32_t scaledWidth = MappedToPixel(element->relativeWidth, width); + std::int32_t scaledHeight = MappedToPixel(element->relativeHeight, height); + std::int32_t scaledX = MappedToPixel(element->anchorX, width) - MappedToPixel(element->anchorOffsetX, scaledWidth); + std::int32_t scaledY = MappedToPixel(element->anchorY, height) - MappedToPixel(element->anchorOffsetY, scaledHeight); + RenderElement(element, { + scaledX, + scaledY, + scaledWidth, + scaledHeight + }, this); + } + + wl_surface_attach(surface, buffer, 0, 0); + wl_surface_damage(surface, 0, 0, width, height); + wl_surface_commit(surface); +} + +void WindowWayland::StartUpdate() { + cb = wl_surface_frame(surface); + wl_callback_add_listener(cb, &wl_callback_listener, this); + updating = true; +} + +void WindowWayland::StopUpdate() { + updating = false; +} + +void WindowWayland::SetTitle(const std::string_view title) { + xdg_toplevel_set_title(xdgToplevel, title.data()); +} + +void WindowWayland::Resize(std::uint_fast32_t width, std::uint_fast32_t height) { + +} + +void WindowWayland::Write(Pixel_BU8_GU8_RU8_AU8* pixels) { + std::memcpy(framebuffer, pixels, width*height*sizeof(Pixel_BU8_GU8_RU8_AU8)); +} + +void WindowWayland::Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel) { +framebuffer[y * width + x] = pixel; +} + +Pixel_BU8_GU8_RU8_AU8 WindowWayland::Read(std::uint_fast32_t x, std::uint_fast32_t y) const{ + return framebuffer[y * width + x]; +} + +const Pixel_BU8_GU8_RU8_AU8* WindowWayland::Read() const{ + return framebuffer; +} + +Pixel_BU8_GU8_RU8_AU8* WindowWayland::Get() { + return framebuffer; +} + +void WindowWayland::Store() { + +} + +void WindowWayland::xdg_wm_base_handle_ping(void* data, xdg_wm_base* xdg_wm_base, std::uint32_t serial) { + xdg_wm_base_pong(xdg_wm_base, serial); +} + +void WindowWayland::wl_surface_frame_done(void* data, struct wl_callback *cb, uint32_t time) +{ + wl_callback_destroy(cb); + WindowWayland* window = reinterpret_cast(data); + + if(window->updating) { + cb = wl_surface_frame(window->surface); + wl_callback_add_listener(cb, &WindowWayland::wl_callback_listener, window); + } + + window->Render(); +} + +void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::uint32_t serial, std::uint32_t time, std::uint32_t button, std::uint32_t state) { + WindowWayland* window = reinterpret_cast(data); + if (button == BTN_LEFT) { + if(state == WL_POINTER_BUTTON_STATE_PRESSED) { + window->mouseLeftHeld = true; + window->onMouseLeftClick.Invoke(window->currentMousePos); + for(UiElementMouse* element : window->mouseElements) { + if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { + element->onMouseLeftClick.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + } + } + } else { + window->mouseLeftHeld = false; + window->onMouseLeftRelease.Invoke(window->currentMousePos); + for(UiElementMouse* element : window->mouseElements) { + if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { + element->onMouseLeftRelease.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + } + } + } + } else if(button == BTN_RIGHT){ + if(state == WL_POINTER_BUTTON_STATE_PRESSED) { + window->mouseRightHeld = true; + window->onMouseRightClick.Invoke(window->currentMousePos); + for(UiElementMouse* element : window->mouseElements) { + if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { + element->onMouseRightClick.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + } + } + } else { + window->mouseRightHeld = true; + window->onMouseRightRelease.Invoke(window->currentMousePos); + for(UiElementMouse* element : window->mouseElements) { + if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { + element->onMouseRightRelease.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + } + } + } + } +} + +void WindowWayland::PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y) { + WindowWayland* window = reinterpret_cast(data); + MousePoint pos = {PixelToMapped(wl_fixed_to_double(surface_x), window->width), PixelToMapped(wl_fixed_to_double(surface_y), window->height)}; + window->lastMousePos = window->currentMousePos; + window->currentMousePos = pos; + window->mouseDelta = {window->currentMousePos.x-window->lastMousePos.x, window->currentMousePos.y-window->lastMousePos.y}; + window->onMouseMove.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); + for(UiElementMouse* element : window->mouseElements) { + if(window->currentMousePos.x >= element->clickArea.x && window->currentMousePos.x <= element->clickArea.x+element->clickArea.width && window->currentMousePos.y > element->clickArea.y && window->currentMousePos.y < element->clickArea.y+element->clickArea.height) { + element->onMouseMove.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + if(!(window->lastMousePos.x >= element->clickArea.x && window->lastMousePos.x <= element->clickArea.x+element->clickArea.width && window->lastMousePos.y > element->clickArea.y && window->lastMousePos.y < element->clickArea.y+element->clickArea.height)) { + element->onMouseEnter.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + } + } else if(window->lastMousePos.x >= element->clickArea.x && window->lastMousePos.x <= element->clickArea.x+element->clickArea.width && window->lastMousePos.y > element->clickArea.y && window->lastMousePos.y < element->clickArea.y+element->clickArea.height) { + element->onMouseLeave.Invoke({window->currentMousePos.x-element->clickArea.x, window->currentMousePos.y-element->clickArea.y}); + } + } +} + +void WindowWayland::PointerListenerHandleEnter(void* data, wl_pointer* wl_pointer, uint serial, wl_surface* surface, wl_fixed_t surface_x, wl_fixed_t surface_y) { + WindowWayland* window = reinterpret_cast(data); + window->onMouseEnter.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); +} + +void WindowWayland::PointerListenerHandleLeave(void* data, wl_pointer*, std::uint32_t, wl_surface*) { + WindowWayland* window = reinterpret_cast(data); + window->onMouseEnter.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); +} + +void WindowWayland::PointerListenerHandleAxis(void*, wl_pointer*, std::uint32_t, std::uint32_t, wl_fixed_t value) { + +} + + +void WindowWayland::keyboard_keymap(void *data, wl_keyboard *keyboard, uint32_t format, int fd, uint32_t size) { + WindowWayland* window = reinterpret_cast(data); + + if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { + close(fd); + fprintf(stderr, "Unsupported keymap format\n"); + return; + } + + void *map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); + if (map == MAP_FAILED) { + close(fd); + perror("mmap"); + return; + } + + window->xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + window->xkb_keymap = xkb_keymap_new_from_string(window->xkb_context, (const char *)map, XKB_KEYMAP_FORMAT_TEXT_V1,XKB_KEYMAP_COMPILE_NO_FLAGS); + munmap(map, size); + close(fd); + + window->xkb_state = xkb_state_new(window->xkb_keymap); +} + +void WindowWayland::keyboard_enter(void *data, wl_keyboard *keyboard, uint32_t serial, wl_surface *surface, wl_array *keys) { + +} + +void WindowWayland::keyboard_leave(void *data, wl_keyboard *keyboard, uint32_t serial, wl_surface *surface) { + +} + +void WindowWayland::keyboard_key(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { + WindowWayland* window = reinterpret_cast(data); + + if (!window->xkb_state) { + return; + } + + xkb_keycode_t keycode = key + 8; + xkb_keysym_t keysym = xkb_state_key_get_one_sym(window->xkb_state, keycode); + + char utf8[8] = {0}; + int len = xkb_keysym_to_utf8(keysym, utf8, sizeof(utf8)); + if (len != 0) { + char keypress = utf8[0]; + if(state == WL_KEYBOARD_KEY_STATE_PRESSED) { + if(window->heldkeys[keypress]) { + window->onKeyHold[keypress].Invoke(); + window->onAnyKeyHold.Invoke(keypress); + } else{ + window->heldkeys[keypress] = true; + window->onKeyDown[keypress].Invoke(); + window->onAnyKeyDown.Invoke(keypress); + } + } else{ + window->heldkeys[keypress] = false; + window->onKeyUp[keypress].Invoke(); + window->onAnyKeyUp.Invoke(keypress); + } + + } else { + // // fallback for keys like Return, Escape, etc. + // char name[64]; + // if (xkb_keysym_get_name(keysym, name, sizeof(name)) > 0) { + // printf("Key %s pressed (non-printable or multi-char)\n", name); + // } + } +} + +void WindowWayland::keyboard_modifiers(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group) { + +} + +void WindowWayland::keyboard_repeat_info(void *data, wl_keyboard *keyboard, int32_t rate, int32_t delay) { + +} + +void WindowWayland::seat_handle_capabilities(void* data, wl_seat* seat, uint32_t capabilities) { + WindowWayland* window = reinterpret_cast(data); + window->seat = seat; + if (capabilities & WL_SEAT_CAPABILITY_POINTER) { + wl_pointer* pointer = wl_seat_get_pointer(seat); + wl_pointer_add_listener(pointer, &pointer_listener, window); + } + if (capabilities & WL_SEAT_CAPABILITY_KEYBOARD) { + wl_keyboard* keyboard = wl_seat_get_keyboard(seat); + wl_keyboard_add_listener(keyboard, &keyboard_listener, window); } } -void WindowBase::StartUpdate(void* window) { - cb = wl_surface_frame(surface); - wl_callback_add_listener(cb, &surface_frame_listener, window); +void WindowWayland::handle_global(void *data, wl_registry *registry, std::uint32_t name, const char *interface, std::uint32_t version) { + WindowWayland* window = reinterpret_cast(data); + if (strcmp(interface, wl_shm_interface.name) == 0) { + window->shm = reinterpret_cast(wl_registry_bind(registry, name, &wl_shm_interface, 1)); + } else if (strcmp(interface, wl_seat_interface.name) == 0) { + wl_seat* seat = reinterpret_cast(wl_registry_bind(registry, name, &wl_seat_interface, 1)); + wl_seat_add_listener(seat, &seat_listener, window); + } else if (compositor == NULL && strcmp(interface, wl_compositor_interface.name) == 0) { + compositor = reinterpret_cast(wl_registry_bind(registry, name, &wl_compositor_interface, 1)); + } else if (strcmp(interface, xdg_wm_base_interface.name) == 0) { + window->xdgWmBase = reinterpret_cast(wl_registry_bind(registry, name, &xdg_wm_base_interface, 1)); + xdg_wm_base_add_listener(window->xdgWmBase, &xdgWmBaseListener, NULL); + } else if (strcmp(interface, zxdg_decoration_manager_v1_interface.name) == 0) { + window->manager = reinterpret_cast(wl_registry_bind(registry, name, &zxdg_decoration_manager_v1_interface, 1)); + } } -void WindowBase::StopUpdate() { - onUpdate.listeners.clear(); +void WindowWayland::handle_global_remove(void* data, wl_registry* registry, uint32_t name) { + + +} + +void WindowWayland::xdg_toplevel_configure(void*, xdg_toplevel*, std::int32_t, std::int32_t, wl_array*){ + +} + +void WindowWayland::xdg_toplevel_handle_close(void* data, xdg_toplevel*) { + WindowWayland* window = reinterpret_cast(data); + window->onClose.Invoke(); + window->open = false; +} + +void WindowWayland::xdg_surface_handle_configure(void* data, xdg_surface* xdg_surface, std::uint32_t serial) { + WindowWayland* window = reinterpret_cast(data); + // The compositor configures our surface, acknowledge the configure event + xdg_surface_ack_configure(xdg_surface, serial); + + if (window->configured) { + // If this isn't the first configure event we've received, we already + // have a buffer attached, so no need to do anything. Commit the + // surface to apply the configure acknowledgement. + wl_surface_commit(window->surface); + } + + window->configured = true; } \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-Types.cppm b/interfaces/Crafter.Graphics-Types.cppm index b2dd823..9a739af 100644 --- a/interfaces/Crafter.Graphics-Types.cppm +++ b/interfaces/Crafter.Graphics-Types.cppm @@ -23,8 +23,8 @@ import std; namespace Crafter { export struct MousePoint { - double x; - double y; + std::uint_fast32_t x; + std::uint_fast32_t y; }; export struct MouseMoveEvent { @@ -94,4 +94,80 @@ namespace Crafter { float b; float a; }; + + + + export constexpr std::int_fast32_t BOUND = 9; + export constexpr std::int_fast32_t SCALE = std::numeric_limits::max() / BOUND; + export constexpr double SCALEDOUBLE = static_cast(std::numeric_limits::max()) / BOUND; + + export constexpr std::int_fast32_t FractionalToMapped(double f) { + return std::int_fast32_t(f * SCALEDOUBLE); + } + + export constexpr std::int_fast32_t MappedToPixel(std::int_fast32_t mapped, std::int_fast32_t width) { + return mapped / (SCALE / width); + } + + export constexpr double MappedToFractional(std::int_fast32_t mapped) { + return static_cast(mapped) / SCALEDOUBLE; + } + + export constexpr std::int_fast32_t PixelToMapped(std::int_fast32_t pixel, std::int_fast32_t width) { + return pixel * (SCALE / width); + } + + // export constexpr double bound = 10; + + // export constexpr std::uint_fast32_t FractionalToMapped(double fractional) { + // constexpr double min_x = -bound; + // constexpr double max_x = bound + 1.0; + // constexpr double range_x = max_x - min_x; + + // constexpr double MAXD = static_cast( + // std::numeric_limits::max() + // ); + + // // Normalize to [0,1] + // double t = (fractional - min_x) / range_x; + + // // Clamp (important for constexpr safety and edge behavior) + // if (t < 0.0) t = 0.0; + // if (t > 1.0) t = 1.0; + + // return static_cast(t * MAXD); + // } + + // export constexpr double MappedToFractional(std::uint_fast32_t mapped) { + // constexpr double min_x = -bound; + // constexpr double max_x = bound + 1.0; + // constexpr double range_x = max_x - min_x; + + // constexpr double MAXD = static_cast( + // std::numeric_limits::max() + // ); + + // double t = static_cast(mapped) / MAXD; + + // return min_x + t * range_x; + // } + + // export constexpr std::int_fast32_t MappedToPixel(std::uint_fast32_t mapped, std::uint_fast32_t size) { + // constexpr double MAXD = static_cast( + // std::numeric_limits::max() + // ); + + // // scale mapped ∈ [0, MAX] to pixel ∈ [0, size] + // double t = static_cast(mapped) / MAXD; + + // // Clamp (shouldn't be necessary, but protects constexpr eval) + // if (t < 0.0) t = 0.0; + // if (t > 1.0) t = 1.0; + + // return static_cast(t * static_cast(size)); + // } + + export constexpr std::uint_fast32_t PixelToMapped(double pixel, std::uint_fast32_t size) { + return static_cast((pixel / size) * static_cast((std::numeric_limits::max() / 10))); + } } diff --git a/interfaces/Crafter.Graphics-UiElement.cppm b/interfaces/Crafter.Graphics-UiElement.cppm index d854668..40da4f7 100644 --- a/interfaces/Crafter.Graphics-UiElement.cppm +++ b/interfaces/Crafter.Graphics-UiElement.cppm @@ -18,38 +18,100 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ export module Crafter.Graphics:UiElement; -import :UiElementBuffer; -import :UiElementMouse; import std; import Crafter.Event; import :Types; export namespace Crafter { - class Font; - class UiElementBase { + class Window; + class UiElement { public: - float z; - float anchorX; - float anchorY; + std::int_fast32_t z; + std::int_fast32_t anchorX; + std::int_fast32_t anchorY; + std::int_fast32_t anchorOffsetX; + std::int_fast32_t anchorOffsetY; + std::uint_fast32_t relativeWidth; + std::uint_fast32_t relativeHeight; bool ignoreScaling; - float relativeWidth; - float relativeHeight; - float anchorOffsetX; - float anchorOffsetY; - std::vector> children; + std::vector children; + ScaleData scaled; - UiElementBase(float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX = 0.5, float anchorOffsetY = 0.5, float z = 0, bool ignoreScaling = false); - UiElementBase(UiElementBase&&) noexcept = default; - UiElementBase& operator=(UiElementBase&&) noexcept = default; + UiElement(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); + UiElement(UiElement&) = delete; + UiElement& operator=(UiElement&) = delete; + // void UpdatePosition(Window& window); + // void UpdatePosition(UiElement& parent); }; - template - class UiElement : public UiElementBase{ + class UiElementMouse { public: - std::conditional_t buffer; - std::conditional_t mouse; - UiElement(float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX = 0.5, float anchorOffsetY = 0.5, float z = 0, bool ignoreScaling = false) : UiElementBase(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling = false) {} - UiElement(float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX = 0.5, float anchorOffsetY = 0.5, float z = 0, bool ignoreScaling = false) requires (Buffer) : UiElementBase(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), buffer(*this) {} - UiElement(std::uint_fast32_t width, std::uint_fast32_t height, float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX = 0.5, float anchorOffsetY = 0.5, float z = 0, bool ignoreScaling = false) requires (Buffer) : UiElementBase(anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling), buffer(*this, width, height) {} + ScaleData clickArea; + Event onMouseMove; + Event onMouseEnter; + Event onMouseLeave; + Event onMouseRightClick; + Event onMouseLeftClick; + Event onMouseRightHold; + Event onMouseLeftHold; + Event onMouseRightRelease; + Event onMouseLeftRelease; + }; + + class UiElementBuffer { + public: + std::uint_fast32_t width; + std::uint_fast32_t height; + UiElementBuffer() = default; + UiElementBuffer(std::uint_fast32_t width, std::uint_fast32_t height); + virtual void Create(std::uint_fast32_t width, std::uint_fast32_t height) = 0; + virtual void Resize(std::uint_fast32_t width, std::uint_fast32_t height) = 0; + virtual void Resize(std::uint_fast32_t width, std::uint_fast32_t height, std::uint_fast32_t offsetX, std::uint_fast32_t offsetY) = 0; + virtual void ResizeNearestNeighbour(std::uint_fast32_t width, std::uint_fast32_t height) = 0; + virtual void ResizeBicubic(std::uint_fast32_t width, std::uint_fast32_t height) = 0; + virtual void Destroy() = 0; + virtual void Copy(Pixel_BU8_GU8_RU8_AU8* dst) const = 0; + virtual void CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const = 0; + virtual void CopyBicubic(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const = 0; + virtual void Write(Pixel_BU8_GU8_RU8_AU8* pixels) = 0; + virtual void Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel) = 0; + virtual Pixel_BU8_GU8_RU8_AU8 Read(std::uint_fast32_t x, std::uint_fast32_t y) const = 0; + virtual const Pixel_BU8_GU8_RU8_AU8* Read() const = 0; + virtual Pixel_BU8_GU8_RU8_AU8* Get() = 0; + virtual void Store() = 0; + }; + + class UiElementBufferBufferBase : public UiElementBuffer { + public: + std::vector buffer; + UiElementBufferBufferBase() = default; + UiElementBufferBufferBase(std::uint_fast32_t width, std::uint_fast32_t height); + void Create(std::uint_fast32_t width, std::uint_fast32_t height) override; + void Resize(std::uint_fast32_t width, std::uint_fast32_t height) override; + void Resize(std::uint_fast32_t width, std::uint_fast32_t height, std::uint_fast32_t offsetX, std::uint_fast32_t offsetY) override; + void ResizeNearestNeighbour(std::uint_fast32_t width, std::uint_fast32_t height) override; + void ResizeBicubic(std::uint_fast32_t width, std::uint_fast32_t height) override; + void Destroy() override; + void Copy(Pixel_BU8_GU8_RU8_AU8* dst) const override; + void CopyNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const override; + void CopyBicubic(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const override; + void Write(Pixel_BU8_GU8_RU8_AU8* pixels) override; + void Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel) override; + Pixel_BU8_GU8_RU8_AU8 Read(std::uint_fast32_t x, std::uint_fast32_t y) const override; + const Pixel_BU8_GU8_RU8_AU8* Read() const override; + Pixel_BU8_GU8_RU8_AU8* Get() override; + void Store() override; + }; + + class UiElementBufferBuffer : public UiElement, public UiElementBufferBufferBase { + public: + UiElementBufferBuffer(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); + UiElementBufferBuffer(std::uint_fast32_t width, std::uint_fast32_t height, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); + }; + + class UiElementBufferMouseBuffer : public UiElementBufferBuffer, public UiElementMouse { + public: + UiElementBufferMouseBuffer(std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); + UiElementBufferMouseBuffer(std::uint_fast32_t width, std::uint_fast32_t height, std::int_fast32_t anchorX, std::int_fast32_t anchorY, std::uint_fast32_t relativeWidth, std::uint_fast32_t relativeHeight, std::int_fast32_t anchorOffsetX = FractionalToMapped(0.5), std::int_fast32_t anchorOffsetY = FractionalToMapped(0.5), std::int_fast32_t z = 0, bool ignoreScaling = false); }; } \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-UiElementBuffer.cppm b/interfaces/Crafter.Graphics-UiElementBuffer.cppm deleted file mode 100644 index 356e2a7..0000000 --- a/interfaces/Crafter.Graphics-UiElementBuffer.cppm +++ /dev/null @@ -1,51 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -export module Crafter.Graphics:UiElementBuffer; -import std; -import :Types; - -export namespace Crafter { - class UiElementBase; - class WindowFramebuffer; - class UiElementBuffer { - public: - UiElementBase& parent; - std::uint_fast32_t width; - std::uint_fast32_t height; - std::vector buffer; - UiElementBuffer(UiElementBase& parent); - UiElementBuffer(UiElementBase& parent, std::uint_fast32_t width, std::uint_fast32_t height); - - void DrawNearestNeighbour(Pixel_BU8_GU8_RU8_AU8* dst, std::uint_fast32_t dstWidth, std::uint_fast32_t dstHeight) const; - ScaleData ScaleElement(const UiElementBase& element, ScaleData own, WindowFramebuffer& window) const; - - void Create(std::uint_fast32_t width, std::uint_fast32_t height); - void Destroy(); - - void Write(Pixel_BU8_GU8_RU8_AU8* pixels); - void Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel); - - Pixel_BU8_GU8_RU8_AU8 Read(std::uint_fast32_t x, std::uint_fast32_t y); - Pixel_BU8_GU8_RU8_AU8* Read(); - - Pixel_BU8_GU8_RU8_AU8* Get(); - void Store(); - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-UiElementMouse.cppm b/interfaces/Crafter.Graphics-UiElementMouse.cppm deleted file mode 100644 index 9dce4d1..0000000 --- a/interfaces/Crafter.Graphics-UiElementMouse.cppm +++ /dev/null @@ -1,37 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -export module Crafter.Graphics:UiElementMouse; -import std; -import :Types; -import Crafter.Event; - -export namespace Crafter { - class UiElementMouse { - public: - Event onMouseMove; - Event onMouseEnter; - Event onMouseLeave; - Event onMouseRightClick; - Event onMouseLeftClick; - Event onMouseRightHold; - Event onMouseLeftHold; - Event onMouseRightRelease; - Event onMouseLeftRelease; - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-Window.cppm b/interfaces/Crafter.Graphics-Window.cppm index ca85c22..1a97d9d 100644 --- a/interfaces/Crafter.Graphics-Window.cppm +++ b/interfaces/Crafter.Graphics-Window.cppm @@ -16,7 +16,6 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - module; #ifdef CRAFTER_GRAPHICS_WAYLAND @@ -41,207 +40,139 @@ module; export module Crafter.Graphics:Window; import std; -import :WindowBase; -import :WindowKeyboard; -import :WindowMouse; -import :WindowTitle; -import :WindowFramebuffer; +import :Types; +import Crafter.Event; export namespace Crafter { - template - class Window : public WindowBase { + class UiElement; + class Window { public: - std::conditional_t framebuffer; - std::conditional_t title; - std::conditional_t keyboard; - std::conditional_t mouse; - Window() requires (Framebuffer && !Title && !Keyboard && !Mouse) : framebuffer(*this) {} - Window(std::uint_fast32_t width, std::uint_fast32_t height) requires (Framebuffer && !Title && !Keyboard && !Mouse) : framebuffer(*this, width, height) {} + Event onClose; + Event> onUpdate; + bool open = true; + bool updating = false; + Window() = default; + Window(Window&) = delete; + Window(Window&&) = delete; + virtual ~Window() = default; + Window& operator=(const Window&) = delete; + virtual void StartSync() = 0; + virtual void StartUpdate() = 0; + virtual void StopUpdate() = 0; + ScaleData ScaleElement(const UiElement& element); + }; - Window() requires (!Framebuffer &&!Title && !Keyboard && !Mouse) : title(*this) {} - Window(const std::string_view title) requires (!Framebuffer &&!Title && !Keyboard && !Mouse) : title(*this, title) {} + class WindowKeyboard { + public: + bool heldkeys[255] = {}; + Event onKeyDown[255]; + Event onKeyHold[255]; + Event onKeyUp[255]; + Event onAnyKeyDown; + Event onAnyKeyHold; + Event onAnyKeyUp; + }; - Window(std::uint_fast32_t width, std::uint_fast32_t height, const std::string_view title) requires (Framebuffer && Title && !Keyboard && !Mouse) : framebuffer(*this, width, height), title(*this, title) {} - - ~Window() { - std::cout << "destr" << std::endl; - #ifdef CRAFTER_GRAPHICS_WAYLAND - xdg_toplevel_destroy(xdgToplevel); - xdg_surface_destroy(xdgSurface); - wl_surface_destroy(surface); - #endif - } + class UiElementMouse; + class WindowMouse { + public: + Event onMouseRightClick; + Event onMouseLeftClick; + Event onMouseRightHold; + Event onMouseLeftHold; + Event onMouseRightRelease; + Event onMouseLeftRelease; + Event onMouseMove; + Event onMouseEnter; + Event onMouseLeave; + Event onMouseScroll; + MousePoint currentMousePos; + MousePoint lastMousePos; + MousePoint mouseDelta; + bool mouseLeftHeld = false; + bool mouseRightHeld = false; + std::vector mouseElements; + }; - // template - // UiElement& AddElement(float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX = 0.5, float anchorOffsetY = 0.5, float z = 0, bool ignoreScaling = false) requires(Buffer == true) { + class WindowTitle { + public: + virtual void SetTitle(const std::string_view title) = 0; + }; - // } - template - UiElement& CreateElement(std::uint_fast32_t width, std::uint_fast32_t height, float anchorX, float anchorY, float relativeWidth, float relativeHeight, float anchorOffsetX = 0.5, float anchorOffsetY = 0.5, float z = 0, bool ignoreScaling = false) requires(UiBuffer && Framebuffer) { - std::unique_ptr> element = std::make_unique>(width, height, anchorX, anchorY, relativeWidth, relativeHeight, anchorOffsetX, anchorOffsetY, z, ignoreScaling); - UiElement* ptr = element.get(); - framebuffer.elements.push_back(&element->buffer); - if constexpr(UiMouse) { - mouse.elements.push_back(&element->mouse); - } - elements.emplace_back(std::move(element)); - return *ptr; - } - template - void RemoveElement(UiElement& element) { - if constexpr(UiBuffer) { - framebuffer.elements.erase(std::find(framebuffer.elements.begin(), framebuffer.elements.end(), &element.buffer)); - } - for(std::uint_fast32_t i = 0; i < elements.size(); i++) { - if(elements[i].get() == &element) { - elements.erase(elements.begin() + i); - break; - } - } - } + class WindowFramebuffer { + public: + std::uint_fast32_t width; + std::uint_fast32_t height; + WindowFramebuffer() = default; + WindowFramebuffer(std::uint_fast32_t width, std::uint_fast32_t height); + virtual void Resize(std::uint_fast32_t width, std::uint_fast32_t height) = 0; + virtual void Write(Pixel_BU8_GU8_RU8_AU8* pixels) = 0; + virtual void Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel) = 0; + virtual Pixel_BU8_GU8_RU8_AU8 Read(std::uint_fast32_t x, std::uint_fast32_t y) const = 0; + virtual const Pixel_BU8_GU8_RU8_AU8* Read() const = 0; + virtual Pixel_BU8_GU8_RU8_AU8* Get() = 0; + virtual void Store() = 0; + virtual void Render() = 0; + ScaleData ScaleElementAbsolute(const UiElement& element); + }; - private: - #ifdef CRAFTER_GRAPHICS_WAYLAND - void InitWayland() { - std::cout << "bruh" << std::endl; - display = wl_display_connect(NULL); - if (display == NULL) { - std::cerr << "failed to create display" << std::endl; - } - - wl_registry* registry = wl_display_get_registry(display); - wl_registry_add_listener(registry, ®istry_listener, this); - if (wl_display_roundtrip(display) == -1) { - exit(EXIT_FAILURE); - } - if (shm == NULL || compositor == NULL || xdgWmBase == NULL) { - std::cerr << "no wl_shm, wl_compositor or xdg_wm_base support" << std::endl; - exit(EXIT_FAILURE); - } - - surface = wl_compositor_create_surface(compositor); - xdgSurface = xdg_wm_base_get_xdg_surface(xdgWmBase, surface); - xdgToplevel = xdg_surface_get_toplevel(xdgSurface); - cb = wl_surface_frame(surface); - - //wl_callback_add_listener(cb, &surface_frame_listener, this); - xdg_surface_add_listener(xdgSurface, &xdg_surface_listener, this); - xdg_toplevel_add_listener(xdgToplevel, &xdg_toplevel_listener, this); - wl_surface_commit(surface); - - while (wl_display_dispatch(display) != -1 && !configured) {} - - wl_surface_commit(surface); - - zxdg_toplevel_decoration_v1* decoration = zxdg_decoration_manager_v1_get_toplevel_decoration(manager, xdgToplevel); - zxdg_toplevel_decoration_v1_set_mode(decoration, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); - - wl_surface_commit(surface); - std::cout << "bruh" << std::endl; - open = true; - } - - static void wl_surface_frame_done(void* data, struct wl_callback *cb, uint32_t time) { - wl_callback_destroy(cb); - Window* window = reinterpret_cast*>(data); - if(window->onUpdate.listeners.size() > 0) { - cb = wl_surface_frame(window->surface); - wl_callback_add_listener(cb, &WindowBase::surface_frame_listener, window); - } - } - constexpr static wl_callback_listener surface_frame_listener = { - .done = wl_surface_frame_done, - }; - - static void xdg_wm_base_handle_ping(void* data, xdg_wm_base* xdg_wm_base, std::uint32_t serial) { - xdg_wm_base_pong(xdg_wm_base, serial); - } + #ifdef CRAFTER_GRAPHICS_WAYLAND + class UiElementBufferBuffer; + class WindowWayland final: public Window, public WindowKeyboard, public WindowMouse, public WindowFramebuffer, public WindowTitle { + public: + Pixel_BU8_GU8_RU8_AU8* framebuffer = nullptr; + std::vector elements; + WindowWayland(std::uint_fast32_t width, std::uint_fast32_t height); + WindowWayland(std::uint_fast32_t width, std::uint_fast32_t height, const std::string_view title); + ~WindowWayland(); + bool configured = false; + wl_shm* shm = nullptr; + wl_seat* seat = nullptr; + xdg_toplevel* xdgToplevel = nullptr; + xdg_wm_base* xdgWmBase = nullptr; + zxdg_decoration_manager_v1* manager = nullptr; + wl_surface* surface = nullptr; + wl_buffer* buffer = nullptr; + wl_buffer* backBuffer = nullptr; + xdg_surface* xdgSurface = nullptr; + wl_display* display = nullptr; + wl_callback* cb = nullptr; + xkb_keymap* xkb_keymap; + xkb_context* xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + xkb_state* xkb_state; + void Render() override; + void StartSync() override; + void StartUpdate() override; + void StopUpdate() override; + void SetTitle(const std::string_view title) override; + void Resize(std::uint_fast32_t width, std::uint_fast32_t height) override; + void Write(Pixel_BU8_GU8_RU8_AU8* pixels) override; + void Write(std::uint_fast32_t x, std::uint_fast32_t y, Pixel_BU8_GU8_RU8_AU8 pixel) override; + Pixel_BU8_GU8_RU8_AU8 Read(std::uint_fast32_t x, std::uint_fast32_t y) const override; + const Pixel_BU8_GU8_RU8_AU8* Read() const override; + Pixel_BU8_GU8_RU8_AU8* Get() override; + void Store() override; + inline static wl_compositor* compositor = nullptr; + static void wl_surface_frame_done(void *data, wl_callback *cb, uint32_t time); + static void PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y); + static void PointerListenerHandleAxis(void*, wl_pointer*, std::uint32_t, std::uint32_t, wl_fixed_t value); + static void PointerListenerHandleEnter(void* data, wl_pointer* wl_pointer, uint serial, wl_surface* surface, wl_fixed_t surface_x, wl_fixed_t surface_y); + static void PointerListenerHandleLeave(void*, wl_pointer*, std::uint32_t, wl_surface*); + static void xdg_toplevel_handle_close(void* data, xdg_toplevel*); + static void handle_global(void* data, wl_registry* registry, std::uint32_t name, const char* interface, std::uint32_t version); + static void pointer_handle_button(void* data, wl_pointer* pointer, std::uint32_t serial, std::uint32_t time, std::uint32_t button, std::uint32_t state); + static void seat_handle_capabilities(void* data, wl_seat* seat, uint32_t capabilities); + static void xdg_surface_handle_configure(void* data, xdg_surface* xdg_surface, std::uint32_t serial); + static void xdg_wm_base_handle_ping(void* data, xdg_wm_base* xdg_wm_base, std::uint32_t serial); + static void keyboard_keymap(void* data, wl_keyboard* keyboard, uint32_t format, int fd, uint32_t size); + static void keyboard_enter(void *data, wl_keyboard *keyboard, uint32_t serial, wl_surface *surface, wl_array *keys); + static void keyboard_leave(void *data, wl_keyboard *keyboard, uint32_t serial, wl_surface *surface); + static void keyboard_key(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state); + static void keyboard_modifiers(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group); + static void keyboard_repeat_info(void *data, wl_keyboard *keyboard, int32_t rate, int32_t delay); + static void handle_global_remove(void* data, wl_registry* registry, uint32_t name); + static void xdg_toplevel_configure(void*, xdg_toplevel*, std::int32_t, std::int32_t, wl_array*); - constexpr static xdg_wm_base_listener xdgWmBaseListener = { - .ping = xdg_wm_base_handle_ping, - }; - - static void pointer_handle_button(void* data, wl_pointer* pointer, std::uint32_t serial, std::uint32_t time, std::uint32_t button, std::uint32_t state) { - Window* window = reinterpret_cast<*>(data); - if (button == BTN_LEFT) { - if(state == WL_POINTER_BUTTON_STATE_PRESSED) { - window->mouseLeftHeld = true; - window->mouse.onMouseLeftClick.Invoke(window->mouse.currentMousePos); - if constexpr (Framebuffer) { - for(UiElementMouse& element : window->mouse.elements) { - ScaleData data = window->framebuffer.ScaleElement(element); - if(window->mouse.currentMousePos.x >= data.x && window->mouse.currentMousePos.x <= data.x+data.width && window->mouse.currentMousePos.y > data.y && window->mouse.currentMousePos.y < data.y+data.height) { - element.onMouseLeftClick.Invoke({window->mouse.currentMousePos.x-data.x, window->mouse.currentMousePos.y-data.y}); - } - } - } - } else { - window->mouse.mouseLeftHeld = false; - window->mouse.onMouseLeftRelease.Invoke(window->mouse.currentMousePos); - for(UiElement& element : window->mouse.elements) { - ScaleData data = window->mouse.ScaleElement(element); - if(window->mouse.currentMousePos.x >= data.x && window->mouse.currentMousePos.x <= data.x+data.width && window->mouse.currentMousePos.y > data.y && window->mouse.currentMousePos.y < data.y+data.height) { - element.onMouseLeftRelease.Invoke({window->mouse.currentMousePos.x-data.x, window->mouse.currentMousePos.y-data.y}); - } - } - } - } else if(button == BTN_RIGHT){ - if(state == WL_POINTER_BUTTON_STATE_PRESSED) { - window->mouse.mouseRightHeld = true; - window->mouse.onMouseRightClick.Invoke(window->mouse.currentMousePos); - for(UiElement& element : window->mouse.elements) { - ScaleData data = window->mouse.ScaleElement(element); - if(window->mouse.currentMousePos.x >= data.x && window->mouse.currentMousePos.x <= data.x+data.width && window->mouse.currentMousePos.y > data.y && window->mouse.currentMousePos.y < data.y+data.height) { - element.onMouseRightClick.Invoke({window->mouse.currentMousePos.x-data.x, window->mouse.currentMousePos.y-data.y}); - } - } - } else { - window->mouse.mouseRightHeld = true; - window->mouse.onMouseRightRelease.Invoke(window->mouse.currentMousePos); - for(UiElement& element : window->mouse.elements) { - ScaleData data = window->mouse.ScaleElement(element); - if(window->mouse.currentMousePos.x >= data.x && window->mouse.currentMousePos.x <= data.x+data.width && window->mouse.currentMousePos.y > data.y && window->mouse.currentMousePos.y < data.y+data.height) { - element.onMouseRightRelease.Invoke({window->mouse.currentMousePos.x-data.x, window->mouse.currentMousePos.y-data.y}); - } - } - } - } - } - - static void PointerListenerHandleMotion(void* data, wl_pointer* wl_pointer, uint time, wl_fixed_t surface_x, wl_fixed_t surface_y) { - * window = reinterpret_cast<*>(data); - MousePoint pos = {wl_fixed_to_double(surface_x), wl_fixed_to_double(surface_y)}; - window->mouse.lastMousePos = window->currentMousePos; - window->currentMousePos = pos; - window->mouseDelta = {window->currentMousePos.x-window->lastMousePos.x, window->currentMousePos.y-window->lastMousePos.y}; - window->onMouseMove.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); - for(UiElement& element : window->elements) { - ScaleData data = window->ScaleElement(element); - if(window->currentMousePos.x >= data.x && window->currentMousePos.x <= data.x+data.width && window->currentMousePos.y > data.y && window->currentMousePos.y < data.y+data.height) { - element.onMouseMove.Invoke({window->currentMousePos.x-data.x, window->currentMousePos.y-data.y}); - if(!(window->lastMousePos.x >= data.x && window->lastMousePos.x <= data.x+data.width && window->lastMousePos.y > data.y && window->lastMousePos.y < data.y+data.height)) { - element.onMouseEnter.Invoke({window->currentMousePos.x-data.x, window->currentMousePos.y-data.y}); - } - } else if(window->lastMousePos.x >= data.x && window->lastMousePos.x <= data.x+data.width && window->lastMousePos.y > data.y && window->lastMousePos.y < data.y+data.height) { - element.onMouseLeave.Invoke({window->currentMousePos.x-data.x, window->currentMousePos.y-data.y}); - } - } - } - - static void PointerListenerHandleEnter(void* data, wl_pointer* wl_pointer, uint serial, wl_surface* surface, wl_fixed_t surface_x, wl_fixed_t surface_y) { - * window = reinterpret_cast<*>(data); - window->onMouseEnter.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); - } - - static void PointerListenerHandleLeave(void* data, wl_pointer*, std::uint32_t, wl_surface*) { - * window = reinterpret_cast<*>(data); - window->onMouseEnter.Invoke({window->lastMousePos, window->currentMousePos, window->mouseDelta}); - } - - static void PointerListenerHandleAxis(void*, wl_pointer*, std::uint32_t, std::uint32_t, wl_fixed_t value) { - - } - constexpr static wl_pointer_listener pointer_listener = { .enter = PointerListenerHandleEnter, .leave = PointerListenerHandleLeave, @@ -249,88 +180,6 @@ export namespace Crafter { .button = pointer_handle_button, .axis = PointerListenerHandleAxis, }; - - xkb_keymap* xkb_keymap; - xkb_context* xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); - xkb_state* xkb_state; - - - static void keyboard_keymap(void *data, wl_keyboard *keyboard, uint32_t format, int fd, uint32_t size) { - if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { - close(fd); - fprintf(stderr, "Unsupported keymap format\n"); - return; - } - - void *map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); - if (map == MAP_FAILED) { - close(fd); - perror("mmap"); - return; - } - - xkb_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); - xkb_keymap = xkb_keymap_new_from_string(xkb_context, (const char *)map, XKB_KEYMAP_FORMAT_TEXT_V1,XKB_KEYMAP_COMPILE_NO_FLAGS); - munmap(map, size); - close(fd); - - xkb_state = xkb_state_new(xkb_keymap); - } - - static void keyboard_enter(void *data, wl_keyboard *keyboard, uint32_t serial, wl_surface *surface, wl_array *keys) { - - } - - static void keyboard_leave(void *data, wl_keyboard *keyboard, uint32_t serial, wl_surface *surface) { - - } - - static void keyboard_key(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { - if (!xkb_state) { - return; - } - - Window* window = reinterpret_cast*>(data); - - xkb_keycode_t keycode = key + 8; - xkb_keysym_t keysym = xkb_state_key_get_one_sym(xkb_state, keycode); - - char utf8[8] = {0}; - int len = xkb_keysym_to_utf8(keysym, utf8, sizeof(utf8)); - if (len != 0) { - char keypress = utf8[0]; - if(state == WL_KEYBOARD_KEY_STATE_PRESSED) { - if(window->heldkeys[keypress]) { - window->onKeyHold[keypress].Invoke(); - window->onAnyKeyHold.Invoke(keypress); - } else{ - window->heldkeys[keypress] = true; - window->onKeyDown[keypress].Invoke(); - window->onAnyKeyDown.Invoke(keypress); - } - } else{ - window->heldkeys[keypress] = false; - window->onKeyUp[keypress].Invoke(); - window->onAnyKeyUp.Invoke(keypress); - } - - } else { - // // fallback for keys like Return, Escape, etc. - // char name[64]; - // if (xkb_keysym_get_name(keysym, name, sizeof(name)) > 0) { - // printf("Key %s pressed (non-printable or multi-char)\n", name); - // } - } - } - - static void keyboard_modifiers(void *data, wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group) { - - } - - static void keyboard_repeat_info(void *data, wl_keyboard *keyboard, int32_t rate, int32_t delay) { - - } - constexpr static wl_keyboard_listener keyboard_listener = { .keymap = keyboard_keymap, .enter = keyboard_enter, @@ -339,76 +188,26 @@ export namespace Crafter { .modifiers = keyboard_modifiers, .repeat_info = keyboard_repeat_info, }; - - void seat_handle_capabilities(void* data, wl_seat* seat, uint32_t capabilities) { - Window* window = reinterpret_cast*>(data); - window->seat = seat; - if constexpr(Mouse) { - wl_pointer* pointer = wl_seat_get_pointer(seat); - wl_pointer_add_listener(pointer, &pointer_listener, window); - } - if constexpr(Keyboard) { - wl_keyboard* keyboard = wl_seat_get_keyboard(seat); - wl_keyboard_add_listener(keyboard, &keyboard_listener, window); - } - } constexpr static wl_seat_listener seat_listener = { .capabilities = seat_handle_capabilities, }; - - - static void handle_global(void *data, wl_registry *registry, std::uint32_t name, const char *interface, std::uint32_t version) { - Window* window = reinterpret_cast*>(data); - if (strcmp(interface, wl_shm_interface.name) == 0) { - window->shm = reinterpret_cast(wl_registry_bind(registry, name, &wl_shm_interface, 1)); - } else if (strcmp(interface, wl_seat_interface.name) == 0) { - if constexpr (Keyboard || Mouse) { - wl_seat* seat = reinterpret_cast(wl_registry_bind(registry, name, &wl_seat_interface, 1)); - wl_seat_add_listener(seat, &seat_listener, window); - } - } else if (compositor == NULL && strcmp(interface, wl_compositor_interface.name) == 0) { - compositor = reinterpret_cast(wl_registry_bind(registry, name, &wl_compositor_interface, 1)); - } else if (strcmp(interface, xdg_wm_base_interface.name) == 0) { - window->xdgWmBase = reinterpret_cast(wl_registry_bind(registry, name, &xdg_wm_base_interface, 1)); - xdg_wm_base_add_listener(window->xdgWmBase, &xdgWmBaseListener, NULL); - } else if (strcmp(interface, zxdg_decoration_manager_v1_interface.name) == 0) { - window->manager = reinterpret_cast(wl_registry_bind(registry, name, &zxdg_decoration_manager_v1_interface, 1)); - } - } - void handle_global_remove(void* data, wl_registry* registry, uint32_t name) {} - constexpr wl_registry_listener registry_listener = { + constexpr static wl_registry_listener registry_listener = { .global = handle_global, .global_remove = handle_global_remove, }; - - static void xdg_surface_handle_configure(void* data, xdg_surface* xdg_surface, std::uint32_t serial) { - Window* window = reinterpret_cast*>(data); - // The compositor configures our surface, acknowledge the configure event - xdg_surface_ack_configure(xdg_surface, serial); - - if (window->configured) { - // If this isn't the first configure event we've received, we already - // have a buffer attached, so no need to do anything. Commit the - // surface to apply the configure acknowledgement. - wl_surface_commit(window->surface); - } - - window->configured = true; - } - constexpr xdg_surface_listener xdg_surface_listener = { + constexpr static xdg_toplevel_listener xdg_toplevel_listener = { + .configure = xdg_toplevel_configure, + .close = xdg_toplevel_handle_close, + }; + constexpr static wl_callback_listener wl_callback_listener = { + .done = wl_surface_frame_done, + }; + constexpr static xdg_wm_base_listener xdgWmBaseListener = { + .ping = xdg_wm_base_handle_ping, + }; + constexpr static xdg_surface_listener xdg_surface_listener = { .configure = xdg_surface_handle_configure, }; - - void noop5(void*, xdg_toplevel*, std::int32_t, std::int32_t, wl_array*){} - static void xdg_toplevel_handle_close(void* data, xdg_toplevel*) { - WindowBase* window = reinterpret_cast(data); - window->onClose.Invoke(); - window->open = false; - } - constexpr xdg_toplevel_listener xdg_toplevel_listener = { - .configure = noop5, - .close = WindowBase::xdg_toplevel_handle_close, - }; - #endif }; + #endif } \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-WindowBase.cppm b/interfaces/Crafter.Graphics-WindowBase.cppm deleted file mode 100644 index 84ee4d4..0000000 --- a/interfaces/Crafter.Graphics-WindowBase.cppm +++ /dev/null @@ -1,72 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -module; - -#ifdef CRAFTER_GRAPHICS_WAYLAND -#include -#include "../lib/xdg-shell-client-protocol.h" -#include "../lib/wayland-xdg-decoration-unstable-v1-client-protocol.h" -#include -#include -#include -#include -#endif - -export module Crafter.Graphics:WindowBase; -import std; -import :Types; -import Crafter.Event; - -export namespace Crafter { - enum WindowCapabilities { - CRAFTER_WINDOWCAPTABILITIES_FRAMEBUFFER = 0b1, - CRAFTER_WINDOWCAPTABILITIES_KEYBOARD = 0b10, - CRAFTER_WINDOWCAPTABILITIES_MOUSE = 0b100, - }; - - class UiElementBase; - class WindowBase { - public: - Event onClose; - Event onUpdate; - bool open; - std::vector> elements; - WindowBase(WindowBase&) = delete; - WindowBase(WindowBase&&) = delete; - WindowBase& operator=(const WindowBase&) = delete; - void StartSync(); - void StartUpdate(void* window); - void StopUpdate(); - #ifdef CRAFTER_GRAPHICS_WAYLAND - WindowBase(); - ~WindowBase(); - #endif - protected: - friend class WindowKeyboard; - friend class WindowFramebuffer; - friend class WindowTitle; - #ifdef CRAFTER_GRAPHICS_WAYLAND - wl_surface* surface = nullptr; - wl_callback* cb = nullptr; - static void wl_surface_frame_done(void* data, struct wl_callback *cb, uint32_t time); - static wl_callback_listener surface_frame_listener; - #endif - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-WindowFramebuffer.cppm b/interfaces/Crafter.Graphics-WindowFramebuffer.cppm deleted file mode 100644 index 42d459e..0000000 --- a/interfaces/Crafter.Graphics-WindowFramebuffer.cppm +++ /dev/null @@ -1,61 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -module; - -#ifdef CRAFTER_GRAPHICS_WAYLAND -#include -#endif - -export module Crafter.Graphics:WindowFramebuffer; -import std; -import :Types; -import :UiElement; -import :WindowBase; -import Crafter.Event; - -export namespace Crafter { - class WindowBase; - class UiElementBase; - class UiElementBuffer; - class WindowFramebuffer { - public: - std::vector elements; - Pixel_BU8_GU8_RU8_AU8* framebuffer; - std::uint_fast32_t width; - std::uint_fast32_t height; - float scale = 1; - WindowFramebuffer(WindowBase& window); - WindowFramebuffer(WindowBase& window, std::uint_fast32_t width, std::uint_fast32_t height); - WindowFramebuffer(WindowFramebuffer&) = delete; - WindowFramebuffer(WindowFramebuffer&&) = delete; - WindowFramebuffer& operator=(const WindowFramebuffer&) = delete; - ScaleData ScaleElement(const UiElementBase& element); - - void Render(); - void Create(std::uint_fast32_t width, std::uint_fast32_t height); - void Resize(std::uint_fast32_t width, std::uint_fast32_t height); - void Destroy(); - ~WindowFramebuffer(); - private: - WindowBase& window; - #ifdef CRAFTER_GRAPHICS_WAYLAND - wl_buffer* buffer; - #endif - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-WindowKeyboard.cppm b/interfaces/Crafter.Graphics-WindowKeyboard.cppm deleted file mode 100644 index d209a9a..0000000 --- a/interfaces/Crafter.Graphics-WindowKeyboard.cppm +++ /dev/null @@ -1,35 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -export module Crafter.Graphics:WindowKeyboard; -import std; -import Crafter.Event; - -export namespace Crafter { - class WindowKeyboard { - public: - bool heldkeys[255] = {}; - Event onKeyDown[255]; - Event onKeyHold[255]; - Event onKeyUp[255]; - Event onAnyKeyDown; - Event onAnyKeyHold; - Event onAnyKeyUp; - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-WindowMouse.cppm b/interfaces/Crafter.Graphics-WindowMouse.cppm deleted file mode 100644 index 718835e..0000000 --- a/interfaces/Crafter.Graphics-WindowMouse.cppm +++ /dev/null @@ -1,46 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -export module Crafter.Graphics:WindowKeyboard; -import std; -import Crafter.Event; - -export namespace Crafter { - class UiElementMouse; - class WindowKeyboard { - public: - std::vector elements; - Event onMouseRightClick; - Event onMouseLeftClick; - Event onMouseRightHold; - Event onMouseLeftHold; - Event onMouseRightRelease; - Event onMouseLeftRelease; - Event onMouseMove; - Event onMouseEnter; - Event onMouseLeave; - Event onMouseScroll; - Event onClose; - MousePoint currentMousePos; - MousePoint lastMousePos; - MousePoint mouseDelta; - bool mouseLeftHeld = false; - bool mouseRightHeld = false; - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics-WindowTitle.cppm b/interfaces/Crafter.Graphics-WindowTitle.cppm deleted file mode 100644 index 9a772e0..0000000 --- a/interfaces/Crafter.Graphics-WindowTitle.cppm +++ /dev/null @@ -1,40 +0,0 @@ -/* -Crafter®.Graphics -Copyright (C) 2025 Catcrafts® -catcrafts.net - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License version 3.0 as published by the Free Software Foundation; - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -module; - -#ifdef CRAFTER_GRAPHICS_WAYLAND -#include -#endif - -export module Crafter.Graphics:WindowTitle; -import std; -import :Types; -import Crafter.Event; - -export namespace Crafter { - class WindowBase; - class WindowTitle { - public: - WindowTitle(WindowBase& window); - WindowTitle(WindowBase& window, const std::string_view title); - void Set(const std::string_view title); - private: - WindowBase& window; - }; -} \ No newline at end of file diff --git a/interfaces/Crafter.Graphics.cppm b/interfaces/Crafter.Graphics.cppm index c0a0fae..9664d80 100644 --- a/interfaces/Crafter.Graphics.cppm +++ b/interfaces/Crafter.Graphics.cppm @@ -22,12 +22,8 @@ export module Crafter.Graphics; export import :Window; export import :UiElement; -export import :UiElementBuffer; -export import :UiElementMouse; export import :Types; export import :Font; -export import :WindowKeyboard; -export import :WindowFramebuffer; export import :Shm; // export import :WindowWaylandVulkan; diff --git a/project.json b/project.json index db93ce9..5a23a3e 100644 --- a/project.json +++ b/project.json @@ -3,13 +3,13 @@ "configurations": [ { "name": "base", - "implementations": ["implementations/Crafter.Graphics-Font", "implementations/Crafter.Graphics-Shm", "implementations/Crafter.Graphics-WindowFramebuffer", "implementations/Crafter.Graphics-WindowFramebuffer", "implementations/Crafter.Graphics-UiElement"], - "interfaces": ["interfaces/Crafter.Graphics-Window", "interfaces/Crafter.Graphics-WindowBase", "interfaces/Crafter.Graphics", "interfaces/Crafter.Graphics-Types", "interfaces/Crafter.Graphics-Font", "interfaces/Crafter.Graphics-WindowKeyboard", "interfaces/Crafter.Graphics-WindowFramebuffer", "interfaces/Crafter.Graphics-WindowTitle", "interfaces/Crafter.Graphics-Shm", "interfaces/Crafter.Graphics-UiElement", "interfaces/Crafter.Graphics-UiElementBuffer", "interfaces/Crafter.Graphics-UiElementMouse"], + "implementations": ["implementations/Crafter.Graphics-Font", "implementations/Crafter.Graphics-Shm", "implementations/Crafter.Graphics-UiElement", "implementations/Crafter.Graphics-UiElementBufferBuffer", "implementations/Crafter.Graphics-UiElementBufferBufferBase", "implementations/Crafter.Graphics-UiElementBufferMouseBuffer"], + "interfaces": ["interfaces/Crafter.Graphics-Window", "interfaces/Crafter.Graphics", "interfaces/Crafter.Graphics-Types", "interfaces/Crafter.Graphics-Font", "interfaces/Crafter.Graphics-Shm", "interfaces/Crafter.Graphics-UiElement"], "type": "library" }, { "name": "wayland", - "implementations": ["implementations/Crafter.Graphics-Window_wayland", "implementations/Crafter.Graphics-WindowFramebuffer_wayland", "implementations/Crafter.Graphics-WindowTitle_wayland", "implementations/Crafter.Graphics-UiElementBuffer"], + "implementations": ["implementations/Crafter.Graphics-Window_wayland"], "interfaces": [], "libs": ["wayland-client", "xkbcommon"], "c_files": ["lib/xdg-shell-protocol", "lib/wayland-xdg-decoration-unstable-v1-client-protocol"],