add tooltip to contact

its still around since we use it for image writing, which is fine for now.

.github/workflows/cd.yml

@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  BUILD_TYPE: Release
+  BUILD_TYPE: RelWithDebInfo
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -63,7 +63,7 @@ jobs:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -75,8 +75,11 @@ jobs:
       with:
         arch: amd64
 
+    ## sdl_image vendored needs nasm for dav1d
+    #- uses: ilammy/setup-nasm@v1
+
     - name: Configure CMake
-      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
+      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
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
@@ -114,7 +117,7 @@ jobs:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -126,8 +129,11 @@ jobs:
       with:
         arch: amd64
 
+    ## sdl_image vendored needs nasm for dav1d
+    #- uses: ilammy/setup-nasm@v1
+
     - name: Configure CMake
-      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
+      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
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
@@ -172,7 +178,7 @@ jobs:
       contents: write
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -35,7 +35,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -49,12 +49,12 @@ jobs:
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
 
   windows:
-    timeout-minutes: 10
+    timeout-minutes: 15
 
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -66,8 +66,11 @@ jobs:
       with:
         arch: amd64
 
+    ## sdl_image vendored needs nasm for dav1d
+    #- uses: ilammy/setup-nasm@v1
+
     - name: Configure CMake
-      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
+      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
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4

external/CMakeLists.txt

@@ -21,4 +21,5 @@ add_subdirectory(./imgui)
 add_subdirectory(./stb)
 add_subdirectory(./libwebp)
 add_subdirectory(./qoi)
+add_subdirectory(./sdl_image)
 

external/sdl_image/CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.16...3.24 FATAL_ERROR)
+
+include(FetchContent)
+
+if (NOT TARGET SDL3_image::SDL3_image)
+	set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+	# TODO: make pr to make this an option
+	set(SDL3IMAGE_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+	set(SDL3IMAGE_BACKEND_STB OFF CACHE BOOL "" FORCE) # important for security
+	set(SDL3IMAGE_BACKEND_IMAGEIO OFF CACHE BOOL "" FORCE) # some funky apple cmake bug
+	#set(SDL3IMAGE_JXL ON CACHE BOOL "" FORCE) # default to off
+	set(SDL3IMAGE_QOI OFF CACHE BOOL "" FORCE) # we have our own
+	set(SDL3IMAGE_WEBP OFF CACHE BOOL "" FORCE) # we have our own
+
+	FetchContent_Declare(SDL3_image
+		GIT_REPOSITORY https://github.com/libsdl-org/SDL_image
+		# waiting on the imgui pr to get merged so i can update sdl <.<
+		GIT_TAG a45d6e5b84ccc0f3faae6ba7d561709ed600eee7 # tip last check
+		FIND_PACKAGE_ARGS # for the future
+	)
+	FetchContent_MakeAvailable(SDL3_image)
+endif()
+

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709953752,
-        "narHash": "sha256-LW84B4vM1cn7E6cDNQn2LndT9iJXI1dRE5fwbNFbQa8=",
+        "lastModified": 1713189761,
+        "narHash": "sha256-MPp1dBhlY066IeBo+EPGEUN+s+aSUA+LWkvnzKh+rts=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fcaa81ed3c273237217330cf342ef1873b77c80a",
+        "rev": "ff44be4d8ff33f797ff3e3f87153d4f3b6a85ffb",
         "type": "github"
       },
       "original": {
@@ -56,7 +56,8 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "nlohmann-json": "nlohmann-json",
-        "sdl3": "sdl3"
+        "sdl3": "sdl3",
+        "sdl3_image": "sdl3_image"
       }
     },
     "sdl3": {
@@ -76,6 +77,23 @@
         "type": "github"
       }
     },
+    "sdl3_image": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712700609,
+        "narHash": "sha256-PVPH1uJ6g65SzHUboeQE6ZkC+72doMz9t9SG2LBo+7I=",
+        "owner": "libsdl-org",
+        "repo": "SDL_image",
+        "rev": "a45d6e5b84ccc0f3faae6ba7d561709ed600eee7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "libsdl-org",
+        "repo": "SDL_image",
+        "rev": "a45d6e5b84ccc0f3faae6ba7d561709ed600eee7",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,

flake.nix

@@ -14,9 +14,13 @@
       url = "github:libsdl-org/SDL/0429f5d6a36fc35b551bcc2acd4a40c2db6dab82"; # keep in sync this cmake
       flake = false;
     };
+    sdl3_image = {
+      url = "github:libsdl-org/SDL_image/a45d6e5b84ccc0f3faae6ba7d561709ed600eee7";
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, nlohmann-json, sdl3 }:
+  outputs = { self, nixpkgs, flake-utils, nlohmann-json, sdl3, sdl3_image }:
     flake-utils.lib.eachDefaultSystem (system:
     let
       pkgs = import nixpkgs { inherit system; };
@@ -57,6 +61,13 @@
           libGL
 
           pipewire
+
+          # sdl3_image:
+          libpng
+          libjpeg
+          libjxl
+          libavif
+          #libwebp # still using our own loader
         ];
 
         buildInputs = with pkgs; [
@@ -74,6 +85,8 @@
           "-DFETCHCONTENT_SOURCE_DIR_ZSTD=${pkgs.zstd.src}" # we dont care about the version (we use 1.4.x features)
           "-DFETCHCONTENT_SOURCE_DIR_LIBWEBP=${pkgs.libwebp.src}"
           "-DFETCHCONTENT_SOURCE_DIR_SDL3=${sdl3}"
+          "-DFETCHCONTENT_SOURCE_DIR_SDL3_IMAGE=${sdl3_image}"
+          "-DSDL3IMAGE_JXL=ON"
         ];
 
         # TODO: replace with install command

src/CMakeLists.txt

@@ -29,6 +29,8 @@ add_executable(tomato
 	./image_loader_webp.cpp
 	./image_loader_qoi.hpp
 	./image_loader_qoi.cpp
+	./image_loader_sdl_image.hpp
+	./image_loader_sdl_image.cpp
 
 	./texture_uploader.hpp
 	./sdlrenderer_texture_uploader.hpp
@@ -50,14 +52,14 @@ add_executable(tomato
 	./sdl_clipboard_utils.hpp
 	./sdl_clipboard_utils.cpp
 
-	./file_selector.hpp
-	./file_selector.cpp
+	./chat_gui/file_selector.hpp
+	./chat_gui/file_selector.cpp
 
-	./send_image_popup.hpp
-	./send_image_popup.cpp
+	./chat_gui/send_image_popup.hpp
+	./chat_gui/send_image_popup.cpp
 
-	./settings_window.hpp
-	./settings_window.cpp
+	./chat_gui/settings_window.hpp
+	./chat_gui/settings_window.cpp
 
 	./tox_ui_utils.hpp
 	./tox_ui_utils.cpp
@@ -98,5 +100,6 @@ target_link_libraries(tomato PUBLIC
 	webpdemux
 	libwebpmux # the f why (needed for anim encode)
 	qoi
+	SDL3_image::SDL3_image
 )
 

src/chat_gui/send_image_popup.cpp

@@ -1,9 +1,10 @@
 #include "./send_image_popup.hpp"
 
-#include "./image_loader_sdl_bmp.hpp"
-#include "./image_loader_stb.hpp"
-#include "./image_loader_webp.hpp"
-#include "./image_loader_qoi.hpp"
+#include "../image_loader_sdl_bmp.hpp"
+#include "../image_loader_stb.hpp"
+#include "../image_loader_webp.hpp"
+#include "../image_loader_qoi.hpp"
+#include "../image_loader_sdl_image.hpp"
 
 #include <imgui/imgui.h>
 
@@ -16,7 +17,7 @@ SendImagePopup::SendImagePopup(TextureUploaderI& tu) : _tu(tu) {
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
-	_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
+	_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
 }
 
 void SendImagePopup::reset(void) {

src/chat_gui/send_image_popup.hpp

@@ -5,8 +5,8 @@
 #include <memory>
 #include <vector>
 
-#include "./image_loader.hpp"
-#include "./texture_cache.hpp"
+#include "../image_loader.hpp"
+#include "../texture_cache.hpp"
 
 struct SendImagePopup {
 	TextureUploaderI& _tu;

src/chat_gui4.cpp

@@ -1,7 +1,5 @@
 #include "./chat_gui4.hpp"
 
-#include "./file_selector.hpp"
-
 #include <solanaceae/message3/components.hpp>
 #include <solanaceae/tox_messages/components.hpp>
 #include <solanaceae/contact/components.hpp>
@@ -197,9 +195,10 @@ float ChatGui4::render(float time_delta) {
 				sub_contacts = &_cr.get<Contact::Components::ParentOf>(*_selected_contact).subs;
 			}
 
+			const bool highlight_private {!_cr.all_of<Contact::Components::TagPrivate>(*_selected_contact)};
+
 			if (ImGui::BeginChild(chat_label.c_str(), {0, 0}, true)) {
-				//if (_cr.all_of<Contact::Components::ParentOf>(*_selected_contact)) {
-				if (sub_contacts != nullptr) {
+				if (sub_contacts != nullptr && !_cr.all_of<Contact::Components::TagPrivate>(*_selected_contact) && _cr.all_of<Contact::Components::TagGroup>(*_selected_contact)) {
 					if (!sub_contacts->empty()) {
 						if (ImGui::BeginChild("subcontacts", {150, -100}, true)) {
 							ImGui::Text("subs: %zu", sub_contacts->size());
@@ -417,7 +416,7 @@ float ChatGui4::render(float time_delta) {
 								std::optional<ImVec4> row_bg;
 
 								// private group message
-								if (_cr.any_of<Contact::Components::TagSelfWeak, Contact::Components::TagSelfStrong>(c_to.c)) {
+								if (highlight_private && _cr.any_of<Contact::Components::TagSelfWeak, Contact::Components::TagSelfStrong>(c_to.c)) {
 									const ImVec4 priv_msg_hi_col = ImVec4(0.5f, 0.2f, 0.5f, 0.35f);
 									ImU32 row_bg_color = ImGui::GetColorU32(priv_msg_hi_col);
 									ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg1, row_bg_color);
@@ -456,8 +455,11 @@ float ChatGui4::render(float time_delta) {
 							if (ImGui::TableNextColumn()) {
 								// TODO: theming for hardcoded values
 
-								if (msg_reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
-									const auto list = msg_reg.get<Message::Components::Remote::TimestampReceived>(e).ts;
+								if (!msg_reg.all_of<Message::Components::ReceivedBy>(e)) {
+									// TODO: dedup?
+									ImGui::TextDisabled("_");
+								} else {
+									const auto list = msg_reg.get<Message::Components::ReceivedBy>(e).ts;
 									// wrongly assumes contacts never get removed from a group
 									if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
 										// if partically delivered
@@ -471,6 +473,7 @@ float ChatGui4::render(float time_delta) {
 										std::string synced_by_text {"delivery confirmed by:"};
 										const int64_t now_ts_s = int64_t(Message::getTimeMS() / 1000u);
 
+										size_t other_contacts {0};
 										for (const auto& [c, syned_ts] : list) {
 											if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
 												//synced_by_text += "\n sself(!)"; // makes no sense
@@ -480,23 +483,26 @@ float ChatGui4::render(float time_delta) {
 											} else {
 												synced_by_text += "\n >" + (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name : "<unk>");
 											}
+											other_contacts += 1;
 											const int64_t seconds_ago = (int64_t(syned_ts / 1000u) - now_ts_s) * -1;
 											synced_by_text += " (" + std::to_string(seconds_ago) + "sec ago)";
 										}
 
-										ImGui::Text("%s", synced_by_text.c_str());
+										if (other_contacts > 0) {
+											ImGui::Text("%s", synced_by_text.c_str());
+										} else {
+											ImGui::TextUnformatted("no delivery confirmation");
+										}
 
 										ImGui::EndTooltip();
 									}
-								} else {
-									ImGui::TextDisabled("_");
 								}
 
 								ImGui::SameLine();
 
 								// TODO: dedup
-								if (msg_reg.all_of<Message::Components::Remote::TimestampRead>(e)) {
-									const auto list = msg_reg.get<Message::Components::Remote::TimestampRead>(e).ts;
+								if (msg_reg.all_of<Message::Components::ReadBy>(e)) {
+									const auto list = msg_reg.get<Message::Components::ReadBy>(e).ts;
 									// wrongly assumes contacts never get removed from a group
 									if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
 										// if partially read
@@ -1045,13 +1051,13 @@ void ChatGui4::renderMessageExtra(Message3Registry& reg, const Message3 e) {
 	}
 
 	// TODO: remove?
-	if (reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
+	if (reg.all_of<Message::Components::ReceivedBy>(e)) {
 		std::string synced_by_text {"receivedBy:"};
 		const int64_t now_ts_s = int64_t(Message::getTimeMS() / 1000u);
 
-		for (const auto& [c, syned_ts] : reg.get<Message::Components::Remote::TimestampReceived>(e).ts) {
+		for (const auto& [c, syned_ts] : reg.get<Message::Components::ReceivedBy>(e).ts) {
 			if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
-				synced_by_text += "\n sself(!)"; // makes no sense
+				synced_by_text += "\n sself"; // required (except when synced externally)
 			} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {
 				synced_by_text += "\n wself";
 			} else {
@@ -1080,7 +1086,6 @@ void ChatGui4::renderContactList(void) {
 bool ChatGui4::renderContactListContactBig(const Contact3 c, const bool selected) {
 	// TODO:
 	// - unread message
-	// - avatar img
 	// - connection status
 	// - user status
 	// - status message
@@ -1109,10 +1114,27 @@ bool ChatGui4::renderContactListContactBig(const Contact3 c, const bool selected
 	}
 
 	const bool got_selected = ImGui::Selectable(label.c_str(), show_selected, 0, {0,3*TEXT_BASE_HEIGHT});
-
 	if (request_incoming || request_outgoing) {
 		ImGui::PopStyleColor();
 	}
+
+	if (ImGui::BeginItemTooltip()) {
+		if (_cr.all_of<Contact::Components::ConnectionState>(c)) {
+			const auto cstate = _cr.get<Contact::Components::ConnectionState>(c).state;
+			ImGui::Text("Connection state: %s",
+				(cstate == Contact::Components::ConnectionState::disconnected)
+				? "offline"
+				: (cstate == Contact::Components::ConnectionState::direct)
+				? "online (direct)"
+				: "online (cloud)"
+			);
+		} else {
+			ImGui::TextUnformatted("Connection state: unknown");
+		}
+
+		ImGui::EndTooltip();
+	}
+
 	ImVec2 post_curser_pos = ImGui::GetCursorPos();
 
 	ImVec2 img_curser {
@@ -1181,14 +1203,16 @@ bool ChatGui4::renderContactListContactBig(const Contact3 c, const bool selected
 			ImGui::TextUnformatted("Incoming request/invite");
 		} else if (request_outgoing) {
 			ImGui::TextUnformatted("Outgoing request/invite");
+		} else {
+			//ImGui::Text("status message...");
 		}
-		//ImGui::Text("status message...");
 		//ImGui::TextDisabled("hi");
 		//ImGui::RenderTextEllipsis
 	}
 	ImGui::EndGroup();
 
 	ImGui::SetCursorPos(post_curser_pos);
+
 	return got_selected;
 }
 

src/chat_gui4.hpp

@@ -7,8 +7,8 @@
 #include "./texture_cache.hpp"
 #include "./tox_avatar_loader.hpp"
 #include "./message_image_loader.hpp"
-#include "./file_selector.hpp"
-#include "./send_image_popup.hpp"
+#include "./chat_gui/file_selector.hpp"
+#include "./chat_gui/send_image_popup.hpp"
 
 #include <entt/container/dense_map.hpp>
 

src/image_loader_sdl_image.cpp

@@ -0,0 +1,118 @@
+#include "./image_loader_sdl_image.hpp"
+
+#include <SDL3_image/SDL_image.h>
+
+#include <optional>
+#include <iostream>
+
+static std::optional<const char*> getExt(SDL_IOStream* ios) {
+	if (IMG_isAVIF(ios)) {
+		return "avif";
+	} else if (IMG_isCUR(ios)) {
+		return "cur";
+	} else if (IMG_isICO(ios)) {
+		return "ico";
+	} else if (IMG_isBMP(ios)) {
+		return "bmp";
+	} else if (IMG_isGIF(ios)) {
+		return "gif";
+	} else if (IMG_isJPG(ios)) {
+		return "jpg";
+	} else if (IMG_isJXL(ios)) {
+		return "jxl";
+	} else if (IMG_isLBM(ios)) {
+		return "lbm";
+	} else if (IMG_isPCX(ios)) {
+		return "pcx";
+	} else if (IMG_isPNG(ios)) {
+		return "png";
+	} else if (IMG_isPNM(ios)) {
+		return "pnm";
+	} else if (IMG_isSVG(ios)) {
+		return "svg";
+	} else if (IMG_isTIF(ios)) {
+		return "tiff";
+	} else if (IMG_isXCF(ios)) {
+		return "xcf";
+	} else if (IMG_isXPM(ios)) {
+		return "xpm";
+	} else if (IMG_isXV(ios)) {
+		return "xv";
+	} else if (IMG_isWEBP(ios)) {
+		return "webp";
+	} else if (IMG_isQOI(ios)) {
+		return "qoi";
+	} else {
+		return std::nullopt;
+	}
+}
+
+ImageLoaderSDLImage::ImageInfo ImageLoaderSDLImage::loadInfoFromMemory(const uint8_t* data, uint64_t data_size) {
+	ImageInfo res;
+
+	auto* ios = SDL_IOFromConstMem(data, data_size);
+
+	// we ignore tga
+	auto ext_opt = getExt(ios);
+	if (!ext_opt.has_value()) {
+		return res;
+	}
+
+	SDL_Surface* surf = IMG_Load_IO(ios, SDL_TRUE);
+	if (surf == nullptr) {
+		return res;
+	}
+
+	res.width = surf->w;
+	res.height = surf->h;
+	res.file_ext = ext_opt.value();
+
+	SDL_DestroySurface(surf);
+
+	return res;
+}
+
+ImageLoaderSDLImage::ImageResult ImageLoaderSDLImage::loadFromMemoryRGBA(const uint8_t* data, uint64_t data_size) {
+	ImageResult res;
+
+	auto* ios = SDL_IOFromConstMem(data, data_size);
+
+	// we ignore tga
+	auto ext_opt = getExt(ios);
+	if (!ext_opt.has_value()) {
+		return res;
+	}
+
+	IMG_Animation* anim = IMG_LoadAnimation_IO(ios, SDL_TRUE);
+	if (anim == nullptr) {
+		return res;
+	}
+
+	for (int i = 0; i < anim->count; i++) {
+		SDL_Surface* conv_surf = SDL_ConvertSurfaceFormat(anim->frames[i], SDL_PIXELFORMAT_RGBA32);
+		if (conv_surf == nullptr) {
+			return res;
+		}
+
+
+		SDL_LockSurface(conv_surf);
+
+		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));
+
+		SDL_UnlockSurface(conv_surf);
+		SDL_DestroySurface(conv_surf);
+	}
+
+	res.width = anim->w;
+	res.height = anim->h;
+	res.file_ext = ext_opt.value();
+
+	IMG_FreeAnimation(anim);
+
+	std::cout << "IL_SDLI: loaded img " << res.width << "x" << res.height << "\n";
+
+	return res;
+}
+

src/image_loader_sdl_image.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "./image_loader.hpp"
+
+struct ImageLoaderSDLImage : public ImageLoaderI {
+	ImageInfo loadInfoFromMemory(const uint8_t* data, uint64_t data_size) override;
+	ImageResult loadFromMemoryRGBA(const uint8_t* data, uint64_t data_size) override;
+};
+

src/main_screen.cpp

@@ -12,7 +12,7 @@
 #include <memory>
 #include <cmath>
 
-MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::vector<std::string> plugins) :
+MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::string new_username, std::vector<std::string> plugins) :
 	renderer(renderer_),
 	rmm(cr),
 	msnj{cr, {}, {}},
@@ -44,9 +44,10 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	conf.set("tox", "save_file_path", save_path);
 
 	{ // name stuff
+		// a new profile will not have this set
 		auto name = tc.toxSelfGetName();
 		if (name.empty()) {
-			name = "tomato";
+			name = new_username;
 		}
 		conf.set("tox", "name", name);
 		tc.setSelfName(name); // TODO: this is ugly

src/main_screen.hpp

@@ -28,7 +28,7 @@
 #include "./message_image_loader.hpp"
 
 #include "./chat_gui4.hpp"
-#include "./settings_window.hpp"
+#include "./chat_gui/settings_window.hpp"
 #include "./tox_ui_utils.hpp"
 #include "./tox_dht_cap_histo.hpp"
 #include "./tox_friend_faux_offline_messaging.hpp"
@@ -89,7 +89,7 @@ struct MainScreen final : public Screen {
 	uint64_t _window_hidden_ts {0};
 	float _time_since_event {0.f};
 
-	MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::vector<std::string> plugins);
+	MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::string new_username, std::vector<std::string> plugins);
 	~MainScreen(void);
 
 	bool handleEvent(SDL_Event& e) override;

src/media_meta_info_loader.cpp

@@ -3,7 +3,7 @@
 #include "./image_loader_webp.hpp"
 #include "./image_loader_sdl_bmp.hpp"
 #include "./image_loader_qoi.hpp"
-#include "./image_loader_stb.hpp"
+#include "./image_loader_sdl_image.hpp"
 
 #include <solanaceae/message3/components.hpp>
 
@@ -79,7 +79,7 @@ MediaMetaInfoLoader::MediaMetaInfoLoader(RegistryMessageModel& rmm) : _rmm(rmm)
 	_image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
-	_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
+	_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
 
 	_rmm.subscribe(this, RegistryMessageModel_Event::message_construct);
 	_rmm.subscribe(this, RegistryMessageModel_Event::message_updated);

src/message_image_loader.cpp

@@ -2,8 +2,8 @@
 
 #include "./image_loader_sdl_bmp.hpp"
 #include "./image_loader_qoi.hpp"
-#include "./image_loader_stb.hpp"
 #include "./image_loader_webp.hpp"
+#include "./image_loader_sdl_image.hpp"
 #include "./media_meta_info_loader.hpp"
 
 #include <solanaceae/message3/components.hpp>
@@ -22,7 +22,7 @@ MessageImageLoader::MessageImageLoader(void) {
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
-	_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
+	_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
 }
 
 std::optional<TextureEntry> MessageImageLoader::load(TextureUploaderI& tu, Message3Handle m) {

src/start_screen.cpp

@@ -5,6 +5,7 @@
 #include <imgui/imgui.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
+#include <cctype>
 #include <memory>
 #include <filesystem>
 
@@ -33,13 +34,13 @@ Screen* StartScreen::render(float, bool&) {
 				_fss.requestFile(
 					[](const auto& path) -> bool { return std::filesystem::is_regular_file(path); },
 					[this](const auto& path) {
-						tox_profile_path = path.string();
+						_tox_profile_path = path.string();
 					},
 					[](){}
 				);
 			}
 			ImGui::SameLine();
-			ImGui::TextUnformatted(tox_profile_path.c_str());
+			ImGui::TextUnformatted(_tox_profile_path.c_str());
 
 			ImGui::TextUnformatted("password:");
 			ImGui::SameLine();
@@ -56,8 +57,22 @@ Screen* StartScreen::render(float, bool&) {
 		if (ImGui::BeginTabItem("create profile")) {
 			_new_save = true;
 
-			ImGui::TextUnformatted("TODO: profile path");
-			ImGui::TextUnformatted("TODO: profile name");
+			ImGui::TextUnformatted("username:");
+			ImGui::SameLine();
+			if (ImGui::InputText("##user_name", &_user_name)) {
+				std::string tmp_copy = _user_name;
+				for (auto& c : tmp_copy) {
+					if (!std::isalnum(static_cast<unsigned char>(c)) && c != '-' && c != '.') {
+						c = '_';
+					}
+				}
+
+				if (tmp_copy.empty()) {
+					tmp_copy = "unnamed-tomato";
+				}
+
+				_tox_profile_path = tmp_copy + ".tox";
+			}
 
 			ImGui::TextUnformatted("password:");
 			ImGui::SameLine();
@@ -69,6 +84,8 @@ Screen* StartScreen::render(float, bool&) {
 			ImGui::SameLine();
 			ImGui::Checkbox("show password", &_show_password);
 
+			ImGui::TextUnformatted("TODO: profile path (current path for now)");
+
 			ImGui::EndTabItem();
 		}
 		if (ImGui::BeginTabItem("plugins")) {
@@ -81,7 +98,6 @@ Screen* StartScreen::render(float, bool&) {
 					continue;
 				}
 				ImGui::SameLine();
-
 				ImGui::TextUnformatted(it->c_str());
 
 				ImGui::PopID();
@@ -105,7 +121,7 @@ Screen* StartScreen::render(float, bool&) {
 
 	ImGui::Separator();
 
-	if (!_new_save && !std::filesystem::is_regular_file(tox_profile_path)) {
+	if (!_new_save && !std::filesystem::is_regular_file(_tox_profile_path)) {
 		// load but file missing
 
 		ImGui::BeginDisabled();
@@ -115,7 +131,7 @@ Screen* StartScreen::render(float, bool&) {
 		if (ImGui::IsItemHovered(ImGuiHoveredFlags_ForTooltip | ImGuiHoveredFlags_AllowWhenDisabled)) {
 			ImGui::SetTooltip("file does not exist");
 		}
-	} else if (_new_save && std::filesystem::exists(tox_profile_path)) {
+	} else if (_new_save && std::filesystem::exists(_tox_profile_path)) {
 		// new but file exists
 
 		ImGui::BeginDisabled();
@@ -127,7 +143,7 @@ Screen* StartScreen::render(float, bool&) {
 		}
 	} else {
 		if (ImGui::Button("load", {60, 25})) {
-			auto new_screen = std::make_unique<MainScreen>(_renderer, tox_profile_path, _password, queued_plugin_paths);
+			auto new_screen = std::make_unique<MainScreen>(_renderer, _tox_profile_path, _password, _user_name, queued_plugin_paths);
 			return new_screen.release();
 		}
 	}

src/start_screen.hpp

@@ -2,7 +2,7 @@
 
 #include "./screen.hpp"
 
-#include "./file_selector.hpp"
+#include "./chat_gui/file_selector.hpp"
 
 #include <vector>
 #include <string>
@@ -17,11 +17,12 @@ struct StartScreen final : public Screen {
 	FileSelector _fss;
 
 	bool _new_save {false};
+	std::string _user_name {"unnamed-tomato"};
 
 	bool _show_password {false};
 	std::string _password;
 
-	std::string tox_profile_path {"tomato.tox"};
+	std::string _tox_profile_path {"unnamed-tomato.tox"};
 	std::vector<std::string> queued_plugin_paths;
 
 	StartScreen(void) = delete;

src/tox_avatar_loader.cpp

@@ -2,8 +2,8 @@
 
 #include "./image_loader_sdl_bmp.hpp"
 #include "./image_loader_qoi.hpp"
-#include "./image_loader_stb.hpp"
 #include "./image_loader_webp.hpp"
+#include "./image_loader_sdl_image.hpp"
 
 #include <solanaceae/contact/components.hpp>
 #include <solanaceae/tox_contacts/components.hpp>
@@ -24,7 +24,7 @@ ToxAvatarLoader::ToxAvatarLoader(Contact3Registry& cr) : _cr(cr) {
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
-	_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
+	_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
 }
 
 static float getHue_6bytes(const uint8_t* data) {

src/tox_friend_faux_offline_messaging.cpp

@@ -107,6 +107,12 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 
 	const uint64_t ts_now = Message::getTimeMS();
 
+	if (!_cr.all_of<Contact::Components::Self>(c)) {
+		return dfmc_Ret::NO_MSG; // error
+	}
+
+	const auto self_c = _cr.get<Contact::Components::Self>(c).self;
+
 	// filter for unconfirmed messages
 
 	// we assume sorted
@@ -127,9 +133,8 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 			continue; // skip
 		}
 
-		// exclude
-		if (mr->any_of<
-				Message::Components::Remote::TimestampReceived // this acts like a tag, which is wrong in groups
+		if (!mr->any_of<
+				Message::Components::ReceivedBy
 			>(msg)
 		) {
 			continue; // skip
@@ -139,6 +144,16 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 			continue; // not outbound (in private)
 		}
 
+		const auto& ts_received = mr->get<Message::Components::ReceivedBy>(msg).ts;
+		// not target
+		if (ts_received.contains(c)) {
+			continue;
+		}
+		// needs to contain self
+		if (!ts_received.contains(self_c)) {
+			continue;
+		}
+
 		valid_unsent = true;
 
 		uint64_t msg_ts = msg_view.get<Message::Components::Timestamp>(msg).ts;