mirror of
https://github.com/zhenyan121/Cubed.git
synced 2026-08-08 17:57:02 +08:00
feature: chat (#36)
* fix(config): load config on demand in get/set instead of asserting * feat(chat): implement in-game chat box with UTF-8 support - Add ChatMessage struct and ChatBox widget for displaying and sending messages - Introduce split_utf8() in text_tools for splitting UTF-8 strings by character count - Add TimeTools utility (get_time_ticks) for message timestamps - Update TextField with start_typing/stop_typing methods and set_typing() - Integrate text input handling in WorldScene and WorldUIManager for chat - Add utf8cpp library for robust UTF-8 validation and processing - Add ChatBox rendering and input logic (src/ui/chat_box.cpp) - Register ChatBox source in CMakeLists.txt - Fix Renderer::render_lable to skip rendering if VAO is null - Update credits to include utf8cpp library * fix(ui): correct chat box layout with dynamic height and bottom anchor * feat(chat): implement client-server chat messaging Add protobuf definition for ChatMsg, new packet ID CHAT_MSG (4001), and handle sending/receiving chat messages on both client and server side. Wire up UI components (ChatBox, TextField) to allow message input and display, including a message queue in ClientWorld for thread-safe processing. Also add default initialization for ChatMessage::time. * feat(chat): distinguish between send and cancel in chat input * feat(ui): add background to Label widget and refactor debug overlay * refactor(ui): decouple ChatBox from image dependencies, allow custom TextField backgrounds TextField's background is now a generic `Widget` pointer, enabling use of any widget (e.g., `Rect`, `Image`) as background. `ChatBox` no longer creates its own `TextField`; it accepts one via `set_text_field`. Removed `set_d_image` and `set_default_image` in favor of `set_background`. Added a shared default image constant in `default_image.hpp`. Updated `host_game_ui.cpp`, `join_game_ui.cpp`, and `world_ui_manager.cpp` to construct backgrounds accordingly. * refactor(ui): move width, height, and fill properties to base Widget Consolidate width, height, and fill (fill_parent, fill_width, fill_height) into the base Widget class. Replace per-widget set_fill(bool) with set_fill_parent(bool), set_fill_width(bool), and set_fill_height(bool). * refactor(ui): generalize Label background, add ChatBox width method * feat(chat): implement message expiration after 5 seconds * feat(ui): add word wrap for chat messages with font width measurement * feat(audio): implement voice chat using Opus codec Add voice chat support with Opus encoding/decoding, push-to-talk (V key), and new audio recording infrastructure. * feat(audio): implement voice chat with Opus codec and streaming audio source Add AudioStreamSource for continuous PCM playback. Refactor voice send/receive to encode with Opus and stream to a dedicated source instead of per-frame sources. Enable voice transmission over network. * feat(audio): add spatial voice source with underwater effects Update voice source to support spatial positioning, low-pass filter, and reverb effect for underwater immersion. Adjust source pool size and low-pass filter parameter. Correct receive_voice parameter type. * feat(settings): add player voice volume and voice input type options - Add player voice volume slider and voice input type combo in settings UI. - Add localization strings for player voice and voice input types. - Add config overloads for const char* default values. - Implement voice input types (PTT, always, off) in world scene. - Refactor WorldScene member order and add load_config method. - Update audio engine to use player voice volume. - Downgrade some logging to debug. * fix(event): delegate error UI events to each handler Move error UI event check from top of handle_event into each individual event handler (mouse_move, mouse_button, mouse_wheel, key, text_input). Also flatten window resize dispatch: all sub-handlers are called regardless of previous handler return values, and the method always returns false. * feat(chat): add colored system messages for player join/exit * chore(logging): reduce verbosity for audio loading and input events * fix(settings): fix typo in config key "vloume" * feat(ui): add microphone icon when recording voice * feat(voice): limit voice message range to 48 units * chore(logging): downgrade text input log level to debug * feat(credits): add license identifiers and reorganize license files * feat: add sensitive word filter for chat messages Implement AC automaton-based filtering using a sensitive lexicon loaded from a JSON asset file. The filter is applied to both player names and chat messages before broadcasting, and can be toggled via the `sensitive_filter` config option. * feat(server): add config option to disable voice chat * fix: correct utf8 validation, add missing include, remove debug log
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include "Cubed/audio/audio_fade.hpp"
|
||||
#include "Cubed/audio/audio_recording.hpp"
|
||||
#include "Cubed/audio/audio_source.hpp"
|
||||
#include "Cubed/audio/audio_stream_source.hpp"
|
||||
#include "Cubed/audio/sound_manager.hpp"
|
||||
#include "Cubed/audio/source_pool.hpp"
|
||||
#include "Cubed/config.hpp"
|
||||
@@ -10,13 +12,15 @@
|
||||
#include <AL/alc.h>
|
||||
#include <glm/glm.hpp>
|
||||
#include <memory>
|
||||
#include <opus/opus.h>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
namespace Cubed {
|
||||
|
||||
class ClientWorld;
|
||||
class NetworkClient;
|
||||
|
||||
class AudioEngine {
|
||||
|
||||
public:
|
||||
AudioEngine(Config& config);
|
||||
AudioEngine(const AudioEngine&) = delete;
|
||||
@@ -41,11 +45,23 @@ public:
|
||||
|
||||
float& bgm_target_volume();
|
||||
|
||||
void set_client(std::weak_ptr<NetworkClient> client);
|
||||
|
||||
void send_voice(const std::array<int16_t, AudioRecording::FRAME_SAMPLES>&);
|
||||
void receive_voice(std::span<const char> opus, const glm::vec3& pos);
|
||||
|
||||
AudioRecording& audio_recording();
|
||||
const AudioRecording& audio_recording() const;
|
||||
|
||||
private:
|
||||
using FadeMap = std::unordered_map<std::string, AudioFade>;
|
||||
bool m_init{false};
|
||||
ALCdevice* device{nullptr};
|
||||
ALCcontext* context{nullptr};
|
||||
OpusEncoder* m_encoder{nullptr};
|
||||
OpusDecoder* m_decoder{nullptr};
|
||||
AudioRecording m_recording;
|
||||
std::weak_ptr<NetworkClient> m_client;
|
||||
glm::vec3 listener_pos;
|
||||
std::unique_ptr<AudioSource> m_bgm;
|
||||
FadeMap m_fade_map;
|
||||
@@ -56,6 +72,9 @@ private:
|
||||
bool m_underwater = false;
|
||||
float m_music_volume = 1.0f;
|
||||
float m_sfx_volume = 1.0f;
|
||||
float m_player_voice_volume = 1.0f;
|
||||
|
||||
std::unique_ptr<AudioStreamSource> m_voice_source;
|
||||
std::unique_ptr<AudioFilter> m_low_pass_filter;
|
||||
std::unique_ptr<AudioEffect> m_underwater_effect;
|
||||
std::unique_ptr<AudioEffectSlot> m_underwater_slot;
|
||||
|
||||
33
include/Cubed/audio/audio_recording.hpp
Normal file
33
include/Cubed/audio/audio_recording.hpp
Normal file
@@ -0,0 +1,33 @@
|
||||
#pragma once
|
||||
|
||||
#include <alc.h>
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
namespace Cubed {
|
||||
class AudioEngine;
|
||||
class AudioRecording {
|
||||
public:
|
||||
static constexpr int SAMPLE_RATE = 48000;
|
||||
static constexpr int FRAME_MS = 20;
|
||||
static constexpr int FRAME_SAMPLES = SAMPLE_RATE * FRAME_MS / 1000;
|
||||
AudioRecording(AudioEngine& engine);
|
||||
AudioRecording(const AudioRecording&) = delete;
|
||||
AudioRecording(AudioRecording&&) = delete;
|
||||
AudioRecording& operator=(const AudioRecording&) = delete;
|
||||
AudioRecording& operator=(AudioRecording&&) = delete;
|
||||
~AudioRecording();
|
||||
|
||||
void update();
|
||||
|
||||
void init();
|
||||
void start();
|
||||
void stop();
|
||||
bool is_recording() const;
|
||||
|
||||
private:
|
||||
AudioEngine& m_engine;
|
||||
ALCdevice* m_capture = nullptr;
|
||||
bool m_recording = false;
|
||||
void send_voice(const std::array<int16_t, FRAME_SAMPLES>& pcm);
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include <AL/al.h>
|
||||
#include <glm/glm.hpp>
|
||||
#include <memory>
|
||||
namespace Cubed {
|
||||
|
||||
enum class AudioState { INITIAL, PLAYING, PAUSED, STOPPED };
|
||||
@@ -21,8 +22,9 @@ public:
|
||||
void set_pitch(float pitch);
|
||||
void play();
|
||||
void play_2d(const AudioBuffer& buffer);
|
||||
void play_2d(std::unique_ptr<AudioBuffer> buffer);
|
||||
void play_3d(const AudioBuffer& buffer, const glm::vec3& pos);
|
||||
|
||||
void play_3d(std::unique_ptr<AudioBuffer> buffer, const glm::vec3& pos);
|
||||
void stop();
|
||||
void pause();
|
||||
float duration() const;
|
||||
@@ -42,6 +44,8 @@ public:
|
||||
void clear_effect_slot();
|
||||
|
||||
private:
|
||||
std::unique_ptr<AudioBuffer> m_buffer;
|
||||
|
||||
ALuint m_source = 0;
|
||||
float m_target_volume = 1.0f;
|
||||
float m_duration = 0.0f;
|
||||
|
||||
46
include/Cubed/audio/audio_stream_source.hpp
Normal file
46
include/Cubed/audio/audio_stream_source.hpp
Normal file
@@ -0,0 +1,46 @@
|
||||
#pragma once
|
||||
|
||||
#include "Cubed/audio/audio_effect_slot.hpp"
|
||||
#include "Cubed/audio/audio_filter.hpp"
|
||||
#include "glm/ext/vector_float3.hpp"
|
||||
|
||||
#include <al.h>
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
#include <span>
|
||||
#include <vector>
|
||||
|
||||
namespace Cubed {
|
||||
class AudioStreamSource {
|
||||
public:
|
||||
static constexpr int NUM_BUFFERS = 4;
|
||||
AudioStreamSource();
|
||||
AudioStreamSource(const AudioStreamSource&) = delete;
|
||||
AudioStreamSource(AudioStreamSource&&) = delete;
|
||||
AudioStreamSource& operator=(const AudioStreamSource&) = delete;
|
||||
AudioStreamSource& operator=(AudioStreamSource&&) = delete;
|
||||
~AudioStreamSource();
|
||||
|
||||
void push_pcm(std::span<const int16_t> pcm, ALsizei sample_rate);
|
||||
|
||||
void stop();
|
||||
bool is_playing() const;
|
||||
void reset();
|
||||
|
||||
void set_volume(float volume);
|
||||
void set_pitch(float pitch);
|
||||
void set_pos(glm::vec3 pos);
|
||||
void set_filter(const AudioFilter& filter);
|
||||
void clear_filter();
|
||||
void set_effect_slot(const AudioEffectSlot& slot);
|
||||
void clear_effect_slot();
|
||||
|
||||
private:
|
||||
ALuint m_source = 0;
|
||||
std::array<ALuint, NUM_BUFFERS> m_buffers{};
|
||||
std::vector<ALuint> m_free_buffers;
|
||||
bool m_playing = false;
|
||||
|
||||
void unqueue_processed();
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -4,7 +4,7 @@
|
||||
namespace Cubed {
|
||||
class SourcePool {
|
||||
private:
|
||||
std::vector<AudioSource> m_sources;
|
||||
std::vector<std::unique_ptr<AudioSource>> m_sources;
|
||||
|
||||
public:
|
||||
explicit SourcePool(size_t size);
|
||||
@@ -15,9 +15,10 @@ public:
|
||||
SourcePool& operator=(SourcePool&&) = delete;
|
||||
|
||||
void update();
|
||||
[[nodiscard]]
|
||||
AudioSource* acquire();
|
||||
|
||||
std::vector<AudioSource>& sources();
|
||||
std::vector<std::unique_ptr<AudioSource>>& sources();
|
||||
};
|
||||
|
||||
} // namespace Cubed
|
||||
@@ -1,5 +1,4 @@
|
||||
#pragma once
|
||||
#include "Cubed/tools/cubed_assert.hpp"
|
||||
#include "Cubed/tools/toml.utils.hpp"
|
||||
|
||||
namespace Cubed {
|
||||
@@ -20,7 +19,9 @@ public:
|
||||
|
||||
template <TOML::TomlValueType T>
|
||||
T get(std::string_view key, T default_value) {
|
||||
ASSERT(m_init);
|
||||
if (!m_init) {
|
||||
load_config();
|
||||
}
|
||||
if (auto* node = find_node(m_tbl, key)) {
|
||||
if (auto value = node->value<T>())
|
||||
return *value;
|
||||
@@ -32,7 +33,9 @@ public:
|
||||
}
|
||||
|
||||
template <TOML::TomlValueType T> void set(std::string_view key, T&& value) {
|
||||
ASSERT(m_init);
|
||||
if (!m_init) {
|
||||
load_config();
|
||||
}
|
||||
auto pos = key.rfind('.');
|
||||
|
||||
toml::table* table;
|
||||
@@ -54,6 +57,14 @@ public:
|
||||
save_to_file();
|
||||
}
|
||||
|
||||
std::string get(std::string_view key, const char* default_value) {
|
||||
return get(key, std::string(default_value));
|
||||
}
|
||||
|
||||
void set(std::string_view key, const char* val) {
|
||||
set(key, std::string(val));
|
||||
}
|
||||
|
||||
private:
|
||||
toml::table m_tbl;
|
||||
bool m_init = false;
|
||||
|
||||
15
include/Cubed/gameplay/chat_message.hpp
Normal file
15
include/Cubed/gameplay/chat_message.hpp
Normal file
@@ -0,0 +1,15 @@
|
||||
#pragma once
|
||||
|
||||
#include "Cubed/ui/color.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
namespace Cubed {
|
||||
struct ChatMessage {
|
||||
std::string player;
|
||||
std::string text;
|
||||
Color color;
|
||||
bool system_msg = false;
|
||||
uint64_t time = 0;
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "Cubed/audio/audio_engine.hpp"
|
||||
#include "Cubed/config.hpp"
|
||||
#include "Cubed/gameplay/block.hpp"
|
||||
#include "Cubed/gameplay/chat_message.hpp"
|
||||
#include "Cubed/gameplay/chunk_pos.hpp"
|
||||
#include "Cubed/gameplay/client_chunk.hpp"
|
||||
#include "Cubed/gameplay/client_player.hpp"
|
||||
@@ -78,6 +79,7 @@ public:
|
||||
void rendering_distance(int rendering_distance);
|
||||
int get_chunk_task_id() const;
|
||||
void start_client_thread(std::string_view uuid);
|
||||
void receive_login_rsp(LoginRsp& rsp);
|
||||
void stop_client_thread();
|
||||
|
||||
void start_thread_pool();
|
||||
@@ -99,9 +101,15 @@ public:
|
||||
int chunk_size() const;
|
||||
static AABB get_block_aabb(const glm::ivec3& pos);
|
||||
AudioEngine& get_audio();
|
||||
const AudioEngine& get_audio() const;
|
||||
Config& get_config();
|
||||
WorldScene& world_scene();
|
||||
void set_direct_exit();
|
||||
|
||||
void receive_chat_message(ChatMsg& msg);
|
||||
void send_chat_message(ChatMessage& message);
|
||||
void receive_voice_message(VoiceMsg& msg);
|
||||
bool enable_voice_chat() const;
|
||||
template <typename Fn>
|
||||
void register_ticktimer(std::string_view id, TickType threshold, Fn&& f) {
|
||||
m_ticktimers.emplace(
|
||||
@@ -110,6 +118,11 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
struct VoiceMessage {
|
||||
std::string data;
|
||||
glm::vec3 pos;
|
||||
};
|
||||
|
||||
std::atomic<bool> m_is_pending_delete_queue_free{false};
|
||||
std::mutex m_delete_vbo_mutex;
|
||||
std::mutex m_delete_vao_mutex;
|
||||
@@ -147,6 +160,8 @@ private:
|
||||
tbb::concurrent_queue<std::unique_ptr<ClientChunk>> m_pending_upload_queue;
|
||||
tbb::concurrent_queue<ChunkPos> m_dirty_chunk_queue;
|
||||
tbb::concurrent_queue<PendingSound> m_pending_sound;
|
||||
tbb::concurrent_queue<ChatMessage> m_message_queue;
|
||||
tbb::concurrent_queue<VoiceMessage> m_voice_queue;
|
||||
|
||||
std::deque<ChunkPos> m_dirty_queue;
|
||||
std::vector<const ChunkRenderSnapshot*> m_render_snapshots;
|
||||
@@ -163,6 +178,7 @@ private:
|
||||
std::atomic<bool> m_requesting_chunk{false};
|
||||
std::atomic<bool> m_is_rebuilding{false};
|
||||
std::atomic<int> m_chunk_task_id{0};
|
||||
std::atomic<bool> m_voice_chat{true};
|
||||
std::shared_ptr<NetworkClient> m_client;
|
||||
ChunkLoadStyle m_chunk_load_style{ChunkLoadStyle::CENTER};
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ public:
|
||||
bool is_connect_error() const;
|
||||
std::string get_error_string() const;
|
||||
void clear_error();
|
||||
ClientWorld& world();
|
||||
|
||||
private:
|
||||
struct Task {
|
||||
|
||||
@@ -61,6 +61,8 @@ enum class PacketEnum : uint16_t {
|
||||
BLOCK_CHANGE_RSP = 3004,
|
||||
S2C_CLEAR_ALL_CHUNKS = 3005,
|
||||
UPDATE_TIME = 3006,
|
||||
CHAT_MSG = 4001,
|
||||
VOICE_MSG = 4002,
|
||||
PING = 9001,
|
||||
PONG = 9002
|
||||
|
||||
@@ -121,6 +123,12 @@ template <> constexpr uint16_t get_packet_id<Pong>() {
|
||||
template <> constexpr uint16_t get_packet_id<PlayerWaterSound>() {
|
||||
return std::to_underlying(PacketEnum::PLAYER_WATER_SOUND);
|
||||
}
|
||||
template <> constexpr uint16_t get_packet_id<ChatMsg>() {
|
||||
return std::to_underlying(PacketEnum::CHAT_MSG);
|
||||
}
|
||||
template <> constexpr uint16_t get_packet_id<VoiceMsg>() {
|
||||
return std::to_underlying(PacketEnum::VOICE_MSG);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
requires std::derived_from<T, google::protobuf::Message>
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
#include "Cubed/gameplay/server_player.hpp"
|
||||
#include "Cubed/tools/priority_thread_pool.hpp"
|
||||
#include "Cubed/tools/recent_queue.hpp"
|
||||
#include "Cubed/tools/sensitive_filter.hpp"
|
||||
#include "Cubed/tools/thread_pool.hpp"
|
||||
#include "Cubed/ui/color.hpp"
|
||||
#include "world/block_change.pb.h"
|
||||
|
||||
#include <absl/container/flat_hash_set.h>
|
||||
@@ -80,6 +82,8 @@ public:
|
||||
void handle_chunk_req(int task_id, const std::string& uuid, ChunkPos pos);
|
||||
void handle_block_change(const BlockChangeReq& req);
|
||||
|
||||
void handle_chat_message(ChatMsg& msg);
|
||||
void handle_voice_message(VoiceMsg& msg);
|
||||
int chunk_size() const;
|
||||
template <typename Fn>
|
||||
void register_timer(std::string_view id, TickType threshold, Fn&& f) {
|
||||
@@ -128,6 +132,9 @@ private:
|
||||
|
||||
CaveCarver m_cave_carcer;
|
||||
RiverWorm m_river_worm;
|
||||
std::atomic<bool> m_enable_filter{false};
|
||||
std::atomic<bool> m_voice_chat{true};
|
||||
SensitiveFilter m_filter;
|
||||
|
||||
std::jthread m_gen_thread;
|
||||
std::jthread m_server_thread;
|
||||
@@ -189,5 +196,8 @@ private:
|
||||
std::atomic<std::shared_ptr<PriorityThreadPool>>& thread_pool,
|
||||
int threads);
|
||||
void send_server_stop();
|
||||
|
||||
void boardcast_message(const std::string& name, const std::string& message,
|
||||
Color color = Color::WHITE, bool system_msg = false);
|
||||
};
|
||||
} // namespace Cubed
|
||||
|
||||
@@ -8,6 +8,7 @@ struct SliderVariable {
|
||||
float mouse_sensitivity = 0.15f;
|
||||
float sfx = 1.0f;
|
||||
float music = 0.5f;
|
||||
float player_voice = 1.0f;
|
||||
int rendering_distance = 24;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "Cubed/ui/pasue_menu_ui_manager.hpp"
|
||||
#include "Cubed/ui/world_ui_manager.hpp"
|
||||
namespace Cubed {
|
||||
enum class VoiceInputType { OFF, PTT, ALWAYS };
|
||||
class SceneManager;
|
||||
class WorldScene : public Scene {
|
||||
public:
|
||||
@@ -33,14 +34,14 @@ public:
|
||||
bool pause() const;
|
||||
void set_pause(bool pause);
|
||||
void set_error(std::string_view error);
|
||||
void set_mouse(bool pause);
|
||||
void set_chatting(bool chatting, bool send);
|
||||
// Not thread safe
|
||||
void handle_chat_message(ChatMessage& message);
|
||||
|
||||
bool is_recording() const;
|
||||
|
||||
private:
|
||||
bool handle_mouse_move_event(const MouseMoveEvent& e) override;
|
||||
bool handle_mouse_button_event(const MouseButtonEvent& e) override;
|
||||
bool handle_window_resize_event(const WindowResizeEvent& e) override;
|
||||
bool handle_mouse_wheel_event(const MouseWheelEvent& e) override;
|
||||
bool handle_key_event(const KeyEvent& e) override;
|
||||
|
||||
SceneManager& m_scene_manager;
|
||||
DevPanel m_dev_panel;
|
||||
Camera m_camera;
|
||||
@@ -50,9 +51,18 @@ private:
|
||||
bool m_paused = false;
|
||||
bool m_show_hud = true;
|
||||
bool m_show_dev_pannel = true;
|
||||
bool m_chatting = false;
|
||||
PauseMenuUIManager m_pasue_menu;
|
||||
WorldUIManager m_hud_ui;
|
||||
ErrorUI m_error_ui;
|
||||
const Argument& m_argument;
|
||||
VoiceInputType m_input_type;
|
||||
bool handle_mouse_move_event(const MouseMoveEvent& e) override;
|
||||
bool handle_mouse_button_event(const MouseButtonEvent& e) override;
|
||||
bool handle_window_resize_event(const WindowResizeEvent& e) override;
|
||||
bool handle_mouse_wheel_event(const MouseWheelEvent& e) override;
|
||||
bool handle_key_event(const KeyEvent& e) override;
|
||||
bool handle_text_input_event(const TextInputEvent&) override;
|
||||
void load_config();
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -56,6 +56,7 @@ public:
|
||||
TextMesh vertices(const std::string& text);
|
||||
const Texture* text_texture();
|
||||
static const std::string& font_path();
|
||||
static float text_width(const std::string& text);
|
||||
|
||||
private:
|
||||
FT_Library m_ft;
|
||||
|
||||
24
include/Cubed/tools/sensitive_filter.hpp
Normal file
24
include/Cubed/tools/sensitive_filter.hpp
Normal file
@@ -0,0 +1,24 @@
|
||||
#pragma once
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
namespace Cubed {
|
||||
class SensitiveFilter {
|
||||
public:
|
||||
SensitiveFilter();
|
||||
void load(const nlohmann::json& j);
|
||||
std::string filter(std::string_view text);
|
||||
|
||||
private:
|
||||
void insert(const std::u32string& world);
|
||||
void build();
|
||||
|
||||
struct Node {
|
||||
std::unordered_map<char32_t, int> next;
|
||||
int fail = 0;
|
||||
size_t length = 0;
|
||||
bool end = false;
|
||||
};
|
||||
|
||||
std::vector<Node> trie{1};
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -1,6 +1,10 @@
|
||||
#pragma once
|
||||
#include "Cubed/tools/cubed_assert.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <utf8cpp/utf8.h>
|
||||
#include <vector>
|
||||
namespace Cubed {
|
||||
inline std::string codepoint_to_utf8(uint32_t cp) {
|
||||
std::string out;
|
||||
@@ -38,4 +42,28 @@ inline void utf8_pop_back(std::string& str) {
|
||||
str.erase(i);
|
||||
}
|
||||
|
||||
inline std::vector<std::string> split_utf8(const std::string& str, int size) {
|
||||
ASSERT(size > 0);
|
||||
if (!utf8::is_valid(str)) {
|
||||
return {};
|
||||
}
|
||||
std::vector<std::string> blocks;
|
||||
auto cur = str.begin();
|
||||
int chat_count = 0;
|
||||
|
||||
for (auto it = str.begin(); it != str.end();) {
|
||||
if (chat_count >= size) {
|
||||
blocks.emplace_back(cur, it);
|
||||
cur = it;
|
||||
chat_count = 0;
|
||||
}
|
||||
utf8::next(it, str.end());
|
||||
++chat_count;
|
||||
if (it == str.end()) {
|
||||
blocks.emplace_back(cur, it);
|
||||
}
|
||||
}
|
||||
return blocks;
|
||||
}
|
||||
|
||||
} // namespace Cubed
|
||||
10
include/Cubed/tools/time_tools.hpp
Normal file
10
include/Cubed/tools/time_tools.hpp
Normal file
@@ -0,0 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <SDL3/SDL_timer.h>
|
||||
#include <cstdint>
|
||||
namespace Cubed {
|
||||
namespace Tools {
|
||||
inline uint64_t get_time_ticks() { return SDL_GetTicks(); }
|
||||
} // namespace Tools
|
||||
|
||||
} // namespace Cubed
|
||||
@@ -23,8 +23,8 @@ public:
|
||||
float width() const override;
|
||||
float height() const override;
|
||||
|
||||
Button& set_width(float width);
|
||||
Button& set_height(float height);
|
||||
Button& set_width(float width) override;
|
||||
Button& set_height(float height) override;
|
||||
Button& set_background_image(const std::string& path,
|
||||
TextureManager& texture_manager);
|
||||
Button& set_default_image(TextureManager& texture_manager);
|
||||
@@ -54,8 +54,6 @@ private:
|
||||
"texture/ui/button001.png";
|
||||
std::function<void()> m_clicked;
|
||||
|
||||
float m_width = NORMAL_BUTTON_WIDTH;
|
||||
float m_height = NORMAL_BUTTON_HEIGHT;
|
||||
float m_scale = DEFAULT_SCALE;
|
||||
bool m_auto_scale = false;
|
||||
void on_render(Renderer& renderer) override;
|
||||
|
||||
56
include/Cubed/ui/chat_box.hpp
Normal file
56
include/Cubed/ui/chat_box.hpp
Normal file
@@ -0,0 +1,56 @@
|
||||
#pragma once
|
||||
|
||||
#include "Cubed/gameplay/chat_message.hpp"
|
||||
#include "Cubed/ui/text_field.hpp"
|
||||
#include "Cubed/ui/widget.hpp"
|
||||
|
||||
#include <deque>
|
||||
|
||||
namespace Cubed {
|
||||
class ChatBox : public Widget {
|
||||
public:
|
||||
ChatBox(Widget* parent);
|
||||
|
||||
void add_message(ChatMessage& message);
|
||||
|
||||
ChatBox& set_scale(float scale);
|
||||
ChatBox& set_text_scale(float scale);
|
||||
// Only the width of TextField can be set; the height is calculated
|
||||
// dynamically
|
||||
ChatBox& set_show_lines(int lines);
|
||||
ChatBox& set_spacing(float spacing);
|
||||
ChatBox& clear_input();
|
||||
std::string& get_input_text();
|
||||
float width() const override;
|
||||
float height() const override;
|
||||
float text_label_width() const;
|
||||
void set_text_field(std::unique_ptr<TextField> text_field);
|
||||
void set_typing(bool typing, bool finished);
|
||||
template <typename F> ChatBox& set_on_finish(F&& f) {
|
||||
m_text_field->set_on_finish(std::forward<F>(f));
|
||||
return *this;
|
||||
}
|
||||
|
||||
private:
|
||||
static constexpr int MAX_MESSGAES_SUM = 50;
|
||||
static constexpr float DISAPPEAR_TIME = 5.0f;
|
||||
struct Line {
|
||||
std::unique_ptr<Label> label;
|
||||
uint64_t time;
|
||||
bool render = true;
|
||||
};
|
||||
int m_lines = 10;
|
||||
bool m_scale = 1.0f;
|
||||
float m_spacing = 0.0f;
|
||||
float m_text_scale = 1.0f;
|
||||
float m_text_width = 500.0f;
|
||||
std::deque<Line> m_messages;
|
||||
std::unique_ptr<TextField> m_text_field;
|
||||
void layout();
|
||||
void on_update(float dt) override;
|
||||
void on_render(Renderer& renderer) override;
|
||||
bool handle_text_input_event(const TextInputEvent& e) override;
|
||||
bool handle_key_event(const KeyEvent& e) override;
|
||||
std::vector<std::string> wrap_message(const std::string& text) const;
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -6,7 +6,7 @@
|
||||
namespace Cubed {
|
||||
|
||||
enum class Color {
|
||||
BLACK,
|
||||
BLACK = 0,
|
||||
WHITE,
|
||||
RED,
|
||||
GREEN,
|
||||
@@ -21,6 +21,39 @@ enum class Color {
|
||||
BROWN
|
||||
};
|
||||
|
||||
inline constexpr Color color_from_int(int i) {
|
||||
switch (i) {
|
||||
case std::to_underlying(Color::BLACK):
|
||||
return Color::BLACK;
|
||||
case std::to_underlying(Color::WHITE):
|
||||
return Color::WHITE;
|
||||
case std::to_underlying(Color::RED):
|
||||
return Color::RED;
|
||||
case std::to_underlying(Color::GREEN):
|
||||
return Color::GREEN;
|
||||
case std::to_underlying(Color::BLUE):
|
||||
return Color::BLUE;
|
||||
case std::to_underlying(Color::YELLOW):
|
||||
return Color::YELLOW;
|
||||
case std::to_underlying(Color::CYAN):
|
||||
return Color::CYAN;
|
||||
case std::to_underlying(Color::MAGENTA):
|
||||
return Color::MAGENTA;
|
||||
case std::to_underlying(Color::GRAY):
|
||||
return Color::GRAY;
|
||||
case std::to_underlying(Color::ORANGE):
|
||||
return Color::ORANGE;
|
||||
case std::to_underlying(Color::PURPLE):
|
||||
return Color::PURPLE;
|
||||
case std::to_underlying(Color::PINK):
|
||||
return Color::PINK;
|
||||
case std::to_underlying(Color::BROWN):
|
||||
return Color::BROWN;
|
||||
default:
|
||||
return Color::WHITE;
|
||||
}
|
||||
}
|
||||
|
||||
inline constexpr glm::vec4 color_value(Color color) {
|
||||
using glm::vec4;
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ public:
|
||||
|
||||
private:
|
||||
int m_spacing = 0;
|
||||
float m_content_height = 0;
|
||||
float m_content_width = 0;
|
||||
float m_content_height = 0.0f;
|
||||
float m_content_width = 0.0f;
|
||||
ColumnLayoutAnchor m_layout_anchor = ColumnLayoutAnchor::CENTER;
|
||||
};
|
||||
} // namespace Cubed
|
||||
5
include/Cubed/ui/default_image.hpp
Normal file
5
include/Cubed/ui/default_image.hpp
Normal file
@@ -0,0 +1,5 @@
|
||||
#pragma once
|
||||
namespace Cubed {
|
||||
static constexpr const char* DEFAULT_TEXT_FIELD_IMAGE =
|
||||
"texture/ui/textfield001.png";
|
||||
}
|
||||
@@ -21,17 +21,9 @@ public:
|
||||
Image& set_scale(float scale);
|
||||
float scale() const;
|
||||
|
||||
Image& set_height(float height);
|
||||
Image& set_width(float width);
|
||||
|
||||
Image& set_fill(bool fill);
|
||||
|
||||
private:
|
||||
void on_render(Renderer& renderer) override;
|
||||
void on_update(float dt) override;
|
||||
float m_width = 0.0f;
|
||||
float m_height = 0.0f;
|
||||
bool m_fill = false;
|
||||
|
||||
const Texture* m_texture = nullptr;
|
||||
glm::vec2 m_pos{0.0f, 0.0f};
|
||||
|
||||
@@ -14,10 +14,11 @@ public:
|
||||
virtual ~Label() = default;
|
||||
|
||||
Label& set_text(std::string_view text);
|
||||
|
||||
Label& set_color(Color color);
|
||||
Label& set_scale(float scale);
|
||||
|
||||
Label& set_background(std::unique_ptr<Widget> background);
|
||||
Widget* get_background();
|
||||
const UIVertexData& data() const;
|
||||
|
||||
const TextStyle& text_style() const;
|
||||
@@ -38,6 +39,7 @@ protected:
|
||||
private:
|
||||
TextStyle m_text;
|
||||
UIVertexData m_data;
|
||||
std::unique_ptr<Widget> m_background;
|
||||
float m_real_width = 0.0f;
|
||||
float m_real_height = 0.0f;
|
||||
float m_offset_x = 0.0f;
|
||||
|
||||
@@ -16,11 +16,6 @@ public:
|
||||
float height() const override;
|
||||
float alpha() const;
|
||||
|
||||
Rect& set_width(float width);
|
||||
Rect& set_height(float height);
|
||||
|
||||
Rect& set_fill(bool fill);
|
||||
|
||||
Rect& set_scale(float scale);
|
||||
Rect& set_color(Color color);
|
||||
Rect& set_alpha(float alpha);
|
||||
@@ -32,10 +27,7 @@ private:
|
||||
void on_render(Renderer& renderer) override;
|
||||
|
||||
Color m_color = Color::WHITE;
|
||||
float m_width = 0.0f;
|
||||
float m_height = 0.0f;
|
||||
float m_scale = 1.0f;
|
||||
float m_alpha = 1.0f;
|
||||
bool m_fill = false;
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -21,8 +21,8 @@ public:
|
||||
float height() const override;
|
||||
|
||||
Slider& set_scale(float scale);
|
||||
Slider& set_width(float width);
|
||||
Slider& set_height(float h);
|
||||
Slider& set_width(float width) override;
|
||||
Slider& set_height(float h) override;
|
||||
Slider& set_slider_text(const std::string& key,
|
||||
const std::string& variable);
|
||||
Slider& set_track_image(const std::string& path,
|
||||
@@ -48,8 +48,7 @@ private:
|
||||
std::unique_ptr<Label> m_label;
|
||||
ValueType m_type = ValueType::FLOAT;
|
||||
float m_scale = DEFAULT_SCALE;
|
||||
float m_width = NORMAL_SLIDER_WIDTH;
|
||||
float m_height = NORMAL_SLIDER_HEIGHT;
|
||||
|
||||
float m_xpos = 0.0f;
|
||||
bool m_dragging = false;
|
||||
bool m_inside = false;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "Cubed/ui/image.hpp"
|
||||
#include "Cubed/ui/label.hpp"
|
||||
#include "Cubed/ui/rect.hpp"
|
||||
#include "Cubed/ui/widget.hpp"
|
||||
@@ -19,21 +18,22 @@ public:
|
||||
float width() const override;
|
||||
float height() const override;
|
||||
|
||||
TextField& set_width(float width);
|
||||
TextField& set_height(float height);
|
||||
TextField& set_width(float width) override;
|
||||
TextField& set_height(float height) override;
|
||||
TextField& set_show_text(const std::string& text);
|
||||
TextField& set_background_image(const std::string& path,
|
||||
TextureManager& texture_manager);
|
||||
TextField& set_default_image(TextureManager& texture_manager);
|
||||
TextField& set_background(std::unique_ptr<Widget> background);
|
||||
TextField& set_auto_scale(bool auto_scale);
|
||||
TextField& set_app(App* app);
|
||||
TextField& set_typing(bool typing, bool finished);
|
||||
TextField& clear_input();
|
||||
bool is_typing() const;
|
||||
bool handle_mouse_move_event(const MouseMoveEvent& e) override;
|
||||
bool handle_mouse_button_event(const MouseButtonEvent& e) override;
|
||||
bool handle_text_input_event(const TextInputEvent& e) override;
|
||||
bool handle_key_event(const KeyEvent& e) override;
|
||||
bool handle_window_resize_event(const WindowResizeEvent& e) override;
|
||||
const std::string& input_text() const;
|
||||
|
||||
std::string& input_text();
|
||||
template <typename F> TextField& set_on_finish(F&& f) {
|
||||
m_on_finished = std::forward<F>(f);
|
||||
return *this;
|
||||
@@ -44,11 +44,9 @@ private:
|
||||
static constexpr float DEFAULT_SCALE = 3.0f;
|
||||
static constexpr float TEXT_SCALE = 0.6f;
|
||||
static constexpr float CURSOR_INTERVAL = 0.5f;
|
||||
static constexpr const char* DEFAULT_TEXT_FIELD_IMAGE =
|
||||
"texture/ui/textfield001.png";
|
||||
|
||||
App* m_app = nullptr;
|
||||
std::unique_ptr<Image> m_background;
|
||||
std::unique_ptr<Widget> m_background;
|
||||
std::unique_ptr<Label> m_foreground;
|
||||
std::unique_ptr<Rect> m_cursor;
|
||||
float m_cursor_timer = 0.0f;
|
||||
@@ -57,8 +55,7 @@ private:
|
||||
bool m_typing = false;
|
||||
bool m_auto_scale = false;
|
||||
bool m_ctrl_press = false;
|
||||
float m_width = NORMAL_TEXTFIELD_WIDTH;
|
||||
float m_height = NORMAL_TEXTFIELD_HEIGHT;
|
||||
|
||||
float m_scale = DEFAULT_SCALE;
|
||||
|
||||
std::string m_input_text;
|
||||
@@ -70,5 +67,8 @@ private:
|
||||
void on_update(float dt) override;
|
||||
void update_show_text();
|
||||
void update_input_area();
|
||||
|
||||
void start_typing();
|
||||
void stop_typing(bool finished);
|
||||
};
|
||||
} // namespace Cubed
|
||||
@@ -34,8 +34,16 @@ public:
|
||||
virtual Widget& set_window_size(int width, int height);
|
||||
virtual Widget& set_visible(bool visible);
|
||||
// Returns the final display size
|
||||
virtual float width() const = 0;
|
||||
virtual float height() const = 0;
|
||||
|
||||
virtual float width() const;
|
||||
virtual float height() const;
|
||||
virtual Widget& set_width(float width);
|
||||
virtual Widget& set_height(float height);
|
||||
|
||||
virtual Widget& set_fill_parent(bool fill);
|
||||
virtual Widget& set_fill_width(bool fill);
|
||||
virtual Widget& set_fill_height(bool fill);
|
||||
|
||||
virtual glm::vec2 pos() const;
|
||||
|
||||
virtual bool handle_key_event(const KeyEvent& e);
|
||||
@@ -44,7 +52,6 @@ public:
|
||||
virtual bool handle_window_resize_event(const WindowResizeEvent& e);
|
||||
virtual bool handle_mouse_move_event(const MouseMoveEvent& e);
|
||||
virtual bool handle_text_input_event(const TextInputEvent& e);
|
||||
|
||||
void set_order(TraversalOrder order);
|
||||
|
||||
template <typename T, typename... Args> T& add_child(Args&&... args) {
|
||||
@@ -56,12 +63,16 @@ public:
|
||||
|
||||
protected:
|
||||
Widget* m_parent = nullptr;
|
||||
float m_window_height = 0;
|
||||
float m_window_width = 0;
|
||||
float m_window_height = 0.0f;
|
||||
float m_window_width = 0.0f;
|
||||
float m_width = 0.0f;
|
||||
float m_height = 0.0f;
|
||||
// Center is at the top-left corner, position is at the top-left corner
|
||||
Anchor m_anchor = Anchor::TOP_LEFT;
|
||||
bool m_visible = true;
|
||||
|
||||
bool m_fill_parent = false;
|
||||
bool m_fill_height = false;
|
||||
bool m_fill_width = false;
|
||||
glm::ivec2 m_offset{0, 0};
|
||||
|
||||
std::vector<std::unique_ptr<Widget>>& children();
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Cubed/ui/chat_box.hpp"
|
||||
#include "Cubed/ui/image.hpp"
|
||||
#include "Cubed/ui/ui_manager.hpp"
|
||||
#include "Cubed/ui/widget.hpp"
|
||||
|
||||
@@ -17,8 +19,17 @@ public:
|
||||
|
||||
void init() override;
|
||||
void render(Renderer& renderer) override;
|
||||
void update(float dt) override;
|
||||
void set_chatting(bool chantting, bool sned);
|
||||
|
||||
void add_chat_message(ChatMessage& message);
|
||||
|
||||
private:
|
||||
bool handle_key_event(const KeyEvent& e) override;
|
||||
WorldScene& m_scene;
|
||||
|
||||
ChatBox* m_chat_box = nullptr;
|
||||
Image* m_mircophone = nullptr;
|
||||
Label* m_disbable_voice = nullptr;
|
||||
};
|
||||
} // namespace Cubed
|
||||
2
include/utf8cpp/.clang-format
Normal file
2
include/utf8cpp/.clang-format
Normal file
@@ -0,0 +1,2 @@
|
||||
DisableFormat: true
|
||||
SortIncludes: false
|
||||
46
include/utf8cpp/utf8.h
Normal file
46
include/utf8cpp/utf8.h
Normal file
@@ -0,0 +1,46 @@
|
||||
// Copyright 2006 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
|
||||
/*
|
||||
To control the C++ language version used by the library, you can define UTF_CPP_CPLUSPLUS macro
|
||||
and set it to one of the values used by the __cplusplus predefined macro.
|
||||
|
||||
For instance,
|
||||
#define UTF_CPP_CPLUSPLUS 199711L
|
||||
will cause the UTF-8 CPP library to use only types and language features available in the C++ 98 standard.
|
||||
Some library features will be disabled.
|
||||
|
||||
If you leave UTF_CPP_CPLUSPLUS undefined, it will be internally assigned to __cplusplus.
|
||||
*/
|
||||
|
||||
#include "utf8/checked.h"
|
||||
#include "utf8/unchecked.h"
|
||||
|
||||
#endif // header guard
|
||||
359
include/utf8cpp/utf8/checked.h
Normal file
359
include/utf8cpp/utf8/checked.h
Normal file
@@ -0,0 +1,359 @@
|
||||
// Copyright 2006-2016 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
|
||||
#include "core.h"
|
||||
#include <stdexcept>
|
||||
|
||||
namespace utf8
|
||||
{
|
||||
// Base for the exceptions that may be thrown from the library
|
||||
class exception : public ::std::exception {
|
||||
};
|
||||
|
||||
// Exceptions that may be thrown from the library functions.
|
||||
class invalid_code_point : public exception {
|
||||
utfchar32_t cp;
|
||||
public:
|
||||
invalid_code_point(utfchar32_t codepoint) : cp(codepoint) {}
|
||||
virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid code point"; }
|
||||
utfchar32_t code_point() const {return cp;}
|
||||
};
|
||||
|
||||
class invalid_utf8 : public exception {
|
||||
utfchar8_t u8;
|
||||
public:
|
||||
invalid_utf8 (utfchar8_t u) : u8(u) {}
|
||||
invalid_utf8 (char c) : u8(static_cast<utfchar8_t>(c)) {}
|
||||
virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-8"; }
|
||||
utfchar8_t utf8_octet() const {return u8;}
|
||||
};
|
||||
|
||||
class invalid_utf16 : public exception {
|
||||
utfchar16_t u16;
|
||||
public:
|
||||
invalid_utf16 (utfchar16_t u) : u16(u) {}
|
||||
virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-16"; }
|
||||
utfchar16_t utf16_word() const {return u16;}
|
||||
};
|
||||
|
||||
class not_enough_room : public exception {
|
||||
public:
|
||||
virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Not enough space"; }
|
||||
};
|
||||
|
||||
/// The library API - functions intended to be called by the users
|
||||
|
||||
template <typename octet_iterator>
|
||||
octet_iterator append(utfchar32_t cp, octet_iterator result)
|
||||
{
|
||||
if (!utf8::internal::is_code_point_valid(cp))
|
||||
throw invalid_code_point(cp);
|
||||
|
||||
return internal::append(cp, result);
|
||||
}
|
||||
|
||||
inline void append(utfchar32_t cp, std::string& s)
|
||||
{
|
||||
append(cp, std::back_inserter(s));
|
||||
}
|
||||
|
||||
template <typename word_iterator>
|
||||
word_iterator append16(utfchar32_t cp, word_iterator result)
|
||||
{
|
||||
if (!utf8::internal::is_code_point_valid(cp))
|
||||
throw invalid_code_point(cp);
|
||||
|
||||
return internal::append16(cp, result);
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename output_iterator>
|
||||
output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, utfchar32_t replacement)
|
||||
{
|
||||
while (start != end) {
|
||||
octet_iterator sequence_start = start;
|
||||
internal::utf_error err_code = utf8::internal::validate_next(start, end);
|
||||
switch (err_code) {
|
||||
case internal::UTF8_OK :
|
||||
for (octet_iterator it = sequence_start; it != start; ++it)
|
||||
*out++ = *it;
|
||||
break;
|
||||
case internal::NOT_ENOUGH_ROOM:
|
||||
out = utf8::append (replacement, out);
|
||||
start = end;
|
||||
break;
|
||||
case internal::INVALID_LEAD:
|
||||
out = utf8::append (replacement, out);
|
||||
++start;
|
||||
break;
|
||||
case internal::INCOMPLETE_SEQUENCE:
|
||||
case internal::OVERLONG_SEQUENCE:
|
||||
case internal::INVALID_CODE_POINT:
|
||||
out = utf8::append (replacement, out);
|
||||
++start;
|
||||
// just one replacement mark for the sequence
|
||||
while (start != end && utf8::internal::is_trail(*start))
|
||||
++start;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename output_iterator>
|
||||
inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
|
||||
{
|
||||
static const utfchar32_t replacement_marker = static_cast<utfchar32_t>(utf8::internal::mask16(0xfffd));
|
||||
return utf8::replace_invalid(start, end, out, replacement_marker);
|
||||
}
|
||||
|
||||
inline std::string replace_invalid(const std::string& s, utfchar32_t replacement)
|
||||
{
|
||||
std::string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::string replace_invalid(const std::string& s)
|
||||
{
|
||||
std::string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utfchar32_t next(octet_iterator& it, octet_iterator end)
|
||||
{
|
||||
utfchar32_t cp = 0;
|
||||
internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
|
||||
switch (err_code) {
|
||||
case internal::UTF8_OK :
|
||||
break;
|
||||
case internal::NOT_ENOUGH_ROOM :
|
||||
throw not_enough_room();
|
||||
case internal::INVALID_LEAD :
|
||||
case internal::INCOMPLETE_SEQUENCE :
|
||||
case internal::OVERLONG_SEQUENCE :
|
||||
throw invalid_utf8(static_cast<utfchar8_t>(*it));
|
||||
case internal::INVALID_CODE_POINT :
|
||||
throw invalid_code_point(cp);
|
||||
}
|
||||
return cp;
|
||||
}
|
||||
|
||||
template <typename word_iterator>
|
||||
utfchar32_t next16(word_iterator& it, word_iterator end)
|
||||
{
|
||||
utfchar32_t cp = 0;
|
||||
internal::utf_error err_code = utf8::internal::validate_next16(it, end, cp);
|
||||
if (err_code == internal::NOT_ENOUGH_ROOM)
|
||||
throw not_enough_room();
|
||||
return cp;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utfchar32_t peek_next(octet_iterator it, octet_iterator end)
|
||||
{
|
||||
return utf8::next(it, end);
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utfchar32_t prior(octet_iterator& it, octet_iterator start)
|
||||
{
|
||||
// can't do much if it == start
|
||||
if (it == start)
|
||||
throw not_enough_room();
|
||||
|
||||
octet_iterator end = it;
|
||||
// Go back until we hit either a lead octet or start
|
||||
while (utf8::internal::is_trail(*(--it)))
|
||||
if (it == start)
|
||||
throw invalid_utf8(*it); // error - no lead byte in the sequence
|
||||
return utf8::peek_next(it, end);
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename distance_type>
|
||||
void advance (octet_iterator& it, distance_type n, octet_iterator end)
|
||||
{
|
||||
const distance_type zero(0);
|
||||
if (n < zero) {
|
||||
// backward
|
||||
for (distance_type i = n; i < zero; ++i)
|
||||
utf8::prior(it, end);
|
||||
} else {
|
||||
// forward
|
||||
for (distance_type i = zero; i < n; ++i)
|
||||
utf8::next(it, end);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
typename std::iterator_traits<octet_iterator>::difference_type
|
||||
distance (octet_iterator first, octet_iterator last)
|
||||
{
|
||||
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
||||
for (dist = 0; first < last; ++dist)
|
||||
utf8::next(first, last);
|
||||
return dist;
|
||||
}
|
||||
|
||||
template <typename u16bit_iterator, typename octet_iterator>
|
||||
octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
||||
{
|
||||
while (start != end) {
|
||||
utfchar32_t cp = static_cast<utfchar32_t>(utf8::internal::mask16(*start++));
|
||||
// Take care of surrogate pairs first
|
||||
if (utf8::internal::is_lead_surrogate(cp)) {
|
||||
if (start != end) {
|
||||
const utfchar32_t trail_surrogate = static_cast<utfchar32_t>(utf8::internal::mask16(*start++));
|
||||
if (utf8::internal::is_trail_surrogate(trail_surrogate))
|
||||
cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
|
||||
else
|
||||
throw invalid_utf16(static_cast<utfchar16_t>(trail_surrogate));
|
||||
}
|
||||
else
|
||||
throw invalid_utf16(static_cast<utfchar16_t>(cp));
|
||||
|
||||
}
|
||||
// Lone trail surrogate
|
||||
else if (utf8::internal::is_trail_surrogate(cp))
|
||||
throw invalid_utf16(static_cast<utfchar16_t>(cp));
|
||||
|
||||
result = utf8::append(cp, result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename u16bit_iterator, typename octet_iterator>
|
||||
u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
|
||||
{
|
||||
while (start < end) {
|
||||
const utfchar32_t cp = utf8::next(start, end);
|
||||
if (cp > 0xffff) { //make a surrogate pair
|
||||
*result++ = static_cast<utfchar16_t>((cp >> 10) + internal::LEAD_OFFSET);
|
||||
*result++ = static_cast<utfchar16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
|
||||
}
|
||||
else
|
||||
*result++ = static_cast<utfchar16_t>(cp);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename u32bit_iterator>
|
||||
octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
||||
{
|
||||
while (start != end)
|
||||
result = utf8::append(*(start++), result);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename u32bit_iterator>
|
||||
u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
|
||||
{
|
||||
while (start < end)
|
||||
(*result++) = utf8::next(start, end);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// The iterator class
|
||||
template <typename octet_iterator>
|
||||
class iterator {
|
||||
octet_iterator it;
|
||||
octet_iterator range_start;
|
||||
octet_iterator range_end;
|
||||
public:
|
||||
typedef utfchar32_t value_type;
|
||||
typedef utfchar32_t* pointer;
|
||||
typedef utfchar32_t& reference;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
typedef std::bidirectional_iterator_tag iterator_category;
|
||||
iterator () {}
|
||||
explicit iterator (const octet_iterator& octet_it,
|
||||
const octet_iterator& rangestart,
|
||||
const octet_iterator& rangeend) :
|
||||
it(octet_it), range_start(rangestart), range_end(rangeend)
|
||||
{
|
||||
if (it < range_start || it > range_end)
|
||||
throw std::out_of_range("Invalid utf-8 iterator position");
|
||||
}
|
||||
// the default "big three" are OK
|
||||
octet_iterator base () const { return it; }
|
||||
utfchar32_t operator * () const
|
||||
{
|
||||
octet_iterator temp = it;
|
||||
return utf8::next(temp, range_end);
|
||||
}
|
||||
bool operator == (const iterator& rhs) const
|
||||
{
|
||||
if (range_start != rhs.range_start || range_end != rhs.range_end)
|
||||
throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
|
||||
return (it == rhs.it);
|
||||
}
|
||||
bool operator != (const iterator& rhs) const
|
||||
{
|
||||
return !(operator == (rhs));
|
||||
}
|
||||
iterator& operator ++ ()
|
||||
{
|
||||
utf8::next(it, range_end);
|
||||
return *this;
|
||||
}
|
||||
iterator operator ++ (int)
|
||||
{
|
||||
iterator temp = *this;
|
||||
utf8::next(it, range_end);
|
||||
return temp;
|
||||
}
|
||||
iterator& operator -- ()
|
||||
{
|
||||
utf8::prior(it, range_start);
|
||||
return *this;
|
||||
}
|
||||
iterator operator -- (int)
|
||||
{
|
||||
iterator temp = *this;
|
||||
utf8::prior(it, range_start);
|
||||
return temp;
|
||||
}
|
||||
}; // class iterator
|
||||
|
||||
} // namespace utf8
|
||||
|
||||
#if UTF_CPP_CPLUSPLUS >= 202002L // C++ 20 or later
|
||||
#include "cpp20.h"
|
||||
#elif UTF_CPP_CPLUSPLUS >= 201703L // C++ 17 or later
|
||||
#include "cpp17.h"
|
||||
#elif UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
|
||||
#include "cpp11.h"
|
||||
#endif // C++ 11 or later
|
||||
|
||||
#endif //header guard
|
||||
|
||||
610
include/utf8cpp/utf8/core.h
Normal file
610
include/utf8cpp/utf8/core.h
Normal file
@@ -0,0 +1,610 @@
|
||||
// Copyright 2006 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
|
||||
#include <iterator>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
|
||||
// Determine the C++ standard version.
|
||||
// If the user defines UTF_CPP_CPLUSPLUS, use that.
|
||||
// Otherwise, trust the unreliable predefined macro __cplusplus
|
||||
|
||||
#if !defined UTF_CPP_CPLUSPLUS
|
||||
#define UTF_CPP_CPLUSPLUS __cplusplus
|
||||
#endif
|
||||
|
||||
#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
|
||||
#define UTF_CPP_OVERRIDE override
|
||||
#define UTF_CPP_NOEXCEPT noexcept
|
||||
#define UTF_CPP_STATIC_ASSERT(condition) static_assert(condition, "UTFCPP static assert");
|
||||
#else // C++ 98/03
|
||||
#define UTF_CPP_OVERRIDE
|
||||
#define UTF_CPP_NOEXCEPT throw()
|
||||
// Not worth simulating static_assert:
|
||||
#define UTF_CPP_STATIC_ASSERT(condition) (void)(condition);
|
||||
#endif // C++ 11 or later
|
||||
|
||||
|
||||
namespace utf8
|
||||
{
|
||||
// The typedefs for 8-bit, 16-bit and 32-bit code units
|
||||
#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
|
||||
#if UTF_CPP_CPLUSPLUS >= 202002L // C++ 20 or later
|
||||
typedef char8_t utfchar8_t;
|
||||
#else // C++ 11/14/17
|
||||
typedef unsigned char utfchar8_t;
|
||||
#endif
|
||||
typedef char16_t utfchar16_t;
|
||||
typedef char32_t utfchar32_t;
|
||||
#else // C++ 98/03
|
||||
typedef unsigned char utfchar8_t;
|
||||
typedef unsigned short utfchar16_t;
|
||||
typedef unsigned int utfchar32_t;
|
||||
#endif // C++ 11 or later
|
||||
|
||||
// Helper code - not intended to be directly called by the library users. May be changed at any time
|
||||
namespace internal
|
||||
{
|
||||
// Unicode constants
|
||||
// Leading (high) surrogates: 0xd800 - 0xdbff
|
||||
// Trailing (low) surrogates: 0xdc00 - 0xdfff
|
||||
const utfchar16_t LEAD_SURROGATE_MIN = 0xd800u;
|
||||
const utfchar16_t LEAD_SURROGATE_MAX = 0xdbffu;
|
||||
const utfchar16_t TRAIL_SURROGATE_MIN = 0xdc00u;
|
||||
const utfchar16_t TRAIL_SURROGATE_MAX = 0xdfffu;
|
||||
const utfchar16_t LEAD_OFFSET = 0xd7c0u; // LEAD_SURROGATE_MIN - (0x10000 >> 10)
|
||||
const utfchar32_t SURROGATE_OFFSET = 0xfca02400u; // 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN
|
||||
|
||||
// Maximum valid value for a Unicode code point
|
||||
const utfchar32_t CODE_POINT_MAX = 0x0010ffffu;
|
||||
|
||||
template<typename octet_type>
|
||||
inline utfchar8_t mask8(octet_type oc)
|
||||
{
|
||||
return static_cast<utfchar8_t>(0xff & oc);
|
||||
}
|
||||
|
||||
template<typename u16_type>
|
||||
inline utfchar16_t mask16(u16_type oc)
|
||||
{
|
||||
return static_cast<utfchar16_t>(0xffff & oc);
|
||||
}
|
||||
|
||||
template<typename octet_type>
|
||||
inline bool is_trail(octet_type oc)
|
||||
{
|
||||
return ((utf8::internal::mask8(oc) >> 6) == 0x2);
|
||||
}
|
||||
|
||||
inline bool is_lead_surrogate(utfchar32_t cp)
|
||||
{
|
||||
return (cp >= static_cast<utfchar32_t>(LEAD_SURROGATE_MIN) && cp <= static_cast<utfchar32_t>(LEAD_SURROGATE_MAX));
|
||||
}
|
||||
|
||||
inline bool is_trail_surrogate(utfchar32_t cp)
|
||||
{
|
||||
return (cp >= static_cast<utfchar32_t>(TRAIL_SURROGATE_MIN) && cp <= static_cast<utfchar32_t>(TRAIL_SURROGATE_MAX));
|
||||
}
|
||||
|
||||
inline bool is_surrogate(utfchar32_t cp)
|
||||
{
|
||||
return (cp >= static_cast<utfchar32_t>(LEAD_SURROGATE_MIN) && cp <= static_cast<utfchar32_t>(TRAIL_SURROGATE_MAX));
|
||||
}
|
||||
|
||||
inline bool is_code_point_valid(utfchar32_t cp)
|
||||
{
|
||||
return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
|
||||
}
|
||||
|
||||
inline bool is_in_bmp(utfchar32_t cp)
|
||||
{
|
||||
return cp < utfchar32_t(0x10000);
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
int sequence_length(octet_iterator lead_it)
|
||||
{
|
||||
const utfchar8_t lead = utf8::internal::mask8(*lead_it);
|
||||
if (lead < 0x80)
|
||||
return 1;
|
||||
else if ((lead >> 5) == 0x6)
|
||||
return 2;
|
||||
else if ((lead >> 4) == 0xe)
|
||||
return 3;
|
||||
else if ((lead >> 3) == 0x1e)
|
||||
return 4;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
inline bool is_overlong_sequence(utfchar32_t cp, int length)
|
||||
{
|
||||
if (cp < 0x80) {
|
||||
if (length != 1)
|
||||
return true;
|
||||
}
|
||||
else if (cp < 0x800) {
|
||||
if (length != 2)
|
||||
return true;
|
||||
}
|
||||
else if (cp < 0x10000) {
|
||||
if (length != 3)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
|
||||
|
||||
/// Helper for get_sequence_x
|
||||
template <typename octet_iterator>
|
||||
utf_error increase_safely(octet_iterator& it, const octet_iterator end)
|
||||
{
|
||||
if (++it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
if (!utf8::internal::is_trail(*it))
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
|
||||
return UTF8_OK;
|
||||
}
|
||||
|
||||
#define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}
|
||||
|
||||
/// get_sequence_x functions decode utf-8 sequences of the length x
|
||||
template <typename octet_iterator>
|
||||
utf_error get_sequence_1(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
|
||||
{
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
|
||||
|
||||
return UTF8_OK;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utf_error get_sequence_2(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
|
||||
{
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
|
||||
|
||||
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
|
||||
|
||||
code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
|
||||
|
||||
return UTF8_OK;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utf_error get_sequence_3(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
|
||||
{
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
|
||||
|
||||
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
|
||||
|
||||
code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
|
||||
|
||||
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
|
||||
|
||||
code_point = static_cast<utfchar32_t>(code_point + ((*it) & 0x3f));
|
||||
|
||||
return UTF8_OK;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utf_error get_sequence_4(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
|
||||
{
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
|
||||
|
||||
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
|
||||
|
||||
code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
|
||||
|
||||
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
|
||||
|
||||
code_point = static_cast<utfchar32_t>(code_point + ((utf8::internal::mask8(*it) << 6) & 0xfff));
|
||||
|
||||
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
|
||||
|
||||
code_point = static_cast<utfchar32_t>(code_point + ((*it) & 0x3f));
|
||||
|
||||
return UTF8_OK;
|
||||
}
|
||||
|
||||
#undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
|
||||
|
||||
template <typename octet_iterator>
|
||||
utf_error validate_next(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
|
||||
{
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
// Save the original value of it so we can go back in case of failure
|
||||
// Of course, it does not make much sense with i.e. stream iterators
|
||||
octet_iterator original_it = it;
|
||||
|
||||
utfchar32_t cp = 0;
|
||||
// Determine the sequence length based on the lead octet
|
||||
const int length = utf8::internal::sequence_length(it);
|
||||
|
||||
// Get trail octets and calculate the code point
|
||||
utf_error err = UTF8_OK;
|
||||
switch (length) {
|
||||
case 0:
|
||||
return INVALID_LEAD;
|
||||
case 1:
|
||||
err = utf8::internal::get_sequence_1(it, end, cp);
|
||||
// No need for further validations
|
||||
if (err == UTF8_OK) {
|
||||
code_point = cp;
|
||||
++it;
|
||||
return UTF8_OK;
|
||||
} else {
|
||||
it = original_it;
|
||||
return err;
|
||||
}
|
||||
break; // just to make sure there are no warnings
|
||||
case 2:
|
||||
err = utf8::internal::get_sequence_2(it, end, cp);
|
||||
break;
|
||||
case 3:
|
||||
err = utf8::internal::get_sequence_3(it, end, cp);
|
||||
break;
|
||||
case 4:
|
||||
err = utf8::internal::get_sequence_4(it, end, cp);
|
||||
break;
|
||||
}
|
||||
|
||||
if (err == UTF8_OK) {
|
||||
// Decoding succeeded. Now, security checks...
|
||||
if (utf8::internal::is_code_point_valid(cp)) {
|
||||
if (!utf8::internal::is_overlong_sequence(cp, length)){
|
||||
// Passed! Return here.
|
||||
code_point = cp;
|
||||
++it;
|
||||
return UTF8_OK;
|
||||
}
|
||||
else
|
||||
err = OVERLONG_SEQUENCE;
|
||||
}
|
||||
else
|
||||
err = INVALID_CODE_POINT;
|
||||
}
|
||||
|
||||
// Failure branch - restore the original value of the iterator
|
||||
it = original_it;
|
||||
return err;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
|
||||
octet_iterator original_it = it;
|
||||
const utfchar8_t lead = utf8::internal::mask8(*it);
|
||||
|
||||
if (lead < 0x80) {
|
||||
++it;
|
||||
return UTF8_OK;
|
||||
} else if ((lead & 0xE0) == 0xC0) {
|
||||
// two-byte sequence
|
||||
if (lead == 0xC0 || lead == 0xC1) {
|
||||
it = original_it;
|
||||
return OVERLONG_SEQUENCE;
|
||||
}
|
||||
if (++it == end) {
|
||||
it = original_it;
|
||||
return NOT_ENOUGH_ROOM;
|
||||
}
|
||||
const utfchar8_t trail1 = utf8::internal::mask8(*it);
|
||||
if ((trail1 & 0xC0) != 0x80) {
|
||||
it = original_it;
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
}
|
||||
++it;
|
||||
return UTF8_OK;
|
||||
} else if ((lead & 0xF0) == 0xE0) {
|
||||
// three-byte sequence
|
||||
if (++it == end) {
|
||||
it = original_it;
|
||||
return NOT_ENOUGH_ROOM;
|
||||
}
|
||||
const utfchar8_t trail1 = utf8::internal::mask8(*it);
|
||||
if ((trail1 & 0xC0) != 0x80) {
|
||||
it = original_it;
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
}
|
||||
if (++it == end) {
|
||||
it = original_it;
|
||||
return NOT_ENOUGH_ROOM;
|
||||
}
|
||||
const utfchar8_t trail2 = utf8::internal::mask8(*it);
|
||||
if ((trail2 & 0xC0) != 0x80) {
|
||||
it = original_it;
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
}
|
||||
if (lead == 0xE0 && trail1 < 0xA0) {
|
||||
it = original_it;
|
||||
return OVERLONG_SEQUENCE;
|
||||
}
|
||||
if (lead == 0xED && trail1 > 0x9F) {
|
||||
it = original_it;
|
||||
return INVALID_CODE_POINT;
|
||||
}
|
||||
++it;
|
||||
return UTF8_OK;
|
||||
} else if ((lead & 0xF8) == 0xF0) {
|
||||
// four-byte sequence
|
||||
if (++it == end) {
|
||||
it = original_it;
|
||||
return NOT_ENOUGH_ROOM;
|
||||
}
|
||||
const utfchar8_t trail1 = utf8::internal::mask8(*it);
|
||||
if ((trail1 & 0xC0) != 0x80) {
|
||||
it = original_it;
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
}
|
||||
if (++it == end) {
|
||||
it = original_it;
|
||||
return NOT_ENOUGH_ROOM;
|
||||
}
|
||||
const utfchar8_t trail2 = utf8::internal::mask8(*it);
|
||||
if ((trail2 & 0xC0) != 0x80) {
|
||||
it = original_it;
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
}
|
||||
if (++it == end) {
|
||||
it = original_it;
|
||||
return NOT_ENOUGH_ROOM;
|
||||
}
|
||||
const utfchar8_t trail3 = utf8::internal::mask8(*it);
|
||||
if ((trail3 & 0xC0) != 0x80) {
|
||||
it = original_it;
|
||||
return INCOMPLETE_SEQUENCE;
|
||||
}
|
||||
if (lead == 0xF0 && trail1 < 0x90) {
|
||||
it = original_it;
|
||||
return OVERLONG_SEQUENCE;
|
||||
}
|
||||
if (lead == 0xF4 && trail1 > 0x8F) {
|
||||
it = original_it;
|
||||
return INVALID_CODE_POINT;
|
||||
}
|
||||
if (lead >= 0xF5) {
|
||||
it = original_it;
|
||||
return INVALID_CODE_POINT;
|
||||
}
|
||||
++it;
|
||||
return UTF8_OK;
|
||||
} else {
|
||||
it = original_it;
|
||||
return INVALID_LEAD;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename word_iterator>
|
||||
utf_error validate_next16(word_iterator& it, word_iterator end, utfchar32_t& code_point)
|
||||
{
|
||||
// Make sure the iterator dereferences a large enough type
|
||||
typedef typename std::iterator_traits<word_iterator>::value_type word_type;
|
||||
UTF_CPP_STATIC_ASSERT(sizeof(word_type) >= sizeof(utfchar16_t));
|
||||
// Check the edge case:
|
||||
if (it == end)
|
||||
return NOT_ENOUGH_ROOM;
|
||||
// Save the original value of it so we can go back in case of failure
|
||||
// Of course, it does not make much sense with i.e. stream iterators
|
||||
word_iterator original_it = it;
|
||||
|
||||
utf_error err = UTF8_OK;
|
||||
|
||||
const utfchar16_t first_word = *it++;
|
||||
if (!is_surrogate(first_word)) {
|
||||
code_point = first_word;
|
||||
return UTF8_OK;
|
||||
}
|
||||
else {
|
||||
if (it == end)
|
||||
err = NOT_ENOUGH_ROOM;
|
||||
else if (is_lead_surrogate(first_word)) {
|
||||
const utfchar16_t second_word = *it++;
|
||||
if (is_trail_surrogate(static_cast<utfchar32_t>(second_word))) {
|
||||
code_point = static_cast<utfchar32_t>(first_word << 10) + static_cast<utfchar32_t>(second_word) + SURROGATE_OFFSET;
|
||||
return UTF8_OK;
|
||||
} else
|
||||
err = INCOMPLETE_SEQUENCE;
|
||||
|
||||
} else {
|
||||
err = INVALID_LEAD;
|
||||
}
|
||||
}
|
||||
// error branch
|
||||
it = original_it;
|
||||
return err;
|
||||
}
|
||||
|
||||
// Internal implementation of both checked and unchecked append() function
|
||||
// This function will be invoked by the overloads below, as they will know
|
||||
// the octet_type.
|
||||
template <typename octet_iterator, typename octet_type>
|
||||
octet_iterator append(utfchar32_t cp, octet_iterator result) {
|
||||
if (cp < 0x80) // one octet
|
||||
*(result++) = static_cast<octet_type>(cp);
|
||||
else if (cp < 0x800) { // two octets
|
||||
*(result++) = static_cast<octet_type>((cp >> 6) | 0xc0);
|
||||
*(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
|
||||
}
|
||||
else if (cp < 0x10000) { // three octets
|
||||
*(result++) = static_cast<octet_type>((cp >> 12) | 0xe0);
|
||||
*(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
|
||||
*(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
|
||||
}
|
||||
else { // four octets
|
||||
*(result++) = static_cast<octet_type>((cp >> 18) | 0xf0);
|
||||
*(result++) = static_cast<octet_type>(((cp >> 12) & 0x3f)| 0x80);
|
||||
*(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
|
||||
*(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// One of the following overloads will be invoked from the API calls
|
||||
|
||||
// A simple (but dangerous) case: the caller appends byte(s) to a char array
|
||||
inline char* append(utfchar32_t cp, char* result) {
|
||||
return append<char*, char>(cp, result);
|
||||
}
|
||||
|
||||
// Hopefully, most common case: the caller uses back_inserter
|
||||
// i.e. append(cp, std::back_inserter(str));
|
||||
template<typename container_type>
|
||||
std::back_insert_iterator<container_type> append
|
||||
(utfchar32_t cp, std::back_insert_iterator<container_type> result) {
|
||||
return append<std::back_insert_iterator<container_type>,
|
||||
typename container_type::value_type>(cp, result);
|
||||
}
|
||||
|
||||
// The caller uses some other kind of output operator - not covered above
|
||||
// Note that in this case we are not able to determine octet_type
|
||||
// so we assume it's utfchar8_t; that can cause a conversion warning if we are wrong.
|
||||
template <typename octet_iterator>
|
||||
octet_iterator append(utfchar32_t cp, octet_iterator result) {
|
||||
return append<octet_iterator, utfchar8_t>(cp, result);
|
||||
}
|
||||
|
||||
// Internal implementation of both checked and unchecked append16() function
|
||||
// This function will be invoked by the overloads below, as they will know
|
||||
// the word_type.
|
||||
template <typename word_iterator, typename word_type>
|
||||
word_iterator append16(utfchar32_t cp, word_iterator result) {
|
||||
UTF_CPP_STATIC_ASSERT(sizeof(word_type) >= sizeof(utfchar16_t));
|
||||
if (is_in_bmp(cp))
|
||||
*(result++) = static_cast<word_type>(cp);
|
||||
else {
|
||||
// Code points from the supplementary planes are encoded via surrogate pairs
|
||||
*(result++) = static_cast<word_type>(LEAD_OFFSET + (cp >> 10));
|
||||
*(result++) = static_cast<word_type>(TRAIL_SURROGATE_MIN + (cp & 0x3FF));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Hopefully, most common case: the caller uses back_inserter
|
||||
// i.e. append16(cp, std::back_inserter(str));
|
||||
template<typename container_type>
|
||||
std::back_insert_iterator<container_type> append16
|
||||
(utfchar32_t cp, std::back_insert_iterator<container_type> result) {
|
||||
return append16<std::back_insert_iterator<container_type>,
|
||||
typename container_type::value_type>(cp, result);
|
||||
}
|
||||
|
||||
// The caller uses some other kind of output operator - not covered above
|
||||
// Note that in this case we are not able to determine word_type
|
||||
// so we assume it's utfchar16_t; that can cause a conversion warning if we are wrong.
|
||||
template <typename word_iterator>
|
||||
word_iterator append16(utfchar32_t cp, word_iterator result) {
|
||||
return append16<word_iterator, utfchar16_t>(cp, result);
|
||||
}
|
||||
|
||||
} // namespace internal
|
||||
|
||||
/// The library API - functions intended to be called by the users
|
||||
|
||||
// Byte order mark
|
||||
const utfchar8_t bom[] = {0xef, 0xbb, 0xbf};
|
||||
|
||||
template <typename octet_iterator>
|
||||
octet_iterator find_invalid(octet_iterator start, octet_iterator end)
|
||||
{
|
||||
octet_iterator result = start;
|
||||
while (result != end) {
|
||||
utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
|
||||
if (err_code != internal::UTF8_OK)
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
inline const char* find_invalid(const char* str)
|
||||
{
|
||||
const char* end = str + std::strlen(str);
|
||||
return find_invalid(str, end);
|
||||
}
|
||||
|
||||
inline std::size_t find_invalid(const std::string& s)
|
||||
{
|
||||
std::string::const_iterator invalid = find_invalid(s.begin(), s.end());
|
||||
return (invalid == s.end()) ? std::string::npos : static_cast<std::size_t>(invalid - s.begin());
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
inline bool is_valid(octet_iterator start, octet_iterator end)
|
||||
{
|
||||
return (utf8::find_invalid(start, end) == end);
|
||||
}
|
||||
|
||||
inline bool is_valid(const char* str)
|
||||
{
|
||||
return (*(utf8::find_invalid(str)) == '\0');
|
||||
}
|
||||
|
||||
inline bool is_valid(const std::string& s)
|
||||
{
|
||||
return is_valid(s.begin(), s.end());
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <typename octet_iterator>
|
||||
inline bool starts_with_bom (octet_iterator it, octet_iterator end)
|
||||
{
|
||||
return (
|
||||
((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
|
||||
((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
|
||||
((it != end) && (utf8::internal::mask8(*it)) == bom[2])
|
||||
);
|
||||
}
|
||||
|
||||
inline bool starts_with_bom(const std::string& s)
|
||||
{
|
||||
return starts_with_bom(s.begin(), s.end());
|
||||
}
|
||||
} // namespace utf8
|
||||
|
||||
#endif // header guard
|
||||
|
||||
70
include/utf8cpp/utf8/cpp11.h
Normal file
70
include/utf8cpp/utf8/cpp11.h
Normal file
@@ -0,0 +1,70 @@
|
||||
// Copyright 2018 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_a184c22c_d012_11e8_a8d5_f2801f1b9fd1
|
||||
#define UTF8_FOR_CPP_a184c22c_d012_11e8_a8d5_f2801f1b9fd1
|
||||
|
||||
#include "checked.h"
|
||||
|
||||
namespace utf8
|
||||
{
|
||||
inline void append16(utfchar32_t cp, std::u16string& s)
|
||||
{
|
||||
append16(cp, std::back_inserter(s));
|
||||
}
|
||||
|
||||
inline std::string utf16to8(const std::u16string& s)
|
||||
{
|
||||
std::string result;
|
||||
utf16to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u16string utf8to16(const std::string& s)
|
||||
{
|
||||
std::u16string result;
|
||||
utf8to16(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::string utf32to8(const std::u32string& s)
|
||||
{
|
||||
std::string result;
|
||||
utf32to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u32string utf8to32(const std::string& s)
|
||||
{
|
||||
std::u32string result;
|
||||
utf8to32(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
} // namespace utf8
|
||||
|
||||
#endif // header guard
|
||||
|
||||
96
include/utf8cpp/utf8/cpp17.h
Normal file
96
include/utf8cpp/utf8/cpp17.h
Normal file
@@ -0,0 +1,96 @@
|
||||
// Copyright 2018 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_7e906c01_03a3_4daf_b420_ea7ea952b3c9
|
||||
#define UTF8_FOR_CPP_7e906c01_03a3_4daf_b420_ea7ea952b3c9
|
||||
|
||||
#include "cpp11.h"
|
||||
|
||||
namespace utf8
|
||||
{
|
||||
inline std::string utf16to8(std::u16string_view s)
|
||||
{
|
||||
std::string result;
|
||||
utf16to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u16string utf8to16(std::string_view s)
|
||||
{
|
||||
std::u16string result;
|
||||
utf8to16(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::string utf32to8(std::u32string_view s)
|
||||
{
|
||||
std::string result;
|
||||
utf32to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u32string utf8to32(std::string_view s)
|
||||
{
|
||||
std::u32string result;
|
||||
utf8to32(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::size_t find_invalid(std::string_view s)
|
||||
{
|
||||
std::string_view::const_iterator invalid = find_invalid(s.begin(), s.end());
|
||||
return (invalid == s.end()) ? std::string_view::npos : static_cast<std::size_t>(invalid - s.begin());
|
||||
}
|
||||
|
||||
inline bool is_valid(std::string_view s)
|
||||
{
|
||||
return is_valid(s.begin(), s.end());
|
||||
}
|
||||
|
||||
inline std::string replace_invalid(std::string_view s, char32_t replacement)
|
||||
{
|
||||
std::string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::string replace_invalid(std::string_view s)
|
||||
{
|
||||
std::string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline bool starts_with_bom(std::string_view s)
|
||||
{
|
||||
return starts_with_bom(s.begin(), s.end());
|
||||
}
|
||||
|
||||
} // namespace utf8
|
||||
|
||||
#endif // header guard
|
||||
|
||||
124
include/utf8cpp/utf8/cpp20.h
Normal file
124
include/utf8cpp/utf8/cpp20.h
Normal file
@@ -0,0 +1,124 @@
|
||||
// Copyright 2022 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_207e906c01_03a3_4daf_b420_ea7ea952b3c9
|
||||
#define UTF8_FOR_CPP_207e906c01_03a3_4daf_b420_ea7ea952b3c9
|
||||
|
||||
#include "cpp17.h"
|
||||
|
||||
namespace utf8
|
||||
{
|
||||
inline std::u8string utf16tou8(const std::u16string& s)
|
||||
{
|
||||
std::u8string result;
|
||||
utf16to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u8string utf16tou8(std::u16string_view s)
|
||||
{
|
||||
std::u8string result;
|
||||
utf16to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u16string utf8to16(const std::u8string& s)
|
||||
{
|
||||
std::u16string result;
|
||||
utf8to16(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u16string utf8to16(const std::u8string_view& s)
|
||||
{
|
||||
std::u16string result;
|
||||
utf8to16(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u8string utf32tou8(const std::u32string& s)
|
||||
{
|
||||
std::u8string result;
|
||||
utf32to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u8string utf32tou8(const std::u32string_view& s)
|
||||
{
|
||||
std::u8string result;
|
||||
utf32to8(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u32string utf8to32(const std::u8string& s)
|
||||
{
|
||||
std::u32string result;
|
||||
utf8to32(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u32string utf8to32(const std::u8string_view& s)
|
||||
{
|
||||
std::u32string result;
|
||||
utf8to32(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::size_t find_invalid(const std::u8string& s)
|
||||
{
|
||||
std::u8string::const_iterator invalid = find_invalid(s.begin(), s.end());
|
||||
return (invalid == s.end()) ? std::string_view::npos : static_cast<std::size_t>(invalid - s.begin());
|
||||
}
|
||||
|
||||
inline bool is_valid(const std::u8string& s)
|
||||
{
|
||||
return is_valid(s.begin(), s.end());
|
||||
}
|
||||
|
||||
inline std::u8string replace_invalid(const std::u8string& s, char32_t replacement)
|
||||
{
|
||||
std::u8string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::u8string replace_invalid(const std::u8string& s)
|
||||
{
|
||||
std::u8string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
inline bool starts_with_bom(const std::u8string& s)
|
||||
{
|
||||
return starts_with_bom(s.begin(), s.end());
|
||||
}
|
||||
|
||||
} // namespace utf8
|
||||
|
||||
#endif // header guard
|
||||
|
||||
286
include/utf8cpp/utf8/unchecked.h
Normal file
286
include/utf8cpp/utf8/unchecked.h
Normal file
@@ -0,0 +1,286 @@
|
||||
// Copyright 2006 Nemanja Trifunovic
|
||||
|
||||
/*
|
||||
Permission is hereby granted, free of charge, to any person or organization
|
||||
obtaining a copy of the software and accompanying documentation covered by
|
||||
this license (the "Software") to use, reproduce, display, distribute,
|
||||
execute, and transmit the Software, and to prepare derivative works of the
|
||||
Software, and to permit third-parties to whom the Software is furnished to
|
||||
do so, all subject to the following:
|
||||
|
||||
The copyright notices in the Software and this entire statement, including
|
||||
the above license grant, this restriction and the following disclaimer,
|
||||
must be included in all copies of the Software, in whole or in part, and
|
||||
all derivative works of the Software, unless such copies or derivative
|
||||
works are solely in the form of machine-executable object code generated by
|
||||
a source language processor.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
|
||||
|
||||
#include "core.h"
|
||||
|
||||
namespace utf8
|
||||
{
|
||||
namespace unchecked
|
||||
{
|
||||
template <typename octet_iterator>
|
||||
octet_iterator append(utfchar32_t cp, octet_iterator result)
|
||||
{
|
||||
return internal::append(cp, result);
|
||||
}
|
||||
|
||||
template <typename word_iterator>
|
||||
word_iterator append16(utfchar32_t cp, word_iterator result)
|
||||
{
|
||||
return internal::append16(cp, result);
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename output_iterator>
|
||||
output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, utfchar32_t replacement)
|
||||
{
|
||||
while (start != end) {
|
||||
octet_iterator sequence_start = start;
|
||||
internal::utf_error err_code = utf8::internal::validate_next(start, end);
|
||||
switch (err_code) {
|
||||
case internal::UTF8_OK :
|
||||
for (octet_iterator it = sequence_start; it != start; ++it)
|
||||
*out++ = *it;
|
||||
break;
|
||||
case internal::NOT_ENOUGH_ROOM:
|
||||
out = utf8::unchecked::append(replacement, out);
|
||||
start = end;
|
||||
break;
|
||||
case internal::INVALID_LEAD:
|
||||
out = utf8::unchecked::append(replacement, out);
|
||||
++start;
|
||||
break;
|
||||
case internal::INCOMPLETE_SEQUENCE:
|
||||
case internal::OVERLONG_SEQUENCE:
|
||||
case internal::INVALID_CODE_POINT:
|
||||
out = utf8::unchecked::append(replacement, out);
|
||||
++start;
|
||||
// just one replacement mark for the sequence
|
||||
while (start != end && utf8::internal::is_trail(*start))
|
||||
++start;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename output_iterator>
|
||||
inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
|
||||
{
|
||||
static const utfchar32_t replacement_marker = static_cast<utfchar32_t>(utf8::internal::mask16(0xfffd));
|
||||
return utf8::unchecked::replace_invalid(start, end, out, replacement_marker);
|
||||
}
|
||||
|
||||
inline std::string replace_invalid(const std::string& s, utfchar32_t replacement)
|
||||
{
|
||||
std::string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
|
||||
return result;
|
||||
}
|
||||
|
||||
inline std::string replace_invalid(const std::string& s)
|
||||
{
|
||||
std::string result;
|
||||
replace_invalid(s.begin(), s.end(), std::back_inserter(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utfchar32_t next(octet_iterator& it)
|
||||
{
|
||||
utfchar32_t cp = utf8::internal::mask8(*it);
|
||||
switch (utf8::internal::sequence_length(it)) {
|
||||
case 1:
|
||||
break;
|
||||
case 2:
|
||||
++it;
|
||||
cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
|
||||
break;
|
||||
case 3:
|
||||
++it;
|
||||
cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
|
||||
++it;
|
||||
cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
|
||||
break;
|
||||
case 4:
|
||||
++it;
|
||||
cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
|
||||
++it;
|
||||
cp = static_cast<utfchar32_t>(cp + ((utf8::internal::mask8(*it) << 6) & 0xfff));
|
||||
++it;
|
||||
cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
|
||||
break;
|
||||
}
|
||||
++it;
|
||||
return cp;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utfchar32_t peek_next(octet_iterator it)
|
||||
{
|
||||
return utf8::unchecked::next(it);
|
||||
}
|
||||
|
||||
template <typename word_iterator>
|
||||
utfchar32_t next16(word_iterator& it)
|
||||
{
|
||||
utfchar32_t cp = utf8::internal::mask16(*it++);
|
||||
if (utf8::internal::is_lead_surrogate(cp))
|
||||
return (cp << 10) + *it++ + utf8::internal::SURROGATE_OFFSET;
|
||||
return cp;
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
utfchar32_t prior(octet_iterator& it)
|
||||
{
|
||||
while (utf8::internal::is_trail(*(--it))) ;
|
||||
octet_iterator temp = it;
|
||||
return utf8::unchecked::next(temp);
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename distance_type>
|
||||
void advance(octet_iterator& it, distance_type n)
|
||||
{
|
||||
const distance_type zero(0);
|
||||
if (n < zero) {
|
||||
// backward
|
||||
for (distance_type i = n; i < zero; ++i)
|
||||
utf8::unchecked::prior(it);
|
||||
} else {
|
||||
// forward
|
||||
for (distance_type i = zero; i < n; ++i)
|
||||
utf8::unchecked::next(it);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename octet_iterator>
|
||||
typename std::iterator_traits<octet_iterator>::difference_type
|
||||
distance(octet_iterator first, octet_iterator last)
|
||||
{
|
||||
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
||||
for (dist = 0; first < last; ++dist)
|
||||
utf8::unchecked::next(first);
|
||||
return dist;
|
||||
}
|
||||
|
||||
template <typename u16bit_iterator, typename octet_iterator>
|
||||
octet_iterator utf16to8(u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
||||
{
|
||||
while (start != end) {
|
||||
utfchar32_t cp = utf8::internal::mask16(*start++);
|
||||
// Take care of surrogate pairs first
|
||||
if (utf8::internal::is_lead_surrogate(cp)) {
|
||||
if (start == end)
|
||||
return result;
|
||||
utfchar32_t trail_surrogate = utf8::internal::mask16(*start++);
|
||||
cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
|
||||
}
|
||||
result = utf8::unchecked::append(cp, result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename u16bit_iterator, typename octet_iterator>
|
||||
u16bit_iterator utf8to16(octet_iterator start, octet_iterator end, u16bit_iterator result)
|
||||
{
|
||||
while (start < end) {
|
||||
utfchar32_t cp = utf8::unchecked::next(start);
|
||||
if (cp > 0xffff) { //make a surrogate pair
|
||||
*result++ = static_cast<utfchar16_t>((cp >> 10) + internal::LEAD_OFFSET);
|
||||
*result++ = static_cast<utfchar16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
|
||||
}
|
||||
else
|
||||
*result++ = static_cast<utfchar16_t>(cp);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename u32bit_iterator>
|
||||
octet_iterator utf32to8(u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
||||
{
|
||||
while (start != end)
|
||||
result = utf8::unchecked::append(*(start++), result);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename octet_iterator, typename u32bit_iterator>
|
||||
u32bit_iterator utf8to32(octet_iterator start, octet_iterator end, u32bit_iterator result)
|
||||
{
|
||||
while (start < end)
|
||||
(*result++) = utf8::unchecked::next(start);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// The iterator class
|
||||
template <typename octet_iterator>
|
||||
class iterator {
|
||||
octet_iterator it;
|
||||
public:
|
||||
typedef utfchar32_t value_type;
|
||||
typedef utfchar32_t* pointer;
|
||||
typedef utfchar32_t& reference;
|
||||
typedef std::ptrdiff_t difference_type;
|
||||
typedef std::bidirectional_iterator_tag iterator_category;
|
||||
iterator () {}
|
||||
explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
|
||||
// the default "big three" are OK
|
||||
octet_iterator base () const { return it; }
|
||||
utfchar32_t operator * () const
|
||||
{
|
||||
octet_iterator temp = it;
|
||||
return utf8::unchecked::next(temp);
|
||||
}
|
||||
bool operator == (const iterator& rhs) const
|
||||
{
|
||||
return (it == rhs.it);
|
||||
}
|
||||
bool operator != (const iterator& rhs) const
|
||||
{
|
||||
return !(operator == (rhs));
|
||||
}
|
||||
iterator& operator ++ ()
|
||||
{
|
||||
::std::advance(it, utf8::internal::sequence_length(it));
|
||||
return *this;
|
||||
}
|
||||
iterator operator ++ (int)
|
||||
{
|
||||
iterator temp = *this;
|
||||
::std::advance(it, utf8::internal::sequence_length(it));
|
||||
return temp;
|
||||
}
|
||||
iterator& operator -- ()
|
||||
{
|
||||
utf8::unchecked::prior(it);
|
||||
return *this;
|
||||
}
|
||||
iterator operator -- (int)
|
||||
{
|
||||
iterator temp = *this;
|
||||
utf8::unchecked::prior(it);
|
||||
return temp;
|
||||
}
|
||||
}; // class iterator
|
||||
|
||||
} // namespace utf8::unchecked
|
||||
} // namespace utf8
|
||||
|
||||
#endif // header guard
|
||||
|
||||
Reference in New Issue
Block a user