aboutsummaryrefslogtreecommitdiff
path: root/include/cru
diff options
context:
space:
mode:
Diffstat (limited to 'include/cru')
-rw-r--r--include/cru/base/Exception.h1
-rw-r--r--include/cru/base/StringUtil.h5
-rw-r--r--include/cru/base/platform/win/Exception.h7
-rw-r--r--include/cru/base/platform/win/Win32FileStream.h7
-rw-r--r--include/cru/platform/graphics/direct2d/Factory.h4
-rw-r--r--include/cru/platform/graphics/direct2d/Font.h6
-rw-r--r--include/cru/platform/graphics/direct2d/Resource.h4
-rw-r--r--include/cru/platform/graphics/direct2d/TextLayout.h9
-rw-r--r--include/cru/platform/gui/win/Clipboard.h4
-rw-r--r--include/cru/platform/gui/win/GodWindow.h1
-rw-r--r--include/cru/platform/gui/win/InputMethod.h6
-rw-r--r--include/cru/platform/gui/win/Resource.h4
-rw-r--r--include/cru/platform/gui/win/Window.h7
-rw-r--r--include/cru/toml/TomlDocument.h1
14 files changed, 34 insertions, 32 deletions
diff --git a/include/cru/base/Exception.h b/include/cru/base/Exception.h
index e4da91f5..c45cdc58 100644
--- a/include/cru/base/Exception.h
+++ b/include/cru/base/Exception.h
@@ -4,6 +4,7 @@
#include <exception>
#include <optional>
#include <string_view>
+#include <string>
namespace cru {
#ifdef _MSC_VER
diff --git a/include/cru/base/StringUtil.h b/include/cru/base/StringUtil.h
index 8c7841d7..a69bb884 100644
--- a/include/cru/base/StringUtil.h
+++ b/include/cru/base/StringUtil.h
@@ -380,4 +380,9 @@ Index Utf8IndexCodeUnitToCodePoint(const Utf8CodeUnit* ptr, Index size, Index po
Index Utf8IndexCodePointToCodeUnit(const Utf8CodeUnit* ptr, Index size, Index position);
Index Utf16IndexCodeUnitToCodePoint(const Utf16CodeUnit* ptr, Index size, Index position);
Index Utf16IndexCodePointToCodeUnit(const Utf16CodeUnit* ptr, Index size, Index position);
+
+#ifdef _WIN32
+std::wstring ToUtf16(std::string_view str);
+std::string ToUtf8(std::wstring_view str);
+#endif
} // namespace cru::string
diff --git a/include/cru/base/platform/win/Exception.h b/include/cru/base/platform/win/Exception.h
index 12f3d108..21851bb9 100644
--- a/include/cru/base/platform/win/Exception.h
+++ b/include/cru/base/platform/win/Exception.h
@@ -8,9 +8,6 @@
#include "../../Exception.h"
-#include <stdexcept>
-#include <string_view>
-
namespace cru::platform::win {
class CRU_BASE_API HResultError : public Exception {
public:
@@ -35,8 +32,8 @@ class CRU_BASE_API Win32Error : public Exception {
public:
// ::GetLastError is automatically called to get the error code.
// The same as Win32Error(::GetLastError(), message)
- explicit Win32Error(String message);
- Win32Error(DWORD error_code, String message);
+ explicit Win32Error(std::string_view message);
+ Win32Error(DWORD error_code, std::string_view message);
DWORD GetErrorCode() const { return error_code_; }
diff --git a/include/cru/base/platform/win/Win32FileStream.h b/include/cru/base/platform/win/Win32FileStream.h
index 61f1a33d..d0339b11 100644
--- a/include/cru/base/platform/win/Win32FileStream.h
+++ b/include/cru/base/platform/win/Win32FileStream.h
@@ -2,7 +2,6 @@
#ifdef CRU_PLATFORM_WINDOWS
-#include "../../String.h"
#include "../../io/OpenFileFlag.h"
#include "../../io/Stream.h"
@@ -13,7 +12,7 @@ class Win32FileStreamPrivate;
class CRU_BASE_API Win32FileStream : public io::Stream {
public:
- Win32FileStream(String path, io::OpenFileFlag flags);
+ Win32FileStream(std::string path, io::OpenFileFlag flags);
~Win32FileStream() override;
protected:
@@ -22,7 +21,7 @@ class CRU_BASE_API Win32FileStream : public io::Stream {
Index DoWrite(const std::byte* buffer, Index offset, Index size) override;
public:
- String GetPath() const { return path_; }
+ std::string GetPath() const { return path_; }
io::OpenFileFlag GetOpenFileFlags() const { return flags_; }
details::Win32FileStreamPrivate* GetPrivate_() { return p_; }
@@ -33,7 +32,7 @@ class CRU_BASE_API Win32FileStream : public io::Stream {
void DoClose();
private:
- String path_;
+ std::string path_;
io::OpenFileFlag flags_;
details::Win32FileStreamPrivate* p_;
diff --git a/include/cru/platform/graphics/direct2d/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h
index 7abdc31f..e96950fd 100644
--- a/include/cru/platform/graphics/direct2d/Factory.h
+++ b/include/cru/platform/graphics/direct2d/Factory.h
@@ -44,11 +44,11 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory
std::unique_ptr<IGeometryBuilder> CreateGeometryBuilder() override;
- std::unique_ptr<IFont> CreateFont(String font_family,
+ std::unique_ptr<IFont> CreateFont(std::string font_family,
float font_size) override;
std::unique_ptr<ITextLayout> CreateTextLayout(std::shared_ptr<IFont> font,
- String text) override;
+ std::string text) override;
IImageFactory* GetImageFactory() override;
diff --git a/include/cru/platform/graphics/direct2d/Font.h b/include/cru/platform/graphics/direct2d/Font.h
index 841a57b5..86576592 100644
--- a/include/cru/platform/graphics/direct2d/Font.h
+++ b/include/cru/platform/graphics/direct2d/Font.h
@@ -12,7 +12,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont
public virtual IFont,
public virtual IComResource<IDWriteTextFormat> {
public:
- DWriteFont(DirectGraphicsFactory* factory, String font_family,
+ DWriteFont(DirectGraphicsFactory* factory, std::string font_family,
float font_size);
CRU_DELETE_COPY(DWriteFont)
@@ -25,11 +25,11 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont
return text_format_.Get();
}
- String GetFontName() override;
+ std::string GetFontName() override;
float GetFontSize() override;
private:
- String font_family_;
+ std::string font_family_;
Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_;
};
} // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h
index 6d2f968c..63459294 100644
--- a/include/cru/platform/graphics/direct2d/Resource.h
+++ b/include/cru/platform/graphics/direct2d/Resource.h
@@ -12,7 +12,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectResource
: public Object,
public virtual IPlatformResource {
public:
- static String kPlatformId;
+ static std::string kPlatformId;
protected:
DirectResource() = default;
@@ -24,7 +24,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectResource
~DirectResource() override = default;
public:
- String GetPlatformId() const final { return kPlatformId; }
+ std::string GetPlatformId() const final { return kPlatformId; }
};
class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource
diff --git a/include/cru/platform/graphics/direct2d/TextLayout.h b/include/cru/platform/graphics/direct2d/TextLayout.h
index 9f2e75a9..a41c3c6c 100644
--- a/include/cru/platform/graphics/direct2d/TextLayout.h
+++ b/include/cru/platform/graphics/direct2d/TextLayout.h
@@ -16,7 +16,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout
public virtual IComResource<IDWriteTextLayout> {
public:
DWriteTextLayout(DirectGraphicsFactory* factory, std::shared_ptr<IFont> font,
- String text);
+ std::string text);
CRU_DELETE_COPY(DWriteTextLayout)
CRU_DELETE_MOVE(DWriteTextLayout)
@@ -29,8 +29,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout
}
public:
- String GetText() override;
- void SetText(String new_text) override;
+ std::string GetText() override;
+ void SetText(std::string new_text) override;
std::shared_ptr<IFont> GetFont() override;
void SetFont(std::shared_ptr<IFont> font) override;
@@ -54,7 +54,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout
private:
bool edit_mode_ = false;
- String text_;
+ std::string text_;
+ std::wstring utf16_text_;
std::shared_ptr<DWriteFont> font_;
float max_width_ = std::numeric_limits<float>::max();
float max_height_ = std::numeric_limits<float>::max();
diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h
index ebaa3f4f..50a3aeea 100644
--- a/include/cru/platform/gui/win/Clipboard.h
+++ b/include/cru/platform/gui/win/Clipboard.h
@@ -16,8 +16,8 @@ class WinClipboard : public WinNativeResource, public virtual IClipboard {
~WinClipboard() override;
public:
- String GetText() override;
- void SetText(String text) override;
+ std::string GetText() override;
+ void SetText(std::string text) override;
private:
WinUiApplication* application_;
diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h
index 05f9a13d..ceb6fe2d 100644
--- a/include/cru/platform/gui/win/GodWindow.h
+++ b/include/cru/platform/gui/win/GodWindow.h
@@ -3,7 +3,6 @@
#include "WindowNativeMessageEventArgs.h"
#include "cru/base/Event.h"
-#include "cru/base/String.h"
#include <memory>
diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h
index 565a4cd0..a69490c7 100644
--- a/include/cru/platform/gui/win/InputMethod.h
+++ b/include/cru/platform/gui/win/InputMethod.h
@@ -66,12 +66,12 @@ class CRU_WIN_GUI_API WinInputMethodContext
IEvent<std::nullptr_t>* CompositionEvent() override;
- IEvent<StringView>* TextEvent() override;
+ IEvent<std::string>* TextEvent() override;
private:
void OnWindowNativeMessage(WindowNativeMessageEventArgs& args);
- String GetResultString();
+ std::string GetResultString();
AutoHIMC GetHIMC();
@@ -83,6 +83,6 @@ class CRU_WIN_GUI_API WinInputMethodContext
Event<std::nullptr_t> composition_start_event_;
Event<std::nullptr_t> composition_end_event_;
Event<std::nullptr_t> composition_event_;
- Event<StringView> text_event_;
+ Event<std::string> text_event_;
};
} // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/Resource.h b/include/cru/platform/gui/win/Resource.h
index ed43bec3..16cde194 100644
--- a/include/cru/platform/gui/win/Resource.h
+++ b/include/cru/platform/gui/win/Resource.h
@@ -7,7 +7,7 @@ namespace cru::platform::gui::win {
class CRU_WIN_GUI_API WinNativeResource : public Object,
public virtual IPlatformResource {
public:
- static String kPlatformId;
+ static std::string kPlatformId;
protected:
WinNativeResource() = default;
@@ -19,6 +19,6 @@ class CRU_WIN_GUI_API WinNativeResource : public Object,
~WinNativeResource() override = default;
public:
- String GetPlatformId() const final { return kPlatformId; }
+ std::string GetPlatformId() const final { return kPlatformId; }
};
} // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h
index 74d58228..cd720fbd 100644
--- a/include/cru/platform/gui/win/Window.h
+++ b/include/cru/platform/gui/win/Window.h
@@ -2,7 +2,6 @@
#include "Resource.h"
#include "WindowNativeMessageEventArgs.h"
-#include "cru/platform/gui/Base.h"
#include "cru/platform/gui/Window.h"
#include "cru/platform/graphics/direct2d/WindowRenderTarget.h"
@@ -30,8 +29,8 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
WindowStyleFlag GetStyleFlag() override { return style_flag_; }
void SetStyleFlag(WindowStyleFlag flag) override;
- String GetTitle() override;
- void SetTitle(String title) override;
+ std::string GetTitle() override;
+ void SetTitle(std::string title) override;
WindowVisibilityType GetVisibility() override { return visibility_; }
void SetVisibility(WindowVisibilityType visibility) override;
@@ -181,7 +180,7 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
WindowStyleFlag style_flag_{};
WindowVisibilityType visibility_ = WindowVisibilityType::Hide;
Rect client_rect_{100, 100, 400, 300};
- String title_;
+ std::string title_;
HWND hwnd_ = nullptr;
WinNativeWindow* parent_window_ = nullptr;
diff --git a/include/cru/toml/TomlDocument.h b/include/cru/toml/TomlDocument.h
index 4cd3ab3e..22442096 100644
--- a/include/cru/toml/TomlDocument.h
+++ b/include/cru/toml/TomlDocument.h
@@ -6,6 +6,7 @@
#include <optional>
#include <unordered_map>
+#include <string>
namespace cru::toml {
class CRU_TOML_API TomlSection {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-21 23:59:37 +0000