Compare commits
18 Commits
dev-2095bc
...
clipboard_
Author | SHA1 | Date | |
---|---|---|---|
e45b50befc | |||
77005cba4b | |||
c1af43ce54 | |||
2a94c72df9 | |||
b13a87a405 | |||
a5ec166794 | |||
35a0d97170 | |||
d0ab985349 | |||
b65b9b284b | |||
18db2e3aaa | |||
46ceb2cd61 | |||
979fd10b08 | |||
5f3bdde2dc | |||
22e97063ec | |||
1ffee9933a | |||
aaa23194c5 | |||
013d1fef3b | |||
35026dfa0f |
21
.github/workflows/cd.yml
vendored
21
.github/workflows/cd.yml
vendored
@ -7,7 +7,8 @@ on:
|
||||
branches: [ master ]
|
||||
|
||||
env:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
#BUILD_TYPE: RelWithDebInfo
|
||||
BUILD_TYPE: Debug
|
||||
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
|
||||
|
||||
jobs:
|
||||
@ -28,7 +29,7 @@ jobs:
|
||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
|
||||
|
||||
- name: Determine tag name
|
||||
id: tag
|
||||
@ -67,6 +68,12 @@ jobs:
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: update vcpkg
|
||||
shell: bash
|
||||
run: |
|
||||
cd C:/vcpkg
|
||||
git pull
|
||||
|
||||
- name: Install Dependencies
|
||||
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
|
||||
|
||||
@ -82,7 +89,7 @@ jobs:
|
||||
run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -t tomato
|
||||
|
||||
- name: Determine tag name
|
||||
id: tag
|
||||
@ -121,6 +128,12 @@ jobs:
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: update vcpkg
|
||||
shell: bash
|
||||
run: |
|
||||
cd C:/vcpkg
|
||||
git pull
|
||||
|
||||
- name: Install Dependencies
|
||||
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
|
||||
|
||||
@ -136,7 +149,7 @@ jobs:
|
||||
run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_ASAN=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
|
||||
|
||||
- name: Determine tag name
|
||||
id: tag
|
||||
|
12
.github/workflows/ci.yml
vendored
12
.github/workflows/ci.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
|
||||
|
||||
macos:
|
||||
timeout-minutes: 10
|
||||
@ -46,7 +46,7 @@ jobs:
|
||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
|
||||
|
||||
windows:
|
||||
timeout-minutes: 15
|
||||
@ -58,6 +58,12 @@ jobs:
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: update vcpkg
|
||||
shell: bash
|
||||
run: |
|
||||
cd C:/vcpkg
|
||||
git pull
|
||||
|
||||
- name: Install Dependencies
|
||||
run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
|
||||
|
||||
@ -73,5 +79,5 @@ jobs:
|
||||
run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
|
||||
|
||||
|
@ -38,6 +38,10 @@ if (TOMATO_ASAN)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# uggly, but it needs to be defined for all of tomato.
|
||||
# but this also means that we can not compile tomato in the same cmake as plugins
|
||||
add_compile_definitions(ENTT_API_EXPORT)
|
||||
|
||||
# external libs
|
||||
add_subdirectory(./external) # before increasing warn levels, sad :(
|
||||
|
||||
|
5
external/sdl/CMakeLists.txt
vendored
5
external/sdl/CMakeLists.txt
vendored
@ -8,12 +8,17 @@ if (NOT TARGET SDL3::SDL3)
|
||||
#TODO: pic ?
|
||||
|
||||
FetchContent_Declare(SDL3
|
||||
#[[
|
||||
GIT_REPOSITORY https://github.com/libsdl-org/SDL
|
||||
#GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking
|
||||
#GIT_TAG 14f584a94bfd49cf1524db75bf3c419fdf9436cd # tip 26-04-2024
|
||||
GIT_TAG 06d6f2cb2518622593570985589700910cf4399f # 13-05-2024 - before
|
||||
# made changes that break imgui release 1.90.6
|
||||
#GIT_TAG 1103294d33f47ab4c697bb22a9cf27c79c658630 # tip 15-05-2024
|
||||
]]
|
||||
|
||||
GIT_REPOSITORY https://github.com/Green-Sky/SDL.git
|
||||
GIT_TAG windows_clipboard_fixes
|
||||
FIND_PACKAGE_ARGS # for the future
|
||||
)
|
||||
FetchContent_MakeAvailable(SDL3)
|
||||
|
2
external/solanaceae_message3
vendored
2
external/solanaceae_message3
vendored
Submodule external/solanaceae_message3 updated: 96b76dc67f...f03c4b1210
2
external/solanaceae_object_store
vendored
2
external/solanaceae_object_store
vendored
Submodule external/solanaceae_object_store updated: e26959c380...be24b3815b
2
external/solanaceae_plugin
vendored
2
external/solanaceae_plugin
vendored
Submodule external/solanaceae_plugin updated: 82cfb6d492...f7a519754d
2
external/solanaceae_tox
vendored
2
external/solanaceae_tox
vendored
Submodule external/solanaceae_tox updated: 2807239dea...676e50c61a
2
external/solanaceae_toxcore
vendored
2
external/solanaceae_toxcore
vendored
Submodule external/solanaceae_toxcore updated: cf3679018b...7cd6a2b0de
2
external/solanaceae_util
vendored
2
external/solanaceae_util
vendored
Submodule external/solanaceae_util updated: 2420af464f...4bda751f76
@ -105,3 +105,8 @@ target_link_libraries(tomato PUBLIC
|
||||
SDL3_image::SDL3_image
|
||||
)
|
||||
|
||||
# probably not enough
|
||||
#target_compile_definitions(tomato PUBLIC ENTT_API_EXPORT)
|
||||
|
||||
set_target_properties(tomato PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
|
@ -89,6 +89,52 @@ static void drawIconCloud(
|
||||
ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_main, ImDrawFlags_None, 1.5f);
|
||||
}
|
||||
|
||||
static void drawIconMailLines(
|
||||
const ImVec2 p0,
|
||||
const ImVec2 p1_o,
|
||||
const ImU32 col,
|
||||
const float thickness
|
||||
) {
|
||||
#define PLINE(x0, y0, x1, y1) \
|
||||
ImGui::GetWindowDrawList()->AddLine( \
|
||||
{p0.x + p1_o.x*(x0), p0.y + p1_o.y*(y0)}, \
|
||||
{p0.x + p1_o.x*(x1), p0.y + p1_o.y*(y1)}, \
|
||||
col, \
|
||||
thickness \
|
||||
);
|
||||
|
||||
// quad
|
||||
// (1,2) -> (1,8)
|
||||
PLINE(0.1f, 0.2f, 0.1f, 0.8f)
|
||||
// (1,8) -> (9,8)
|
||||
PLINE(0.1f, 0.8f, 0.9f, 0.8f)
|
||||
// (9,8) -> (9,2)
|
||||
PLINE(0.9f, 0.8f, 0.9f, 0.2f)
|
||||
// (9,2) -> (1,2)
|
||||
PLINE(0.9f, 0.2f, 0.1f, 0.2f)
|
||||
|
||||
// lip
|
||||
// (1,2) -> (5,5)
|
||||
PLINE(0.1f, 0.2f, 0.5f, 0.5f)
|
||||
// (5,5) -> (9,2)
|
||||
PLINE(0.5f, 0.5f, 0.9f, 0.2f)
|
||||
|
||||
#undef PLINE
|
||||
}
|
||||
|
||||
static void drawIconMail(
|
||||
const ImVec2 p0,
|
||||
const ImVec2 p1_o,
|
||||
const ImU32 col_main,
|
||||
const ImU32 col_back
|
||||
) {
|
||||
// dark background
|
||||
// the circle looks bad in light mode
|
||||
//ImGui::GetWindowDrawList()->AddCircleFilled({p0.x + p1_o.x*0.5f, p0.y + p1_o.y*0.5f}, p1_o.x*0.5f, col_back);
|
||||
drawIconMailLines(p0, p1_o, col_back, 4.0f);
|
||||
drawIconMailLines(p0, p1_o, col_main, 1.5f);
|
||||
}
|
||||
|
||||
void renderAvatar(
|
||||
const Theme& th,
|
||||
ContactTextureCache& contact_tc,
|
||||
@ -245,7 +291,26 @@ bool renderContactBig(
|
||||
ImGui::SameLine(0.f, same_line_spacing);
|
||||
}
|
||||
|
||||
ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>"));
|
||||
//ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>"));
|
||||
ImGui::TextUnformatted(c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>");
|
||||
if (unread) {
|
||||
ImGui::SameLine();
|
||||
const float icon_size { TEXT_BASE_HEIGHT - ImGui::GetStyle().FramePadding.y*2 };
|
||||
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - icon_size);
|
||||
|
||||
// icon pos
|
||||
auto p0 = ImGui::GetCursorScreenPos();
|
||||
//p0.y += ImGui::GetStyle().FramePadding.y;
|
||||
ImVec2 p1_o = {icon_size, icon_size};
|
||||
|
||||
drawIconMail(
|
||||
p0,
|
||||
p1_o,
|
||||
ImGui::GetColorU32(th.getColor<ThemeCol_Contact::unread>()),
|
||||
ImGui::GetColorU32(th.getColor<ThemeCol_Contact::icon_backdrop>())
|
||||
);
|
||||
ImGui::Dummy(p1_o);
|
||||
}
|
||||
}
|
||||
|
||||
// line 2
|
||||
|
@ -14,6 +14,9 @@ enum class ThemeCol_Contact {
|
||||
avatar_online_cloud,
|
||||
avatar_offline,
|
||||
|
||||
unread,
|
||||
unread_muted,
|
||||
|
||||
icon_backdrop,
|
||||
};
|
||||
|
||||
@ -27,7 +30,7 @@ void renderAvatar(
|
||||
// returns true if clicked, if selectable, will highlight on hover and respect selected
|
||||
// TODO: refine
|
||||
// +------+
|
||||
// | | *Name (Alias?)
|
||||
// | | *Name (Alias?) [v]
|
||||
// |Avatar| Satus Message <-- richpresence interface?
|
||||
// | | user status (online/away/busy)-direct/relayed / offline <-- last text?
|
||||
// +------+
|
||||
|
@ -152,7 +152,7 @@ void SendImagePopup::sendMemory(
|
||||
|
||||
// copy paste data to memory
|
||||
original_data.clear();
|
||||
original_data.insert(original_data.begin(), data, data+data_size);
|
||||
original_data.insert(original_data.cend(), data, data+data_size);
|
||||
|
||||
if (!load()) {
|
||||
std::cerr << "SIP: failed to load image from memory\n";
|
||||
|
@ -41,14 +41,17 @@ bool Theme::store(void) {
|
||||
Theme getDefaultThemeDark(void) {
|
||||
Theme t;
|
||||
|
||||
t.setColor<ThemeCol_Contact::request_incoming >({0.98f, 0.41f, 0.26f, 0.52f});
|
||||
t.setColor<ThemeCol_Contact::request_outgoing >({0.98f, 0.26f, 0.41f, 0.52f});
|
||||
t.setColor<ThemeCol_Contact::request_incoming >({0.98f, 0.41f, 0.26f, 0.52f});
|
||||
t.setColor<ThemeCol_Contact::request_outgoing >({0.98f, 0.26f, 0.41f, 0.52f});
|
||||
|
||||
t.setColor<ThemeCol_Contact::avatar_online_direct >({0.3f, 1.0f, 0.0f, 1.0f});
|
||||
t.setColor<ThemeCol_Contact::avatar_online_cloud >({0.0f, 1.0f, 0.8f, 1.0f});
|
||||
t.setColor<ThemeCol_Contact::avatar_offline >({0.4f, 0.4f, 0.4f, 1.0f});
|
||||
t.setColor<ThemeCol_Contact::avatar_offline >({0.4f, 0.4f, 0.4f, 1.0f});
|
||||
|
||||
t.setColor<ThemeCol_Contact::icon_backdrop >({0.0f, 0.0f, 0.0f, 0.4f});
|
||||
t.setColor<ThemeCol_Contact::unread >(ImGui::GetStyleColorVec4(ImGuiCol_PlotHistogramHovered));
|
||||
t.setColor<ThemeCol_Contact::unread_muted >({0.6f, 0.6f, 0.6f, 0.9f});
|
||||
|
||||
t.setColor<ThemeCol_Contact::icon_backdrop >({0.0f, 0.0f, 0.0f, 0.4f});
|
||||
|
||||
return t;
|
||||
}
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "./chat_gui4.hpp"
|
||||
|
||||
#include <exception>
|
||||
#include <solanaceae/message3/components.hpp>
|
||||
#include <solanaceae/tox_messages/components.hpp>
|
||||
#include <solanaceae/contact/components.hpp>
|
||||
@ -26,6 +27,8 @@
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
#include <system_error>
|
||||
#include <variant>
|
||||
|
||||
namespace Components {
|
||||
@ -89,6 +92,30 @@ static std::string file_path_url_escape(const std::string&& value) {
|
||||
return escaped.str();
|
||||
}
|
||||
|
||||
static std::string file_path_to_file_url(const std::filesystem::path& path) {
|
||||
const auto can_path = std::filesystem::canonical(path);
|
||||
std::string url {"file://"};
|
||||
// special windows detection <.<
|
||||
// we detect a drive letter here
|
||||
if (can_path.has_root_name() && can_path.root_name().generic_u8string().back() == ':') {
|
||||
const std::string root_name = can_path.root_name().generic_u8string();
|
||||
// drive letters have a colon, which needs skipping the url escaping
|
||||
url += "/";
|
||||
url += root_name;
|
||||
|
||||
//url += "/";
|
||||
// bugged, does not work (but it should, open msvc stl issue?)
|
||||
//url += file_path_url_escape(can_path.lexically_proximate(can_path.root_name()).generic_u8string());
|
||||
|
||||
// remove drive letter
|
||||
url += file_path_url_escape(can_path.generic_u8string().substr(root_name.size()));
|
||||
} else {
|
||||
url += file_path_url_escape(can_path.generic_u8string());
|
||||
}
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
const void* clipboard_callback(void* userdata, const char* mime_type, size_t* size) {
|
||||
if (mime_type == nullptr) {
|
||||
// cleared or new data is set
|
||||
@ -130,13 +157,30 @@ void ChatGui4::setClipboardData(std::vector<std::string> mime_types, std::shared
|
||||
|
||||
std::vector<const char*> tmp_mimetype_list;
|
||||
|
||||
std::lock_guard lg{_set_clipboard_data_mutex};
|
||||
for (const auto& mime_type : mime_types) {
|
||||
tmp_mimetype_list.push_back(mime_type.data());
|
||||
_set_clipboard_data[mime_type] = data;
|
||||
{
|
||||
std::lock_guard lg{_set_clipboard_data_mutex};
|
||||
for (const auto& mime_type : mime_types) {
|
||||
tmp_mimetype_list.push_back(mime_type.data());
|
||||
_set_clipboard_data[mime_type] = data;
|
||||
}
|
||||
|
||||
// release lock, since on some platforms the callback is called immediatly
|
||||
}
|
||||
|
||||
SDL_SetClipboardData(clipboard_callback, nullptr, this, tmp_mimetype_list.data(), tmp_mimetype_list.size());
|
||||
try {
|
||||
SDL_SetClipboardData(clipboard_callback, nullptr, this, tmp_mimetype_list.data(), tmp_mimetype_list.size());
|
||||
} catch (const std::runtime_error& e) {
|
||||
std::cerr << "CG error: setting clipboard data threw runtime_error!\n";
|
||||
std::cerr << "what: " << e.what() << "\n";
|
||||
} catch (const std::system_error& e) {
|
||||
std::cerr << "CG error: setting clipboard data threw system_error!\n";
|
||||
std::cerr << "what: " << e.what() << "\n";
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << "CG error: setting clipboard data threw exception!\n";
|
||||
std::cerr << "what: " << e.what() << "\n";
|
||||
} catch (...) {
|
||||
std::cerr << "CG error: setting clipboard data threw!\n";
|
||||
}
|
||||
}
|
||||
|
||||
ChatGui4::ChatGui4(
|
||||
@ -974,12 +1018,12 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
|
||||
const auto& local_info = reg.get<Message::Components::Transfer::FileInfoLocal>(e);
|
||||
if (local_info.file_list.size() > i && ImGui::BeginPopupContextItem("##file_c")) {
|
||||
if (ImGui::MenuItem("open")) {
|
||||
const std::string url{"file://" + file_path_url_escape(std::filesystem::canonical(local_info.file_list.at(i)).generic_u8string())};
|
||||
const std::string url {file_path_to_file_url(local_info.file_list.at(i))};
|
||||
std::cout << "opening file '" << url << "'\n";
|
||||
SDL_OpenURL(url.c_str());
|
||||
}
|
||||
if (ImGui::MenuItem("copy file")) {
|
||||
const std::string url{"file://" + file_path_url_escape(std::filesystem::canonical(local_info.file_list.at(i)).generic_u8string())};
|
||||
const std::string url {file_path_to_file_url(local_info.file_list.at(i))};
|
||||
//ImGui::SetClipboardText(url.c_str());
|
||||
setClipboardData({"text/uri-list", "text/x-moz-url"}, std::make_shared<std::vector<uint8_t>>(url.begin(), url.end()));
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ ImageLoaderQOI::ImageResult ImageLoaderQOI::loadFromMemoryRGBA(const uint8_t* da
|
||||
|
||||
auto& new_frame = res.frames.emplace_back();
|
||||
new_frame.ms = 0;
|
||||
new_frame.data.insert(new_frame.data.cbegin(), img_data, img_data+(desc.width*desc.height*4));
|
||||
new_frame.data.insert(new_frame.data.cend(), img_data, img_data+(desc.width*desc.height*4));
|
||||
|
||||
free(img_data);
|
||||
return res;
|
||||
|
@ -47,7 +47,7 @@ ImageLoaderSDLBMP::ImageResult ImageLoaderSDLBMP::loadFromMemoryRGBA(const uint8
|
||||
|
||||
auto& new_frame = res.frames.emplace_back();
|
||||
new_frame.ms = 0;
|
||||
new_frame.data.insert(new_frame.data.cbegin(), (const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (surf->w*surf->h*4));
|
||||
new_frame.data.insert(new_frame.data.cend(), (const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (surf->w*surf->h*4));
|
||||
|
||||
SDL_UnlockSurface(conv_surf);
|
||||
SDL_DestroySurface(conv_surf);
|
||||
|
@ -99,7 +99,7 @@ ImageLoaderSDLImage::ImageResult ImageLoaderSDLImage::loadFromMemoryRGBA(const u
|
||||
|
||||
auto& new_frame = res.frames.emplace_back();
|
||||
new_frame.ms = anim->delays[i];
|
||||
new_frame.data.insert(new_frame.data.cbegin(), (const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (anim->w*anim->h*4));
|
||||
new_frame.data.insert(new_frame.data.cend(), (const uint8_t*)conv_surf->pixels, ((const uint8_t*)conv_surf->pixels) + (anim->w*anim->h*4));
|
||||
|
||||
SDL_UnlockSurface(conv_surf);
|
||||
SDL_DestroySurface(conv_surf);
|
||||
|
@ -41,7 +41,7 @@ ImageLoaderSTB::ImageResult ImageLoaderSTB::loadFromMemoryRGBA(const uint8_t* da
|
||||
for (int i = 0; i < z; i++) {
|
||||
auto& new_frame = res.frames.emplace_back();
|
||||
new_frame.ms = delays[i];
|
||||
new_frame.data.insert(new_frame.data.cbegin(), img_data + (i*stride), img_data + ((i+1)*stride));
|
||||
new_frame.data.insert(new_frame.data.cend(), img_data + (i*stride), img_data + ((i+1)*stride));
|
||||
}
|
||||
|
||||
stbi_image_free(delays); // hope this is right
|
||||
@ -62,7 +62,7 @@ ImageLoaderSTB::ImageResult ImageLoaderSTB::loadFromMemoryRGBA(const uint8_t* da
|
||||
|
||||
auto& new_frame = res.frames.emplace_back();
|
||||
new_frame.ms = 0;
|
||||
new_frame.data.insert(new_frame.data.cbegin(), img_data, img_data+(x*y*4));
|
||||
new_frame.data.insert(new_frame.data.cend(), img_data, img_data+(x*y*4));
|
||||
|
||||
stbi_image_free(img_data);
|
||||
return res;
|
||||
|
@ -78,7 +78,7 @@ ImageLoaderWebP::ImageResult ImageLoaderWebP::loadFromMemoryRGBA(const uint8_t*
|
||||
auto& new_frame = res.frames.emplace_back();
|
||||
new_frame.ms = timestamp-prev_timestamp;
|
||||
prev_timestamp = timestamp;
|
||||
new_frame.data.insert(new_frame.data.end(), buf, buf+(res.width*res.height*4));
|
||||
new_frame.data.insert(new_frame.data.cend(), buf, buf+(res.width*res.height*4));
|
||||
}
|
||||
|
||||
assert(anim_info.frame_count == res.frames.size());
|
||||
|
@ -32,7 +32,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
// more RAII
|
||||
std::unique_ptr<SDL_Window, decltype(&SDL_DestroyWindow)> window {
|
||||
SDL_CreateWindow("tomato", 640, 480, SDL_WINDOW_RESIZABLE),
|
||||
SDL_CreateWindow("tomato", 1280, 720, SDL_WINDOW_RESIZABLE),
|
||||
&SDL_DestroyWindow
|
||||
};
|
||||
|
||||
|
@ -73,15 +73,56 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, Theme& theme_, std::string save_
|
||||
// TODO: pm?
|
||||
|
||||
// graphics
|
||||
g_provideInstance("ImGuiContext", ImGui::GetVersion(), "host", ImGui::GetCurrentContext());
|
||||
g_provideInstance<ImGuiContext>("ImGuiContext", ImGui::GetVersion(), "host", ImGui::GetCurrentContext());
|
||||
{
|
||||
ImGuiMemAllocFunc alloc_func = nullptr;
|
||||
ImGuiMemFreeFunc free_func = nullptr;
|
||||
void* user_data = nullptr;
|
||||
ImGui::GetAllocatorFunctions(&alloc_func, &free_func, &user_data);
|
||||
|
||||
// function pointers are funky
|
||||
g_provideInstance("ImGuiMemAllocFunc", ImGui::GetVersion(), "host", reinterpret_cast<void*>(alloc_func));
|
||||
g_provideInstance("ImGuiMemFreeFunc", ImGui::GetVersion(), "host", reinterpret_cast<void*>(free_func));
|
||||
if (user_data != nullptr) { // dont register nullptrs (can be valid, we rely on the other 2 pointers to indicate)
|
||||
g_provideInstance("ImGuiMemUserData", ImGui::GetVersion(), "host", user_data);
|
||||
}
|
||||
}
|
||||
|
||||
g_provideInstance<TextureUploaderI>("TextureUploaderI", "host", &sdlrtu);
|
||||
}
|
||||
|
||||
for (const auto& ppath : plugins) {
|
||||
if (!pm.add(ppath)) {
|
||||
std::cerr << "MS error: loading plugin '" << ppath << "' failed!\n";
|
||||
|
||||
// thow?
|
||||
assert(false && "failed to load plugin");
|
||||
//assert(false && "failed to load plugin");
|
||||
SDL_MessageBoxData mb;
|
||||
mb.flags = SDL_MESSAGEBOX_ERROR;
|
||||
mb.window = nullptr;
|
||||
mb.title = "Tomato failed to load a plugin!";
|
||||
std::string message {"Failed to load plugin '"};
|
||||
message += ppath;
|
||||
message += "' !";
|
||||
mb.message = message.c_str();
|
||||
|
||||
mb.numbuttons = 2;
|
||||
SDL_MessageBoxButtonData mb_buttons[2] {};
|
||||
mb_buttons[0].buttonID = 1;
|
||||
mb_buttons[0].flags = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
|
||||
mb_buttons[0].text = "Abort";
|
||||
mb_buttons[1].buttonID = 2;
|
||||
mb_buttons[1].flags = SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT;
|
||||
mb_buttons[1].text = "Continue Anyway";
|
||||
mb.buttons = mb_buttons;
|
||||
|
||||
mb.colorScheme = nullptr;
|
||||
|
||||
int button_id = 0;
|
||||
SDL_ShowMessageBox(&mb, &button_id);
|
||||
if (button_id == 1) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user