diff options
Diffstat (limited to 'include/cru')
44 files changed, 411 insertions, 579 deletions
diff --git a/include/cru/common/base.hpp b/include/cru/common/base.hpp index 55f43e5c..2c935046 100644 --- a/include/cru/common/base.hpp +++ b/include/cru/common/base.hpp @@ -23,19 +23,15 @@ namespace cru { class Object { public: Object() = default; - Object(const Object&) = default; - Object& operator=(const Object&) = default; - Object(Object&&) = default; - Object& operator=(Object&&) = default; + CRU_DEFAULT_COPY(Object) + CRU_DEFAULT_MOVE(Object) virtual ~Object() = default; }; struct Interface { Interface() = default; - Interface(const Interface& other) = delete; - Interface(Interface&& other) = delete; - Interface& operator=(const Interface& other) = delete; - Interface& operator=(Interface&& other) = delete; + CRU_DELETE_COPY(Interface) + CRU_DELETE_MOVE(Interface) virtual ~Interface() = default; }; diff --git a/include/cru/common/logger.hpp b/include/cru/common/logger.hpp index bbe06331..08765499 100644 --- a/include/cru/common/logger.hpp +++ b/include/cru/common/logger.hpp @@ -5,32 +5,33 @@ #include <iostream> #include <list> +#include <memory> #include <string_view> namespace cru::log { enum class LogLevel { Debug, Info, Warn, Error }; -struct ILoggerSource : Interface { - // Write the s. LogLevel is just a helper. It has no effect on the content to - // write. - virtual void Write(LogLevel level, const std::wstring_view& s) = 0; +struct ILogSource : virtual Interface { + // Write the string s. LogLevel is just a helper. It has no effect on the + // content to write. + virtual void Write(LogLevel level, const std::string_view& s) = 0; }; -class StdioLoggerSource : public ILoggerSource { +class StdioLogSource : public virtual ILogSource { public: - StdioLoggerSource() = default; + StdioLogSource() = default; - CRU_DELETE_COPY(StdioLoggerSource) - CRU_DELETE_MOVE(StdioLoggerSource) + CRU_DELETE_COPY(StdioLogSource) + CRU_DELETE_MOVE(StdioLogSource) - ~StdioLoggerSource() = default; + ~StdioLogSource() override = default; - void Write(LogLevel level, const std::wstring_view& s) override { + void Write(LogLevel level, const std::string_view& s) override { if (level == LogLevel::Error) { - std::wcerr << s; + std::cerr << s; } else { - std::wcout << s; + std::cout << s; } } }; @@ -45,43 +46,43 @@ class Logger : public Object { CRU_DELETE_COPY(Logger) CRU_DELETE_MOVE(Logger) - ~Logger() override; + ~Logger() override = default; public: - void AddSource(ILoggerSource* source); - void RemoveSource(ILoggerSource* source); + void AddSource(std::unique_ptr<ILogSource> source); + void RemoveSource(ILogSource* source); public: - void Log(LogLevel level, const std::wstring_view& s); + void Log(LogLevel level, const std::string_view& s); template <typename... TArgs> - void Debug(const std::wstring_view& format, TArgs&&... args) { + void Debug(const std::string_view& format, TArgs&&... args) { #ifdef CRU_DEBUG Log(LogLevel::Debug, util::Format(format, std::forward<TArgs>(args)...)); #endif } template <typename... TArgs> - void Info(const std::wstring_view& format, TArgs&&... args) { + void Info(const std::string_view& format, TArgs&&... args) { Log(LogLevel::Info, util::Format(format, std::forward<TArgs>(args)...)); } template <typename... TArgs> - void Warn(const std::wstring_view& format, TArgs&&... args) { + void Warn(const std::string_view& format, TArgs&&... args) { Log(LogLevel::Warn, util::Format(format, std::forward<TArgs>(args)...)); } template <typename... TArgs> - void Error(const std::wstring_view& format, TArgs&&... args) { + void Error(const std::string_view& format, TArgs&&... args) { Log(LogLevel::Error, util::Format(format, std::forward<TArgs>(args)...)); } public: - std::list<ILoggerSource*> sources_; + std::list<std::unique_ptr<ILogSource>> sources_; }; template <typename... TArgs> -void Debug(const std::wstring_view& format, TArgs&&... args) { +void Debug(const std::string_view& format, TArgs&&... args) { #ifdef CRU_DEBUG Logger::GetInstance()->Log( LogLevel::Debug, util::Format(format, std::forward<TArgs>(args)...)); @@ -89,19 +90,19 @@ void Debug(const std::wstring_view& format, TArgs&&... args) { } template <typename... TArgs> -void Info(const std::wstring_view& format, TArgs&&... args) { +void Info(const std::string_view& format, TArgs&&... args) { Logger::GetInstance()->Log( LogLevel::Info, util::Format(format, std::forward<TArgs>(args)...)); } template <typename... TArgs> -void Warn(const std::wstring_view& format, TArgs&&... args) { +void Warn(const std::string_view& format, TArgs&&... args) { Logger::GetInstance()->Log( LogLevel::Warn, util::Format(format, std::forward<TArgs>(args)...)); } template <typename... TArgs> -void Error(const std::wstring_view& format, TArgs&&... args) { +void Error(const std::string_view& format, TArgs&&... args) { Logger::GetInstance()->Log( LogLevel::Error, util::Format(format, std::forward<TArgs>(args)...)); } diff --git a/include/cru/common/pre_config.hpp b/include/cru/common/pre_config.hpp index 96b1bab5..5fcef218 100644 --- a/include/cru/common/pre_config.hpp +++ b/include/cru/common/pre_config.hpp @@ -1,5 +1,10 @@ #pragma once +#ifdef _MSC_VER +// disable the unnecessary warning about multi-inheritance +#pragma warning(disable : 4250) +#endif + #ifdef _DEBUG #define CRU_DEBUG #endif diff --git a/include/cru/platform/check.hpp b/include/cru/platform/check.hpp new file mode 100644 index 00000000..8e60e848 --- /dev/null +++ b/include/cru/platform/check.hpp @@ -0,0 +1,41 @@ +#pragma once +#include "cru/common/format.hpp" +#include "exception.hpp" +#include "resource.hpp" + +#include <cassert> +#include <memory> +#include <type_traits> + +namespace cru::platform { +template <typename TTarget> +TTarget* CheckPlatform(INativeResource* resource, + const std::string_view& target_platform) { + assert(resource); + const auto result = dynamic_cast<TTarget*>(resource); + if (result == nullptr) { + throw UnsupportPlatformException(util::Format( + "Try to convert resource to target platform failed. Platform id of " + "resource to convert: {} . Target platform id: {} .", + resource->GetPlatformId(), target_platform)); + } + return result; +} + +template <typename TTarget, typename TSource> +std::shared_ptr<TTarget> CheckPlatform( + const std::shared_ptr<TSource>& resource, + const std::string_view& target_platform) { + static_assert(std::is_base_of_v<INativeResource, TSource>, + "TSource must be a subclass of INativeResource."); + assert(resource); + const auto result = std::dynamic_pointer_cast<TTarget>(resource); + if (result == nullptr) { + throw UnsupportPlatformException(util::Format( + "Try to convert resource to target platform failed. Platform id of " + "resource to convert: {} . Target platform id: {} .", + resource->GetPlatformId(), target_platform)); + } + return result; +} +} // namespace cru::platform diff --git a/include/cru/platform/exception.hpp b/include/cru/platform/exception.hpp index ad6827c0..1774b12c 100644 --- a/include/cru/platform/exception.hpp +++ b/include/cru/platform/exception.hpp @@ -9,10 +9,18 @@ class PlatformException : public std::runtime_error { using runtime_error::runtime_error; // inherit constructors }; -// This exception is throwed when a resource has been disposed and not usable +// This exception is thrown when a resource is used on another platform. +// Of course, you can't mix resources of two different platform. +// For example, Win32 Brush (may add in the future) with Direct Painter. +class UnsupportPlatformException : public std::runtime_error { + public: + using runtime_error::runtime_error; // inherit constructors +}; + +// This exception is thrown when a resource has been disposed and not usable // again. -// For example, calling Build twice on a GeometryBuilder::Build will lead to this -// exception. +// For example, calling Build twice on a GeometryBuilder::Build will lead to +// this exception. class ReuseException : public std::runtime_error { public: using runtime_error::runtime_error; // inherit constructors diff --git a/include/cru/platform/graph/base.hpp b/include/cru/platform/graph/base.hpp new file mode 100644 index 00000000..8c2a2d2f --- /dev/null +++ b/include/cru/platform/graph/base.hpp @@ -0,0 +1,4 @@ +#pragma once +#include "../graph_base.hpp" +#include "../matrix.hpp" +#include "../resource.hpp" diff --git a/include/cru/platform/graph/brush.hpp b/include/cru/platform/graph/brush.hpp index d292ae82..af7a1dec 100644 --- a/include/cru/platform/graph/brush.hpp +++ b/include/cru/platform/graph/brush.hpp @@ -1,46 +1,11 @@ #pragma once -#include "../graphic_base.hpp" -#include "../native_resource.hpp" +#include "resource.hpp" namespace cru::platform::graph { -class Brush : public NativeResource { - protected: - Brush() = default; +struct IBrush : virtual IGraphResource {}; - public: - Brush(const Brush& other) = delete; - Brush& operator=(const Brush& other) = delete; - - Brush(Brush&& other) = delete; - Brush& operator=(Brush&& other) = delete; - - ~Brush() override = default; -}; - -class SolidColorBrush : public Brush { - protected: - SolidColorBrush() = default; - - public: - SolidColorBrush(const SolidColorBrush& other) = delete; - SolidColorBrush& operator=(const SolidColorBrush& other) = delete; - - SolidColorBrush(SolidColorBrush&& other) = delete; - SolidColorBrush& operator=(SolidColorBrush&& other) = delete; - - ~SolidColorBrush() = default; - - public: - Color GetColor() { return color_; } - void SetColor(const Color& color) { - color_ = color; - OnSetColor(color); - } - - protected: - virtual void OnSetColor(const Color& color) = 0; - - protected: - Color color_ = colors::black; +struct ISolidColorBrush : virtual IBrush { + virtual Color GetColor() = 0; + virtual void SetColor(const Color& color) = 0; }; } // namespace cru::platform::graph diff --git a/include/cru/platform/graph/factory.hpp b/include/cru/platform/graph/factory.hpp new file mode 100644 index 00000000..2c52cbb8 --- /dev/null +++ b/include/cru/platform/graph/factory.hpp @@ -0,0 +1,27 @@ +#pragma once +#include "base.hpp" + +#include "brush.hpp" +#include "font.hpp" +#include "geometry.hpp" +#include "text_layout.hpp" + +#include <memory> +#include <string> +#include <string_view> +#include <utility> + +namespace cru::platform::graph { +// Entry point of the graph module. +struct IGraphFactory : virtual INativeResource { + virtual std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush() = 0; + + virtual std::unique_ptr<IGeometryBuilder> CreateGeometryBuilder() = 0; + + virtual std::unique_ptr<IFont> CreateFont(const std::string_view& font_family, + float font_size) = 0; + + virtual std::unique_ptr<ITextLayout> CreateTextLayout( + std::shared_ptr<IFont> font, std::string text) = 0; +}; +} // namespace cru::platform::graph diff --git a/include/cru/platform/graph/font.hpp b/include/cru/platform/graph/font.hpp index bd470256..98ce80e7 100644 --- a/include/cru/platform/graph/font.hpp +++ b/include/cru/platform/graph/font.hpp @@ -1,18 +1,6 @@ #pragma once -#include "../native_resource.hpp" +#include "resource.hpp" namespace cru::platform::graph { -class Font : public NativeResource { - protected: - Font() = default; - - public: - Font(const Font& other) = delete; - Font& operator=(const Font& other) = delete; - - Font(Font&& other) = delete; - Font& operator=(Font&& other) = delete; - - ~Font() override = default; -}; +struct IFont : virtual IGraphResource {}; } // namespace cru::platform::graph diff --git a/include/cru/platform/graph/geometry.hpp b/include/cru/platform/graph/geometry.hpp index d31b3b27..689b2ab9 100644 --- a/include/cru/platform/graph/geometry.hpp +++ b/include/cru/platform/graph/geometry.hpp @@ -1,45 +1,22 @@ #pragma once -#include "../graphic_base.hpp" -#include "../native_resource.hpp" +#include "resource.hpp" -namespace cru::platform::graph { -class Geometry : public NativeResource { - protected: - Geometry() = default; - - public: - Geometry(const Geometry& other) = delete; - Geometry& operator=(const Geometry& other) = delete; - - Geometry(Geometry&& other) = delete; - Geometry& operator=(Geometry&& other) = delete; - - ~Geometry() override = default; +#include <memory> - public: +namespace cru::platform::graph { +struct IGeometry : virtual IGraphResource { virtual bool FillContains(const Point& point) = 0; }; -class GeometryBuilder : public NativeResource { - protected: - GeometryBuilder() = default; - - public: - GeometryBuilder(const GeometryBuilder& other) = delete; - GeometryBuilder& operator=(const GeometryBuilder& other) = delete; - - GeometryBuilder(GeometryBuilder&& other) = delete; - GeometryBuilder& operator=(GeometryBuilder&& other) = delete; - - ~GeometryBuilder() override = default; +// After called Build, calling every method will throw a - public: +class IGeometryBuilder : virtual IGraphResource { virtual void BeginFigure(const Point& point) = 0; virtual void LineTo(const Point& point) = 0; virtual void QuadraticBezierTo(const Point& control_point, const Point& end_point) = 0; virtual void CloseFigure(bool close) = 0; - virtual Geometry* Build() = 0; + virtual std::unique_ptr<IGeometry> Build() = 0; }; } // namespace cru::platform::graph diff --git a/include/cru/platform/graph/graph_factory.hpp b/include/cru/platform/graph/graph_factory.hpp deleted file mode 100644 index 0b1034cc..00000000 --- a/include/cru/platform/graph/graph_factory.hpp +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once -#include "../graphic_base.hpp" -#include "../native_resource.hpp" - -#include "brush.hpp" -#include "font.hpp" -#include "geometry.hpp" -#include "text_layout.hpp" - -#include <memory> -#include <string> -#include <string_view> - -namespace cru::platform::graph { -// Entry point of the graph module. -// If you create a IUiApplication instance, then you should not create -// IGraphFactory manually. IUiApplication will call -// IGraphFactory::CreateInstance and set auto-delete to true. -// The manual creation method of IGraphFactory provides a you a way to use graph -// related tools without interact with actual ui like window system. -class GraphFactory : public NativeResource { - public: - // Create a platform-specific instance and save it as the global instance. - // Do not create the instance twice. Implements should assert for that. - // After creating, get the instance by GetInstance. - static GraphFactory* CreateInstance(); - - // Get the global instance. If it is not created, then return nullptr. - static GraphFactory* GetInstance(); - - protected: - GraphFactory() = default; - - public: - GraphFactory(const GraphFactory& other) = delete; - GraphFactory& operator=(const GraphFactory& other) = delete; - - GraphFactory(GraphFactory&& other) = delete; - GraphFactory& operator=(GraphFactory&& other) = delete; - - ~GraphFactory() override = default; - - public: - virtual SolidColorBrush* CreateSolidColorBrush() = 0; - SolidColorBrush* CreateSolidColorBrush(const Color& color) { - const auto brush = CreateSolidColorBrush(); - brush->SetColor(color); - return brush; - } - - virtual GeometryBuilder* CreateGeometryBuilder() = 0; - - virtual Font* CreateFont(const std::wstring_view& font_family, - float font_size) = 0; - - virtual TextLayout* CreateTextLayout(std::shared_ptr<Font> font, - std::wstring text) = 0; - - virtual bool IsAutoDelete() const = 0; - virtual void SetAutoDelete(bool value) = 0; -}; -} // namespace cru::platform::graph diff --git a/include/cru/platform/graph/painter.hpp b/include/cru/platform/graph/painter.hpp index 97d4b4cf..3ae9cf1c 100644 --- a/include/cru/platform/graph/painter.hpp +++ b/include/cru/platform/graph/painter.hpp @@ -1,42 +1,27 @@ #pragma once -#include "../graphic_base.hpp" -#include "../matrix.hpp" -#include "../native_resource.hpp" +#include "base.hpp" namespace cru::platform::graph { -class Brush; -class Geometry; -class TextLayout; +struct IBrush; +struct IGeometry; +struct ITextLayout; -class Painter : public NativeResource { - protected: - Painter() = default; - - public: - Painter(const Painter& other) = delete; - Painter& operator=(const Painter& other) = delete; - - Painter(Painter&& other) = delete; - Painter& operator=(Painter&& other) = delete; - - ~Painter() override = default; - - public: +struct IPainter : virtual INativeResource { virtual Matrix GetTransform() = 0; virtual void SetTransform(const Matrix& matrix) = 0; virtual void Clear(const Color& color) = 0; - virtual void StrokeRectangle(const Rect& rectangle, Brush* brush, + virtual void StrokeRectangle(const Rect& rectangle, IBrush* brush, float width) = 0; - virtual void FillRectangle(const Rect& rectangle, Brush* brush) = 0; + virtual void FillRectangle(const Rect& rectangle, IBrush* brush) = 0; - virtual void StrokeGeometry(Geometry* geometry, Brush* brush, + virtual void StrokeGeometry(IGeometry* geometry, IBrush* brush, float width) = 0; - virtual void FillGeometry(Geometry* geometry, Brush* brush) = 0; + virtual void FillGeometry(IGeometry* geometry, IBrush* brush) = 0; - virtual void DrawText(const Point& offset, TextLayout* text_layout, - Brush* brush) = 0; + virtual void DrawText(const Point& offset, ITextLayout* text_layout, + IBrush* brush) = 0; virtual void EndDraw() = 0; }; diff --git a/include/cru/platform/graph/resource.hpp b/include/cru/platform/graph/resource.hpp new file mode 100644 index 00000000..255865eb --- /dev/null +++ b/include/cru/platform/graph/resource.hpp @@ -0,0 +1,10 @@ +#pragma once +#include "base.hpp" + +namespace cru::platform::graph { +struct IGraphFactory; + +struct IGraphResource : virtual INativeResource { + virtual IGraphFactory* GetGraphFactory() = 0; +}; +} // namespace cru::platform::graph diff --git a/include/cru/platform/graph/text_layout.hpp b/include/cru/platform/graph/text_layout.hpp index 56943098..4f6e81e1 100644 --- a/include/cru/platform/graph/text_layout.hpp +++ b/include/cru/platform/graph/text_layout.hpp @@ -1,33 +1,19 @@ #pragma once -#include "../graphic_base.hpp" -#include "../native_resource.hpp" +#include "resource.hpp" #include <memory> #include <string> #include <vector> namespace cru::platform::graph { -class Font; +struct IFont; -class TextLayout : public NativeResource { - protected: - TextLayout() = default; +struct ITextLayout : virtual IGraphResource { + virtual std::string GetText() = 0; + virtual void SetText(std::string new_text) = 0; - public: - TextLayout(const TextLayout& other) = delete; - TextLayout& operator=(const TextLayout& other) = delete; - - TextLayout(TextLayout&& other) = delete; - TextLayout& operator=(TextLayout&& other) = delete; - - ~TextLayout() override = default; - - public: - virtual std::wstring GetText() = 0; - virtual void SetText(std::wstring new_text) = 0; - - virtual std::shared_ptr<Font> GetFont() = 0; - virtual void SetFont(std::shared_ptr<Font> font) = 0; + virtual std::shared_ptr<IFont> GetFont() = 0; + virtual void SetFont(std::shared_ptr<IFont> font) = 0; virtual void SetMaxWidth(float max_width) = 0; virtual void SetMaxHeight(float max_height) = 0; diff --git a/include/cru/platform/graph/util/painter_util.hpp b/include/cru/platform/graph/util/painter.hpp index 7a655a34..72d96bc1 100644 --- a/include/cru/platform/graph/util/painter_util.hpp +++ b/include/cru/platform/graph/util/painter.hpp @@ -6,13 +6,12 @@ namespace cru::platform::graph::util { template <typename Fn> -inline void WithTransform(Painter* painter, const Matrix& matrix, - const Fn& action) { - static_assert(std::is_invocable_v<decltype(action), Painter*>, +void WithTransform(IPainter* painter, const Matrix& matrix, const Fn& action) { + static_assert(std::is_invocable_v<decltype(action), IPainter*>, "Action must can be be invoked with painter."); const auto old = painter->GetTransform(); painter->SetTransform(old * matrix); action(painter); painter->SetTransform(old); } -} // namespace cru::platform::util +} // namespace cru::platform::graph::util diff --git a/include/cru/platform/graphic_base.hpp b/include/cru/platform/graph_base.hpp index c9c4f629..c9c4f629 100644 --- a/include/cru/platform/graphic_base.hpp +++ b/include/cru/platform/graph_base.hpp diff --git a/include/cru/platform/heap_debug.hpp b/include/cru/platform/heap_debug.hpp index e305be31..9e3ae368 100644 --- a/include/cru/platform/heap_debug.hpp +++ b/include/cru/platform/heap_debug.hpp @@ -2,5 +2,6 @@ #include "cru/common/pre_config.hpp" namespace cru::platform { +// Setup the heap debug function. Currently I only use this on Windows... void SetupHeapDebug(); -} +} // namespace cru::platform diff --git a/include/cru/platform/matrix.hpp b/include/cru/platform/matrix.hpp index cbb55c78..030e1378 100644 --- a/include/cru/platform/matrix.hpp +++ b/include/cru/platform/matrix.hpp @@ -1,5 +1,5 @@ #pragma once -#include "graphic_base.hpp" +#include "graph_base.hpp" #include <cmath> @@ -39,7 +39,7 @@ struct Matrix { Point TransformPoint(const Point& point) const { return Point{point.x * m11 + point.y * m21 + m31, - point.x * m12 + point.y * m22 + m32}; + point.x * m12 + point.y * m22 + m32}; } static Matrix Identity() { @@ -50,10 +50,8 @@ struct Matrix { return Matrix{1.0f, 0.0f, 0.0f, 1.0f, x, y}; } - static Matrix Scale(float sx, float sy) { return Scale(sx, sy, 0.0f, 0.0f); } - - static Matrix Scale(float sx, float sy, float cx, float cy) { - return Matrix{sx, 0.0f, 0.0f, sy, cx - sx * cx, cy - sy * cy}; + static Matrix Scale(float sx, float sy) { + return Matrix{sx, 0.0f, 0.0f, sy, 0.0f, 0.0f}; } static Matrix Rotation(float angle) { diff --git a/include/cru/platform/native/basic_types.hpp b/include/cru/platform/native/basic_types.hpp index 5a7155ee..a53fa671 100644 --- a/include/cru/platform/native/basic_types.hpp +++ b/include/cru/platform/native/basic_types.hpp @@ -7,5 +7,5 @@ struct Dpi { float y; }; -enum MouseButton : unsigned { Left = 1, Right = 2, Middle = 4 }; +enum MouseButton : unsigned { Left = 0b1, Right = 0b10, Middle = 0b100 }; } // namespace cru::platform::native diff --git a/include/cru/platform/native/cursor.hpp b/include/cru/platform/native/cursor.hpp index b8604ecb..961dff34 100644 --- a/include/cru/platform/native/cursor.hpp +++ b/include/cru/platform/native/cursor.hpp @@ -5,35 +5,16 @@ #include <memory> namespace cru::platform::native { -class Cursor : public NativeResource { - public: - Cursor() = default; +struct ICursor : public virtual INativeResource {}; - CRU_DELETE_COPY(Cursor) - CRU_DELETE_MOVE(Cursor) - - ~Cursor() override = default; -}; - -enum class SystemCursor { +enum class SystemCursorType { Arrow, Hand, }; -class CursorManager : public NativeResource { - public: - CursorManager() = default; - - CRU_DELETE_COPY(CursorManager) - CRU_DELETE_MOVE(CursorManager) +struct ICursorManager : public virtual INativeResource { + virtual std::shared_ptr<ICursor> GetSystemCursor(SystemCursorType type) = 0; - ~CursorManager() override = default; - - public: - virtual std::shared_ptr<Cursor> GetSystemCursor(SystemCursor type) = 0; - - //TODO: Add method to create cursor. + // TODO: Add method to create cursor. }; - -std::shared_ptr<Cursor> GetSystemCursor(SystemCursor type); } // namespace cru::platform::native diff --git a/include/cru/platform/native/native_event.hpp b/include/cru/platform/native/native_event.hpp index 54bab00c..dcd7a336 100644 --- a/include/cru/platform/native/native_event.hpp +++ b/include/cru/platform/native/native_event.hpp @@ -8,4 +8,9 @@ struct NativeMouseButtonEventArgs { MouseButton button; Point point; }; + +enum class FocusChangeType { Gain, Lost }; + +enum class MouseEnterLeaveType { Enter, Leave }; + } // namespace cru::platform::native diff --git a/include/cru/platform/native/native_window.hpp b/include/cru/platform/native/native_window.hpp index 8a067a4c..cd2459e0 100644 --- a/include/cru/platform/native/native_window.hpp +++ b/include/cru/platform/native/native_window.hpp @@ -9,7 +9,7 @@ #include "native_event.hpp" namespace cru::platform::graph { -class Painter; +struct IPainter; } namespace cru::platform::native { @@ -21,28 +21,18 @@ namespace cru::platform::native { // Close or closed by the user, which leads to an invalid instance. You can // check the validity by IsValid. When you call perform native operations on the // invalid instance, there is no effect. -class NativeWindow : public NativeResource { - protected: - NativeWindow() = default; - - public: - NativeWindow(const NativeWindow& other) = delete; - NativeWindow& operator=(const NativeWindow& other) = delete; - - NativeWindow(NativeWindow&& other) = delete; - NativeWindow& operator=(NativeWindow&& other) = delete; - - ~NativeWindow() override = default; - - public: +struct INativeWindow : public virtual INativeResource { // Return if the window is still valid, that is, hasn't been closed or // destroyed. virtual bool IsValid() = 0; + + // Set if the instance is deleted automatically when the window is destroyed + // by other ways. Default is true. virtual void SetDeleteThisOnDestroy(bool value) = 0; virtual void Close() = 0; - virtual NativeWindow* GetParent() = 0; + virtual INativeWindow* GetParent() = 0; virtual bool IsVisible() = 0; virtual void SetVisible(bool is_visible) = 0; @@ -64,16 +54,18 @@ class NativeWindow : public NativeResource { virtual bool CaptureMouse() = 0; virtual bool ReleaseMouse() = 0; - virtual void SetCursor(std::shared_ptr<Cursor> cursor) = 0; + virtual void SetCursor(std::shared_ptr<ICursor> cursor) = 0; + + virtual void RequestRepaint() = 0; - virtual void Repaint() = 0; - virtual graph::Painter* BeginPaint() = 0; + // Remember to call EndDraw on return value and destroy it. + virtual std::unique_ptr<graph::IPainter> BeginPaint() = 0; virtual IEvent<std::nullptr_t>* DestroyEvent() = 0; virtual IEvent<std::nullptr_t>* PaintEvent() = 0; virtual IEvent<Size>* ResizeEvent() = 0; - virtual IEvent<bool>* FocusEvent() = 0; - virtual IEvent<bool>* MouseEnterLeaveEvent() = 0; + virtual IEvent<FocusChangeType>* FocusEvent() = 0; + virtual IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() = 0; virtual IEvent<Point>* MouseMoveEvent() = 0; virtual IEvent<NativeMouseButtonEventArgs>* MouseDownEvent() = 0; virtual IEvent<NativeMouseButtonEventArgs>* MouseUpEvent() = 0; diff --git a/include/cru/platform/native/ui_application.hpp b/include/cru/platform/native/ui_application.hpp index 923fbaf7..6d2ab659 100644 --- a/include/cru/platform/native/ui_application.hpp +++ b/include/cru/platform/native/ui_application.hpp @@ -1,45 +1,36 @@ #pragma once #include "../native_resource.hpp" -#include "cursor.hpp" - #include <chrono> #include <functional> #include <vector> namespace cru::platform::native { -class NativeWindow; +struct INativeWindow; +struct ICursorManager; // The entry point of a ui application. // It will call IGraphFactory::CreateInstance during its creation // and set graph factory to be auto deleted. If you want to keep // the graph factory then you should manually set it to false after // creating the ui application. -class UiApplication : public NativeResource { +struct IUiApplication : public virtual INativeResource { public: // Create a platform-specific instance and save it as the global instance. // Do not create the instance twice. Implements should assert for that. // After creating, get the instance by GetInstance. - static UiApplication* CreateInstance(); + static IUiApplication* CreateInstance(); // Get the global instance. If it is not created, then return nullptr. - static UiApplication* GetInstance(); - - protected: - UiApplication() = default; - - public: - UiApplication(const UiApplication& other) = delete; - UiApplication& operator=(const UiApplication& other) = delete; - - UiApplication(UiApplication&& other) = delete; - UiApplication& operator=(UiApplication&& other) = delete; - - ~UiApplication() override = default; + static IUiApplication* GetInstance(); public: + // Block current thread and run the message loop. Return the exit code when + // message loop gets a quit message (possibly posted by method RequestQuit). virtual int Run() = 0; - virtual void Quit(int quite_code) = 0; + + // Post a quit message with given quit code. + virtual void RequestQuit(int quit_code) = 0; virtual void AddOnQuitHandler(const std::function<void()>& handler) = 0; @@ -50,9 +41,9 @@ class UiApplication : public NativeResource { const std::function<void()>& action) = 0; virtual void CancelTimer(unsigned long id) = 0; - virtual std::vector<NativeWindow*> GetAllWindow() = 0; - virtual NativeWindow* CreateWindow(NativeWindow* parent) = 0; + virtual std::vector<INativeWindow*> GetAllWindow() = 0; + virtual INativeWindow* CreateWindow(INativeWindow* parent) = 0; - virtual CursorManager* GetCursorManager() = 0; + virtual ICursorManager* GetCursorManager() = 0; }; } // namespace cru::platform::native diff --git a/include/cru/platform/native_resource.hpp b/include/cru/platform/native_resource.hpp deleted file mode 100644 index ec7f01b6..00000000 --- a/include/cru/platform/native_resource.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#include "cru/common/base.hpp" - -#include <string_view> - -namespace cru::platform { -class NativeResource : public Object { - protected: - NativeResource() = default; - - public: - NativeResource(const NativeResource& other) = delete; - NativeResource& operator=(const NativeResource& other) = delete; - - - NativeResource(NativeResource&& other) = delete; - NativeResource& operator=(NativeResource&& other) = delete; - ~NativeResource() override = default; - - public: - virtual std::wstring_view GetPlatformId() const = 0; -}; -} // namespace cru::platform diff --git a/include/cru/platform/resource.hpp b/include/cru/platform/resource.hpp new file mode 100644 index 00000000..6b315527 --- /dev/null +++ b/include/cru/platform/resource.hpp @@ -0,0 +1,10 @@ +#pragma once +#include "cru/common/base.hpp" + +#include <string_view> + +namespace cru::platform { +struct INativeResource : virtual Interface { + virtual std::string_view GetPlatformId() const = 0; +}; +} // namespace cru::platform diff --git a/include/cru/platform/string_util.hpp b/include/cru/platform/string_util.hpp deleted file mode 100644 index 822c0c95..00000000 --- a/include/cru/platform/string_util.hpp +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once -#include "cru/common/pre_config.hpp" - -#include <string> -#include <string_view> - -namespace cru::platform { -std::string ToUtf8String(const std::wstring_view& string); -} diff --git a/include/cru/ui/render/border_render_object.hpp b/include/cru/ui/render/border_render_object.hpp index e21ce34c..5520ab2e 100644 --- a/include/cru/ui/render/border_render_object.hpp +++ b/include/cru/ui/render/border_render_object.hpp @@ -7,7 +7,7 @@ namespace cru::platform::graph { class Brush; -class Geometry; +class IGeometry; } // namespace cru::platform::graph namespace cru::ui::render { @@ -131,11 +131,11 @@ class BorderRenderObject : public RenderObject { std::shared_ptr<platform::graph::Brush> background_brush_; // The ring. Used for painting. - std::unique_ptr<platform::graph::Geometry> geometry_; + std::unique_ptr<platform::graph::IGeometry> geometry_; // Area including inner area of the border. Used for painting foreground and // background. - std::unique_ptr<platform::graph::Geometry> border_inner_geometry_; + std::unique_ptr<platform::graph::IGeometry> border_inner_geometry_; // Area including border ring and inner area. Used for hit test. - std::unique_ptr<platform::graph::Geometry> border_outer_geometry_; + std::unique_ptr<platform::graph::IGeometry> border_outer_geometry_; }; } // namespace cru::ui::render diff --git a/include/cru/ui/window.hpp b/include/cru/ui/window.hpp index f4cdefaa..4f44fed4 100644 --- a/include/cru/ui/window.hpp +++ b/include/cru/ui/window.hpp @@ -9,7 +9,7 @@ #include <vector> namespace cru::platform::native { -class NativeWindow; +class INativeWindow; } namespace cru::ui { @@ -43,7 +43,7 @@ class Window final : public ContentControl, public SelfResolvable<Window> { render::RenderObject* GetRenderObject() const override; - platform::native::NativeWindow* GetNativeWindow() const { + platform::native::INativeWindow* GetNativeWindow() const { return native_window_; } @@ -112,7 +112,7 @@ class Window final : public ContentControl, public SelfResolvable<Window> { void UpdateCursor(); private: - platform::native::NativeWindow* native_window_; + platform::native::INativeWindow* native_window_; std::vector<EventRevokerGuard> event_revoker_guards_; std::shared_ptr<render::WindowRenderObject> render_object_; diff --git a/include/cru/win/graph/direct/brush.hpp b/include/cru/win/graph/direct/brush.hpp index 1f1c319f..0726ec3f 100644 --- a/include/cru/win/graph/direct/brush.hpp +++ b/include/cru/win/graph/direct/brush.hpp @@ -1,44 +1,39 @@ #pragma once #include "com_resource.hpp" -#include "direct_factory.hpp" -#include "platform_id.hpp" +#include "resource.hpp" #include "cru/platform/graph/brush.hpp" namespace cru::platform::graph::win::direct { -struct ID2DBrush { - virtual ~ID2DBrush() = default; - +struct ID2DBrush : virtual IBrush { virtual ID2D1Brush* GetD2DBrushInterface() const = 0; }; -class D2DSolidColorBrush : public SolidColorBrush, - public ID2DBrush, - public IComResource<ID2D1SolidColorBrush> { +class D2DSolidColorBrush : public DirectGraphResource, + public virtual ISolidColorBrush, + public virtual ID2DBrush, + public virtual IComResource<ID2D1SolidColorBrush> { public: - explicit D2DSolidColorBrush(IDirectFactory* factory); - - D2DSolidColorBrush(const D2DSolidColorBrush& other) = delete; - D2DSolidColorBrush& operator=(const D2DSolidColorBrush& other) = delete; + explicit D2DSolidColorBrush(DirectGraphFactory* factory); - D2DSolidColorBrush(D2DSolidColorBrush&& other) = delete; - D2DSolidColorBrush& operator=(D2DSolidColorBrush&& other) = delete; + CRU_DELETE_COPY(D2DSolidColorBrush) + CRU_DELETE_MOVE(D2DSolidColorBrush) ~D2DSolidColorBrush() override = default; - CRU_PLATFORMID_IMPLEMENT_DIRECT - public: + Color GetColor() override { return color_; } + void SetColor(const Color& color) override; + ID2D1Brush* GetD2DBrushInterface() const override { return brush_.Get(); } ID2D1SolidColorBrush* GetComInterface() const override { return brush_.Get(); } - protected: - void OnSetColor(const Color& color) override; - private: + Color color_ = colors::black; + Microsoft::WRL::ComPtr<ID2D1SolidColorBrush> brush_; }; } // namespace cru::platform::graph::win::direct diff --git a/include/cru/win/graph/direct/com_resource.hpp b/include/cru/win/graph/direct/com_resource.hpp index 22d1d6f0..a6c83434 100644 --- a/include/cru/win/graph/direct/com_resource.hpp +++ b/include/cru/win/graph/direct/com_resource.hpp @@ -1,11 +1,11 @@ #pragma once #include "../../win_pre_config.hpp" -namespace cru::platform::graph::win::direct { -template<typename TInterface> -struct IComResource { - virtual ~IComResource() = default; +#include "cru/common/base.hpp" +namespace cru::platform::graph::win::direct { +template <typename TInterface> +struct IComResource : virtual Interface { virtual TInterface* GetComInterface() const = 0; }; -} // namespace cru::platform::graph::win_direct +} // namespace cru::platform::graph::win::direct diff --git a/include/cru/win/graph/direct/convert_util.hpp b/include/cru/win/graph/direct/convert_util.hpp index 2c45c63a..ef343a3f 100644 --- a/include/cru/win/graph/direct/convert_util.hpp +++ b/include/cru/win/graph/direct/convert_util.hpp @@ -1,8 +1,7 @@ #pragma once #include "../../win_pre_config.hpp" -#include "cru/platform/graphic_base.hpp" -#include "cru/platform/matrix.hpp" +#include "cru/platform/graph/base.hpp" namespace cru::platform::graph::win::direct { inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) { @@ -48,7 +47,7 @@ inline platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) { inline Color Convert(const D2D1_COLOR_F& color) { auto floor = [](float n) { return static_cast<std::uint8_t>(n + 0.5f); }; return Color{floor(color.r * 255.0f), floor(color.g * 255.0f), - floor(color.b * 255.0f), floor(color.a * 255.0f)}; + floor(color.b * 255.0f), floor(color.a * 255.0f)}; } inline Point Convert(const D2D1_POINT_2F& point) { @@ -57,12 +56,12 @@ inline Point Convert(const D2D1_POINT_2F& point) { inline Rect Convert(const D2D1_RECT_F& rect) { return Rect(rect.left, rect.top, rect.right - rect.left, - rect.bottom - rect.top); + rect.bottom - rect.top); } inline RoundedRect Convert(const D2D1_ROUNDED_RECT& rounded_rect) { return RoundedRect(Convert(rounded_rect.rect), rounded_rect.radiusX, - rounded_rect.radiusY); + rounded_rect.radiusY); } inline Ellipse Convert(const D2D1_ELLIPSE& ellipse) { diff --git a/include/cru/win/graph/direct/direct_factory.hpp b/include/cru/win/graph/direct/direct_factory.hpp deleted file mode 100644 index b150d5aa..00000000 --- a/include/cru/win/graph/direct/direct_factory.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once -#include "../../win_pre_config.hpp" - -namespace cru::platform::graph::win::direct { -// Interface provides access to root d2d resources. -struct IDirectFactory { - virtual ~IDirectFactory() = default; - - virtual ID2D1Factory1* GetD2D1Factory() const = 0; - virtual ID2D1DeviceContext* GetD2D1DeviceContext() const = 0; - virtual ID3D11Device* GetD3D11Device() const = 0; - virtual IDXGIFactory2* GetDxgiFactory() const = 0; - virtual IDWriteFactory* GetDWriteFactory() const = 0; - virtual IDWriteFontCollection* GetSystemFontCollection() const = 0; -}; -} // namespace cru::platform::graph::win::direct diff --git a/include/cru/win/graph/direct/factory.hpp b/include/cru/win/graph/direct/factory.hpp new file mode 100644 index 00000000..ae4eeb3a --- /dev/null +++ b/include/cru/win/graph/direct/factory.hpp @@ -0,0 +1,48 @@ +#pragma once +#include "resource.hpp" + +#include "cru/platform/graph/factory.hpp" + +namespace cru::platform::graph::win::direct { +class DirectGraphFactory : public DirectResource, public virtual IGraphFactory { + private: + DirectGraphFactory(); + + public: + CRU_DELETE_COPY(DirectGraphFactory) + CRU_DELETE_MOVE(DirectGraphFactory) + + ~DirectGraphFactory() override = default; + + public: + ID2D1Factory1* GetD2D1Factory() const { return d2d1_factory_.Get(); } + ID2D1DeviceContext* GetD2D1DeviceContext() const { + return d2d1_device_context_.Get(); + } + ID3D11Device* GetD3D11Device() const { return d3d11_device_.Get(); } + IDXGIFactory2* GetDxgiFactory() const { return dxgi_factory_.Get(); } + IDWriteFactory* GetDWriteFactory() const { return dwrite_factory_.Get(); } + IDWriteFontCollection* GetSystemFontCollection() const { + return dwrite_system_font_collection_.Get(); + } + + public: + std::unique_ptr<ISolidColorBrush> CreateSolidColorBrush() override; + + std::unique_ptr<IGeometryBuilder> CreateGeometryBuilder() override; + + std::unique_ptr<IFont> CreateFont(const std::string_view& font_family, + float font_size) override; + + std::unique_ptr<ITextLayout> CreateTextLayout(std::shared_ptr<IFont> font, + std::string text) override; + + private: + Microsoft::WRL::ComPtr<ID3D11Device> d3d11_device_; + Microsoft::WRL::ComPtr<ID2D1Factory1> d2d1_factory_; + Microsoft::WRL::ComPtr<ID2D1DeviceContext> d2d1_device_context_; + Microsoft::WRL::ComPtr<IDXGIFactory2> dxgi_factory_; + Microsoft::WRL::ComPtr<IDWriteFactory> dwrite_factory_; + Microsoft::WRL::ComPtr<IDWriteFontCollection> dwrite_system_font_collection_; +}; +} // namespace cru::platform::graph::win::direct diff --git a/include/cru/win/graph/direct/font.hpp b/include/cru/win/graph/direct/font.hpp index d3376503..08213ca5 100644 --- a/include/cru/win/graph/direct/font.hpp +++ b/include/cru/win/graph/direct/font.hpp @@ -1,31 +1,28 @@ #pragma once #include "com_resource.hpp" -#include "direct_factory.hpp" -#include "platform_id.hpp" +#include "resource.hpp" #include "cru/platform/graph/font.hpp" #include <string_view> namespace cru::platform::graph::win::direct { - -class DWriteFont : public Font, public IComResource<IDWriteTextFormat> { +class DWriteFont : public DirectGraphResource, + public virtual IFont, + public virtual IComResource<IDWriteTextFormat> { public: - DWriteFont(IDirectFactory* factory, const std::wstring_view& font_family, + DWriteFont(DirectGraphFactory* factory, const std::string_view& font_family, float font_size); - DWriteFont(const DWriteFont& other) = delete; - DWriteFont& operator=(const DWriteFont& other) = delete; - - DWriteFont(DWriteFont&& other) = delete; - DWriteFont& operator=(DWriteFont&& other) = delete; + CRU_DELETE_COPY(DWriteFont) + CRU_DELETE_MOVE(DWriteFont) ~DWriteFont() override = default; - CRU_PLATFORMID_IMPLEMENT_DIRECT - public: - IDWriteTextFormat* GetComInterface() const override { return text_format_.Get(); } + IDWriteTextFormat* GetComInterface() const override { + return text_format_.Get(); + } private: Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_; diff --git a/include/cru/win/graph/direct/geometry.hpp b/include/cru/win/graph/direct/geometry.hpp index 1ee60247..086b31cc 100644 --- a/include/cru/win/graph/direct/geometry.hpp +++ b/include/cru/win/graph/direct/geometry.hpp @@ -1,26 +1,20 @@ #pragma once #include "com_resource.hpp" -#include "direct_factory.hpp" -#include "platform_id.hpp" +#include "resource.hpp" -#include "cru/platform/exception.hpp" #include "cru/platform/graph/geometry.hpp" namespace cru::platform::graph::win::direct { -class D2DGeometryBuilder : public GeometryBuilder { +class D2DGeometryBuilder : public DirectGraphResource, + public virtual IGeometryBuilder { public: - explicit D2DGeometryBuilder(IDirectFactory* factory); + explicit D2DGeometryBuilder(DirectGraphFactory* factory); - D2DGeometryBuilder(const D2DGeometryBuilder& other) = delete; - D2DGeometryBuilder& operator=(const D2DGeometryBuilder& other) = delete; - - D2DGeometryBuilder(D2DGeometryBuilder&& other) = delete; - D2DGeometryBuilder& operator=(D2DGeometryBuilder&& other) = delete; + CRU_DELETE_COPY(D2DGeometryBuilder) + CRU_DELETE_MOVE(D2DGeometryBuilder) ~D2DGeometryBuilder() override = default; - CRU_PLATFORMID_IMPLEMENT_DIRECT - public: void BeginFigure(const Point& point) override; void LineTo(const Point& point) override; @@ -28,34 +22,29 @@ class D2DGeometryBuilder : public GeometryBuilder { const Point& end_point) override; void CloseFigure(bool close) override; - Geometry* Build() override; + std::unique_ptr<IGeometry> Build() override; private: bool IsValid() { return geometry_ != nullptr; } - void CheckValidation() { - if (!IsValid()) - throw ReuseException("The geometry builder is already disposed."); - } + void CheckValidation(); private: Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry_; Microsoft::WRL::ComPtr<ID2D1GeometrySink> geometry_sink_; }; -class D2DGeometry : public Geometry, public IComResource<ID2D1Geometry> { +class D2DGeometry : public DirectGraphResource, + public virtual IGeometry, + public IComResource<ID2D1Geometry> { public: - explicit D2DGeometry(Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry); + D2DGeometry(DirectGraphFactory* factory, + Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry); - D2DGeometry(const D2DGeometry& other) = delete; - D2DGeometry& operator=(const D2DGeometry& other) = delete; - - D2DGeometry(D2DGeometry&& other) = delete; - D2DGeometry& operator=(D2DGeometry&& other) = delete; + CRU_DELETE_COPY(D2DGeometry) + CRU_DELETE_MOVE(D2DGeometry) ~D2DGeometry() override = default; - CRU_PLATFORMID_IMPLEMENT_DIRECT - public: ID2D1Geometry* GetComInterface() const override { return geometry_.Get(); } diff --git a/include/cru/win/graph/direct/graph_factory.hpp b/include/cru/win/graph/direct/graph_factory.hpp deleted file mode 100644 index fb26a7c5..00000000 --- a/include/cru/win/graph/direct/graph_factory.hpp +++ /dev/null @@ -1,71 +0,0 @@ -#pragma once -#include "direct_factory.hpp" -#include "platform_id.hpp" - -#include "brush.hpp" -#include "font.hpp" -#include "geometry.hpp" -#include "text_layout.hpp" - -#include "cru/platform/graph/graph_factory.hpp" - -namespace cru::platform::graph::win::direct { -class DirectGraphFactory : public GraphFactory, public IDirectFactory { - friend GraphFactory* GraphFactory::CreateInstance(); - - public: - static DirectGraphFactory* GetInstance(); - - private: - DirectGraphFactory(); - - public: - DirectGraphFactory(const DirectGraphFactory& other) = delete; - DirectGraphFactory& operator=(const DirectGraphFactory& other) = delete; - - DirectGraphFactory(DirectGraphFactory&& other) = delete; - DirectGraphFactory& operator=(DirectGraphFactory&& other) = delete; - - ~DirectGraphFactory() override; - - CRU_PLATFORMID_IMPLEMENT_DIRECT - - public: - ID2D1Factory1* GetD2D1Factory() const override { return d2d1_factory_.Get(); } - ID2D1DeviceContext* GetD2D1DeviceContext() const override { - return d2d1_device_context_.Get(); - } - ID3D11Device* GetD3D11Device() const override { return d3d11_device_.Get(); } - IDXGIFactory2* GetDxgiFactory() const override { return dxgi_factory_.Get(); } - IDWriteFactory* GetDWriteFactory() const override { - return dwrite_factory_.Get(); - } - IDWriteFontCollection* GetSystemFontCollection() const override { - return dwrite_system_font_collection_.Get(); - } - - public: - D2DSolidColorBrush* CreateSolidColorBrush() override; - - D2DGeometryBuilder* CreateGeometryBuilder() override; - - DWriteFont* CreateFont(const std::wstring_view& font_family, - float font_size) override; - - DWriteTextLayout* CreateTextLayout(std::shared_ptr<Font> font, - std::wstring text) override; - - bool IsAutoDelete() const override { return auto_delete_; } - void SetAutoDelete(bool value) override { auto_delete_ = value; } - - private: - bool auto_delete_ = false; - - Microsoft::WRL::ComPtr<ID3D11Device> d3d11_device_; - Microsoft::WRL::ComPtr<ID2D1Factory1> d2d1_factory_; - Microsoft::WRL::ComPtr<ID2D1DeviceContext> d2d1_device_context_; - Microsoft::WRL::ComPtr<IDXGIFactory2> dxgi_factory_; - Microsoft::WRL::ComPtr<IDWriteFactory> dwrite_factory_; - Microsoft::WRL::ComPtr<IDWriteFontCollection> dwrite_system_font_collection_; -}; -} // namespace cru::platform::graph::win::direct diff --git a/include/cru/win/graph/direct/painter.hpp b/include/cru/win/graph/direct/painter.hpp index d8791c7f..5a1fe03f 100644 --- a/include/cru/win/graph/direct/painter.hpp +++ b/include/cru/win/graph/direct/painter.hpp @@ -1,24 +1,21 @@ #pragma once #include "com_resource.hpp" -#include "platform_id.hpp" +#include "resource.hpp" #include "cru/platform/graph/painter.hpp" namespace cru::platform::graph::win::direct { -class D2DPainter : public Painter, public IComResource<ID2D1RenderTarget> { +class D2DPainter : public DirectResource, + public virtual IPainter, + public virtual IComResource<ID2D1RenderTarget> { public: explicit D2DPainter(ID2D1RenderTarget* render_target); - D2DPainter(const D2DPainter& other) = delete; - D2DPainter& operator=(const D2DPainter& other) = delete; - - D2DPainter(D2DPainter&& other) = delete; - D2DPainter& operator=(D2DPainter&& other) = delete; + CRU_DELETE_COPY(D2DPainter) + CRU_DELETE_MOVE(D2DPainter) ~D2DPainter() override = default; - CRU_PLATFORMID_IMPLEMENT_DIRECT - public: ID2D1RenderTarget* GetComInterface() const override { return render_target_; } @@ -28,15 +25,15 @@ class D2DPainter : public Painter, public IComResource<ID2D1RenderTarget> { void Clear(const Color& color) override; - void StrokeRectangle(const Rect& rectangle, Brush* brush, + void StrokeRectangle(const Rect& rectangle, IBrush* brush, float width) override; - void FillRectangle(const Rect& rectangle, Brush* brush) override; + void FillRectangle(const Rect& rectangle, IBrush* brush) override; - void StrokeGeometry(Geometry* geometry, Brush* brush, float width) override; - void FillGeometry(Geometry* geometry, Brush* brush) override; + void StrokeGeometry(IGeometry* geometry, IBrush* brush, float width) override; + void FillGeometry(IGeometry* geometry, IBrush* brush) override; - void DrawText(const Point& offset, TextLayout* text_layout, - Brush* brush) override; + void DrawText(const Point& offset, ITextLayout* text_layout, + IBrush* brush) override; void EndDraw() override final; @@ -45,6 +42,7 @@ class D2DPainter : public Painter, public IComResource<ID2D1RenderTarget> { private: bool IsValid() { return is_drawing_; } + void CheckValidation(); private: ID2D1RenderTarget* render_target_; diff --git a/include/cru/win/graph/direct/platform_id.hpp b/include/cru/win/graph/direct/platform_id.hpp deleted file mode 100644 index edac38f1..00000000 --- a/include/cru/win/graph/direct/platform_id.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include <cru/platform/native_resource.hpp> - -#include <string_view> - -namespace cru::platform::graph::win::direct { -constexpr std::wstring_view win_direct_platform_id = L"Windows Direct"; - -inline bool IsDirectResource(NativeResource* resource) { - return resource->GetPlatformId() == win_direct_platform_id; -} - -} // namespace cru::platform::graph::win::direct - -#define CRU_PLATFORMID_IMPLEMENT_DIRECT \ - std::wstring_view GetPlatformId() const override { \ - return ::cru::platform::graph::win::direct::win_direct_platform_id; \ - } diff --git a/include/cru/win/graph/direct/resource.hpp b/include/cru/win/graph/direct/resource.hpp new file mode 100644 index 00000000..94a91a40 --- /dev/null +++ b/include/cru/win/graph/direct/resource.hpp @@ -0,0 +1,49 @@ +#pragma once +#include "../../win_pre_config.hpp" + +#include "cru/platform/graph/resource.hpp" + +#include <string_view> + +namespace cru::platform::graph::win::direct { +class DirectGraphFactory; + +class DirectResource : public Object, public virtual INativeResource { + public: + static constexpr std::string_view k_platform_id = "Windows Direct"; + + protected: + DirectResource() = default; + + public: + CRU_DELETE_COPY(DirectResource) + CRU_DELETE_MOVE(DirectResource) + + ~DirectResource() override = default; + + public: + std::string_view GetPlatformId() const final { return k_platform_id; } +}; + +class DirectGraphResource : public DirectResource, + public virtual IGraphResource { + protected: + // Param factory can't be null. + explicit DirectGraphResource(DirectGraphFactory* factory); + + public: + CRU_DELETE_COPY(DirectGraphResource) + CRU_DELETE_MOVE(DirectGraphResource) + + ~DirectGraphResource() override = default; + + public: + IGraphFactory* GetGraphFactory() final; + + public: + DirectGraphFactory* GetDirectFactory() const { return factory_; } + + private: + DirectGraphFactory* factory_; +}; +} // namespace cru::platform::graph::win::direct diff --git a/include/cru/win/graph/direct/text_layout.hpp b/include/cru/win/graph/direct/text_layout.hpp index a20591c2..5a8f3f9c 100644 --- a/include/cru/win/graph/direct/text_layout.hpp +++ b/include/cru/win/graph/direct/text_layout.hpp @@ -1,30 +1,25 @@ #pragma once #include "com_resource.hpp" -#include "direct_factory.hpp" -#include "platform_id.hpp" +#include "resource.hpp" #include "cru/platform/graph/text_layout.hpp" -#include "font.hpp" - #include <memory> namespace cru::platform::graph::win::direct { -class DWriteTextLayout : public TextLayout, - public IComResource<IDWriteTextLayout> { - public: - explicit DWriteTextLayout(IDirectFactory* factory, std::shared_ptr<Font> font, - std::wstring text); +class DWriteFont; - DWriteTextLayout(const DWriteTextLayout& other) = delete; - DWriteTextLayout& operator=(const DWriteTextLayout& other) = delete; - - DWriteTextLayout(DWriteTextLayout&& other) = delete; - DWriteTextLayout& operator=(DWriteTextLayout&& other) = delete; +class DWriteTextLayout : public DirectGraphResource, + public virtual ITextLayout, + public virtual IComResource<IDWriteTextLayout> { + public: + DWriteTextLayout(DirectGraphFactory* factory, std::shared_ptr<IFont> font, + std::string text); - ~DWriteTextLayout() override = default; + CRU_DELETE_COPY(DWriteTextLayout) + CRU_DELETE_MOVE(DWriteTextLayout) - CRU_PLATFORMID_IMPLEMENT_DIRECT + ~DWriteTextLayout() override; public: IDWriteTextLayout* GetComInterface() const override { @@ -32,11 +27,11 @@ class DWriteTextLayout : public TextLayout, } public: - std::wstring GetText() override; - void SetText(std::wstring new_text) override; + std::string GetText() override; + void SetText(std::string new_text) override; - std::shared_ptr<Font> GetFont() override; - void SetFont(std::shared_ptr<Font> font) override; + std::shared_ptr<IFont> GetFont() override; + void SetFont(std::shared_ptr<IFont> font) override; void SetMaxWidth(float max_width) override; void SetMaxHeight(float max_height) override; @@ -45,8 +40,8 @@ class DWriteTextLayout : public TextLayout, std::vector<Rect> TextRangeRect(const TextRange& text_range) override; private: - IDirectFactory* factory_; - std::wstring text_; + std::string text_; + std::wstring w_text_; std::shared_ptr<DWriteFont> font_; float max_width_ = 0.0f; float max_height_ = 0.0f; diff --git a/include/cru/win/native/native_window.hpp b/include/cru/win/native/native_window.hpp index cba5cc3e..16b14dbf 100644 --- a/include/cru/win/native/native_window.hpp +++ b/include/cru/win/native/native_window.hpp @@ -13,7 +13,7 @@ class WindowClass; class WindowManager; class WindowRenderTarget; -class WinNativeWindow : public NativeWindow { +class WinNativeWindow : public INativeWindow { public: WinNativeWindow(WinUiApplication* application, std::shared_ptr<WindowClass> window_class, DWORD window_style, diff --git a/include/cru/win/native/platform_id.hpp b/include/cru/win/native/platform_id.hpp deleted file mode 100644 index e1899ad4..00000000 --- a/include/cru/win/native/platform_id.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once -#include <cru/platform/native_resource.hpp> - -#include <stdexcept> -#include <string_view> - -namespace cru::platform::native::win { -constexpr std::wstring_view win_platform_id = L"Windows"; - -inline bool IsWindowsResource(NativeResource* resource) { - return resource->GetPlatformId() == win_platform_id; -} - -} // namespace cru::platform::native::win - -#define CRU_PLATFORMID_IMPLEMENT_WIN \ - std::wstring_view GetPlatformId() const override { \ - return ::cru::platform::native::win::win_platform_id; \ - } diff --git a/include/cru/win/native/ui_application.hpp b/include/cru/win/native/ui_application.hpp index addf2c93..94c4b1eb 100644 --- a/include/cru/win/native/ui_application.hpp +++ b/include/cru/win/native/ui_application.hpp @@ -44,8 +44,8 @@ class WinUiApplication : public UiApplication { const std::function<void()>& action) override; void CancelTimer(unsigned long id) override; - std::vector<NativeWindow*> GetAllWindow() override; - NativeWindow* CreateWindow(NativeWindow* parent) override; + std::vector<INativeWindow*> GetAllWindow() override; + INativeWindow* CreateWindow(INativeWindow* parent) override; WinCursorManager* GetCursorManager() override; diff --git a/include/cru/win/string.hpp b/include/cru/win/string.hpp new file mode 100644 index 00000000..7a12e47e --- /dev/null +++ b/include/cru/win/string.hpp @@ -0,0 +1,10 @@ +#pragma once +#include "win_pre_config.hpp" + +#include <string> +#include <string_view> + +namespace cru::platform::win { +std::string ToUtf8String(const std::wstring_view& string); +std::wstring ToUtf16String(const std::string_view& string); +} |