add fallback to dynamic toxcore

.github/workflows/cd.yml

@@ -68,7 +68,7 @@ jobs:
         submodules: recursive
 
     - name: Install Dependencies
-      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
+      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
 
     # setup vs env
     - uses: ilammy/msvc-dev-cmd@v1
@@ -79,7 +79,7 @@ jobs:
     #- 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 -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF
+      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}}
@@ -122,7 +122,7 @@ jobs:
         submodules: recursive
 
     - name: Install Dependencies
-      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
+      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
 
     # setup vs env
     - uses: ilammy/msvc-dev-cmd@v1
@@ -133,7 +133,7 @@ jobs:
     #- 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 -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF
+      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

.github/workflows/ci.yml

@@ -59,7 +59,7 @@ jobs:
         submodules: recursive
 
     - name: Install Dependencies
-      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
+      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
 
     # setup vs env
     - uses: ilammy/msvc-dev-cmd@v1
@@ -70,7 +70,7 @@ jobs:
     #- 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 -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF
+      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

external/sdl/CMakeLists.txt

@@ -9,7 +9,8 @@ if (NOT TARGET SDL3::SDL3)
 
 	FetchContent_Declare(SDL3
 		GIT_REPOSITORY https://github.com/libsdl-org/SDL
-		GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking
+		#GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking
+		GIT_TAG 14f584a94bfd49cf1524db75bf3c419fdf9436cd # tip 26-04-2024
 		FIND_PACKAGE_ARGS # for the future
 	)
 	FetchContent_MakeAvailable(SDL3)

external/toxcore/CMakeLists.txt

@@ -1,214 +1,66 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.9...3.16 FATAL_ERROR)
 
+set(EXPERIMENTAL_API ON CACHE BOOL "" FORCE)
+set(UNITTEST OFF CACHE BOOL "" FORCE)
+set(BOOTSTRAP_DAEMON OFF CACHE BOOL "" FORCE)
+
+add_subdirectory(./c-toxcore)
+
+# the ideal case
+#add_library(toxcore ALIAS toxcore_static)
+
+# the sad case
+add_library(toxcore INTERFACE)
+
+if (TARGET toxcore_static)
+	target_link_libraries(toxcore INTERFACE toxcore_static)
+else()
+	target_link_libraries(toxcore INTERFACE toxcore_shared)
+endif()
+
+# HACK: "install" api headers into binary dir
+configure_file(
+	./c-toxcore/toxcore/tox.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox.h
+	@ONLY
+)
+configure_file(
+	./c-toxcore/toxcore/tox_events.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_events.h
+	@ONLY
+)
+configure_file(
+	./c-toxcore/toxcore/tox_private.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_private.h
+	@ONLY
+)
+configure_file(
+	./c-toxcore/toxencryptsave/toxencryptsave.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxencryptsave.h
+	@ONLY
+)
+configure_file(
+	./c-toxcore/toxav/toxav.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxav.h
+	@ONLY
+)
+
+target_include_directories(toxcore INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include/)
+
+# HACK: support old libsodium find
+# libs should handle this case themselfs
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-set(TOX_DIR "${CMAKE_CURRENT_SOURCE_DIR}/c-toxcore/")
-
-# TODO: shared
-add_library(toxcore STATIC
-	${TOX_DIR}third_party/cmp/cmp.c
-	${TOX_DIR}third_party/cmp/cmp.h
-
-	${TOX_DIR}toxcore/announce.c
-	${TOX_DIR}toxcore/announce.h
-	${TOX_DIR}toxcore/bin_pack.c
-	${TOX_DIR}toxcore/bin_pack.h
-	${TOX_DIR}toxcore/bin_unpack.c
-	${TOX_DIR}toxcore/bin_unpack.h
-	${TOX_DIR}toxcore/ccompat.c
-	${TOX_DIR}toxcore/ccompat.h
-	${TOX_DIR}toxcore/crypto_core.c
-	${TOX_DIR}toxcore/crypto_core.h
-	${TOX_DIR}toxcore/crypto_core_pack.c
-	${TOX_DIR}toxcore/crypto_core_pack.h
-	${TOX_DIR}toxcore/DHT.c
-	${TOX_DIR}toxcore/DHT.h
-	${TOX_DIR}toxcore/events/conference_connected.c
-	${TOX_DIR}toxcore/events/conference_invite.c
-	${TOX_DIR}toxcore/events/conference_message.c
-	${TOX_DIR}toxcore/events/conference_peer_list_changed.c
-	${TOX_DIR}toxcore/events/conference_peer_name.c
-	${TOX_DIR}toxcore/events/conference_title.c
-	${TOX_DIR}toxcore/events/dht_get_nodes_response.c
-	${TOX_DIR}toxcore/events/events_alloc.c
-	${TOX_DIR}toxcore/events/events_alloc.h
-	${TOX_DIR}toxcore/events/file_chunk_request.c
-	${TOX_DIR}toxcore/events/file_recv.c
-	${TOX_DIR}toxcore/events/file_recv_chunk.c
-	${TOX_DIR}toxcore/events/file_recv_control.c
-	${TOX_DIR}toxcore/events/friend_connection_status.c
-	${TOX_DIR}toxcore/events/friend_lossless_packet.c
-	${TOX_DIR}toxcore/events/friend_lossy_packet.c
-	${TOX_DIR}toxcore/events/friend_message.c
-	${TOX_DIR}toxcore/events/friend_name.c
-	${TOX_DIR}toxcore/events/friend_read_receipt.c
-	${TOX_DIR}toxcore/events/friend_request.c
-	${TOX_DIR}toxcore/events/friend_status.c
-	${TOX_DIR}toxcore/events/friend_status_message.c
-	${TOX_DIR}toxcore/events/friend_typing.c
-	${TOX_DIR}toxcore/events/self_connection_status.c
-	${TOX_DIR}toxcore/events/group_custom_packet.c
-	${TOX_DIR}toxcore/events/group_custom_private_packet.c
-	${TOX_DIR}toxcore/events/group_invite.c
-	${TOX_DIR}toxcore/events/group_join_fail.c
-	${TOX_DIR}toxcore/events/group_message.c
-	${TOX_DIR}toxcore/events/group_moderation.c
-	${TOX_DIR}toxcore/events/group_password.c
-	${TOX_DIR}toxcore/events/group_peer_exit.c
-	${TOX_DIR}toxcore/events/group_peer_join.c
-	${TOX_DIR}toxcore/events/group_peer_limit.c
-	${TOX_DIR}toxcore/events/group_peer_name.c
-	${TOX_DIR}toxcore/events/group_peer_status.c
-	${TOX_DIR}toxcore/events/group_privacy_state.c
-	${TOX_DIR}toxcore/events/group_private_message.c
-	${TOX_DIR}toxcore/events/group_self_join.c
-	${TOX_DIR}toxcore/events/group_topic.c
-	${TOX_DIR}toxcore/events/group_topic_lock.c
-	${TOX_DIR}toxcore/events/group_voice_state.c
-	${TOX_DIR}toxcore/forwarding.c
-	${TOX_DIR}toxcore/forwarding.h
-	${TOX_DIR}toxcore/friend_connection.c
-	${TOX_DIR}toxcore/friend_connection.h
-	${TOX_DIR}toxcore/friend_requests.c
-	${TOX_DIR}toxcore/friend_requests.h
-	${TOX_DIR}toxcore/group.c
-	${TOX_DIR}toxcore/group.h
-	${TOX_DIR}toxcore/group_announce.c
-	${TOX_DIR}toxcore/group_announce.h
-	${TOX_DIR}toxcore/group_moderation.c
-	${TOX_DIR}toxcore/group_moderation.h
-	${TOX_DIR}toxcore/group_chats.c
-	${TOX_DIR}toxcore/group_chats.h
-	${TOX_DIR}toxcore/group_common.h
-	${TOX_DIR}toxcore/group_connection.c
-	${TOX_DIR}toxcore/group_connection.h
-	${TOX_DIR}toxcore/group_onion_announce.c
-	${TOX_DIR}toxcore/group_onion_announce.h
-	${TOX_DIR}toxcore/group_pack.c
-	${TOX_DIR}toxcore/group_pack.h
-	${TOX_DIR}toxcore/LAN_discovery.c
-	${TOX_DIR}toxcore/LAN_discovery.h
-	${TOX_DIR}toxcore/list.c
-	${TOX_DIR}toxcore/list.h
-	${TOX_DIR}toxcore/logger.c
-	${TOX_DIR}toxcore/logger.h
-	${TOX_DIR}toxcore/Messenger.c
-	${TOX_DIR}toxcore/Messenger.h
-	${TOX_DIR}toxcore/mem.c
-	${TOX_DIR}toxcore/mem.h
-	${TOX_DIR}toxcore/mono_time.c
-	${TOX_DIR}toxcore/mono_time.h
-	${TOX_DIR}toxcore/net_crypto.c
-	${TOX_DIR}toxcore/net_crypto.h
-	${TOX_DIR}toxcore/network.c
-	${TOX_DIR}toxcore/network.h
-	${TOX_DIR}toxcore/onion_announce.c
-	${TOX_DIR}toxcore/onion_announce.h
-	${TOX_DIR}toxcore/onion.c
-	${TOX_DIR}toxcore/onion_client.c
-	${TOX_DIR}toxcore/onion_client.h
-	${TOX_DIR}toxcore/onion.h
-	${TOX_DIR}toxcore/ping_array.c
-	${TOX_DIR}toxcore/ping_array.h
-	${TOX_DIR}toxcore/ping.c
-	${TOX_DIR}toxcore/ping.h
-	${TOX_DIR}toxcore/shared_key_cache.c
-	${TOX_DIR}toxcore/shared_key_cache.h
-	${TOX_DIR}toxcore/state.c
-	${TOX_DIR}toxcore/state.h
-	${TOX_DIR}toxcore/TCP_client.c
-	${TOX_DIR}toxcore/TCP_client.h
-	${TOX_DIR}toxcore/TCP_common.c
-	${TOX_DIR}toxcore/TCP_common.h
-	${TOX_DIR}toxcore/TCP_connection.c
-	${TOX_DIR}toxcore/TCP_connection.h
-	${TOX_DIR}toxcore/TCP_server.c
-	${TOX_DIR}toxcore/TCP_server.h
-	${TOX_DIR}toxcore/timed_auth.c
-	${TOX_DIR}toxcore/timed_auth.h
-	${TOX_DIR}toxcore/tox_api.c
-	${TOX_DIR}toxcore/tox.c
-	${TOX_DIR}toxcore/tox_dispatch.c
-	${TOX_DIR}toxcore/tox_dispatch.h
-	${TOX_DIR}toxcore/tox_event.c
-	${TOX_DIR}toxcore/tox_event.h
-	${TOX_DIR}toxcore/tox_events.c
-	${TOX_DIR}toxcore/tox_events.h
-	${TOX_DIR}toxcore/tox.h
-	${TOX_DIR}toxcore/tox_private.c
-	${TOX_DIR}toxcore/tox_private.h
-	${TOX_DIR}toxcore/tox_pack.h
-	${TOX_DIR}toxcore/tox_pack.c
-	${TOX_DIR}toxcore/tox_unpack.c
-	${TOX_DIR}toxcore/tox_unpack.h
-	${TOX_DIR}toxcore/util.c
-	${TOX_DIR}toxcore/util.h
-
-	${TOX_DIR}toxencryptsave/defines.h
-	${TOX_DIR}toxencryptsave/toxencryptsave.c
-	${TOX_DIR}toxencryptsave/toxencryptsave.h
-)
-
-# HACK: "install" api headers into self
-# this is dirty, should be binary dir
-# TODO: add the others
-configure_file(
-	${TOX_DIR}toxcore/tox.h
-	${TOX_DIR}tox/tox.h
-	@ONLY
-)
-configure_file(
-	${TOX_DIR}toxcore/tox_events.h
-	${TOX_DIR}tox/tox_events.h
-	@ONLY
-)
-configure_file(
-	${TOX_DIR}toxcore/tox_private.h
-	${TOX_DIR}tox/tox_private.h
-	@ONLY
-)
-
-target_include_directories(toxcore PRIVATE "${TOX_DIR}toxcore")
-target_include_directories(toxcore PUBLIC "${TOX_DIR}")
-
-target_compile_definitions(toxcore PUBLIC USE_IPV6=1)
-#target_compile_definitions(toxcore PUBLIC MIN_LOGGER_LEVEL=LOGGER_LEVEL_DEBUG)
-target_compile_definitions(toxcore PUBLIC MIN_LOGGER_LEVEL=LOGGER_LEVEL_INFO)
-
-find_package(unofficial-sodium CONFIG QUIET)
 find_package(sodium QUIET)
 if(unofficial-sodium_FOUND) # vcpkg
 	if(TARGET unofficial-sodium::sodium)
-		target_link_libraries(toxcore unofficial-sodium::sodium)
+		target_link_libraries(toxcore INTERFACE unofficial-sodium::sodium)
 	endif()
 	if(TARGET unofficial-sodium::sodium_config_public)
-		target_link_libraries(toxcore unofficial-sodium::sodium_config_public)
+		target_link_libraries(toxcore INTERFACE unofficial-sodium::sodium_config_public)
 	endif()
 elseif(sodium_FOUND)
-	target_link_libraries(toxcore sodium)
+	target_link_libraries(toxcore INTERFACE sodium)
 else()
 	message(SEND_ERROR "missing libsodium")
 endif()
-
-if(WIN32)
-	target_link_libraries(toxcore ws2_32 iphlpapi)
-endif()
-
-find_package(pthreads QUIET)
-if(TARGET PThreads4W::PThreads4W)
-	target_link_libraries(toxcore PThreads4W::PThreads4W)
-else()
-	set(THREADS_PREFER_PTHREAD_FLAG ON)
-	find_package(Threads REQUIRED)
-	target_link_libraries(toxcore Threads::Threads)
-endif()
-
-add_executable(DHT_Bootstrap EXCLUDE_FROM_ALL
-	${TOX_DIR}other/DHT_bootstrap.c
-	${TOX_DIR}other/bootstrap_node_packets.h
-	${TOX_DIR}other/bootstrap_node_packets.c
-	${TOX_DIR}testing/misc_tools.h
-	${TOX_DIR}testing/misc_tools.c
-)
-target_link_libraries(DHT_Bootstrap toxcore)
-

flake.lock

@@ -63,17 +63,17 @@
     "sdl3": {
       "flake": false,
       "locked": {
-        "lastModified": 1713196978,
-        "narHash": "sha256-qn6YChphDi2p1GRwAEno6QI1rDNEmly+tElzDJnOcvg=",
+        "lastModified": 1714100414,
+        "narHash": "sha256-eaiVG5WJoLnFvdpYBR+DF+YuMu5C3lA1SKuzN8+hfDM=",
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "0429f5d6a36fc35b551bcc2acd4a40c2db6dab82",
+        "rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd",
         "type": "github"
       },
       "original": {
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "0429f5d6a36fc35b551bcc2acd4a40c2db6dab82",
+        "rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd",
         "type": "github"
       }
     },

flake.nix

@@ -11,7 +11,7 @@
       flake = false;
     };
     sdl3 = {
-      url = "github:libsdl-org/SDL/0429f5d6a36fc35b551bcc2acd4a40c2db6dab82"; # keep in sync this cmake
+      url = "github:libsdl-org/SDL/14f584a94bfd49cf1524db75bf3c419fdf9436cd"; # keep in sync this cmake
       flake = false;
     };
     sdl3_image = {

src/chat_gui/contact_list.cpp

@@ -46,6 +46,8 @@ static void drawIconDirect(
 	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);
 	drawIconDirectLines(p0, p1_o, col_back, 4.0f);
 	drawIconDirectLines(p0, p1_o, col_main, 1.5f);
 }
@@ -78,8 +80,11 @@ static void drawIconCloud(
 		{0.2f, 0.9f},
 	}};
 	for (auto& v : points) {
+		v.y -= 0.1f;
 		v = {p0.x + p1_o.x*v.x, p0.y + p1_o.y*v.y};
 	}
+	// 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);
 	ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_back, ImDrawFlags_None, 4.f);
 	ImGui::GetWindowDrawList()->AddPolyline(points.data(), points.size(), col_main, ImDrawFlags_None, 1.5f);
 }
@@ -90,35 +95,33 @@ void renderAvatar(
 	const Contact3Handle c,
 	ImVec2 box
 ) {
-	ImVec4 color_current = th.getColor<ThemeCol_Contact::avatar_offline>();
-	if (c.all_of<Contact::Components::ConnectionState>()) {
-		const auto c_state = c.get<Contact::Components::ConnectionState>().state;
-		if (c_state == Contact::Components::ConnectionState::State::direct) {
-			color_current = th.getColor<ThemeCol_Contact::avatar_online_direct>();
-		} else if (c_state == Contact::Components::ConnectionState::State::cloud) {
-			color_current = th.getColor<ThemeCol_Contact::avatar_online_cloud>();
+	// deploy dummy of same size and check visibility
+	const auto orig_curser_pos = ImGui::GetCursorPos();
+	ImGui::Dummy(box);
+	if (ImGui::IsItemVisible()) {
+		ImGui::SetCursorPos(orig_curser_pos); // reset for actual img
+
+		ImVec4 color_current = th.getColor<ThemeCol_Contact::avatar_offline>();
+		if (c.all_of<Contact::Components::ConnectionState>()) {
+			const auto c_state = c.get<Contact::Components::ConnectionState>().state;
+			if (c_state == Contact::Components::ConnectionState::State::direct) {
+				color_current = th.getColor<ThemeCol_Contact::avatar_online_direct>();
+			} else if (c_state == Contact::Components::ConnectionState::State::cloud) {
+				color_current = th.getColor<ThemeCol_Contact::avatar_online_cloud>();
+			}
 		}
+
+		// avatar
+		const auto [id, width, height] = contact_tc.get(c);
+		ImGui::Image(
+			id,
+			box,
+			{0, 0},
+			{1, 1},
+			{1, 1, 1, 1},
+			color_current
+		);
 	}
-
-	// icon pos
-	auto p0 = ImGui::GetCursorScreenPos();
-	p0.x += box.x * 0.5f;
-	p0.y += box.y * 0.5f;
-	auto p1_o = box;
-	p1_o.x *= 0.5f;
-	p1_o.y *= 0.5f;
-
-	// avatar
-	const auto [id, width, height] = contact_tc.get(c);
-	ImGui::Image(
-		id,
-		box,
-		{0, 0},
-		{1, 1},
-		{1, 1, 1, 1},
-		color_current
-	);
-
 }
 
 bool renderContactBig(
@@ -130,6 +133,7 @@ bool renderContactBig(
 	const bool selectable,
 	const bool selected
 ) {
+	ImGui::BeginGroup();
 	if (line_height < 1) {
 		line_height = 1;
 	}
@@ -182,8 +186,18 @@ bool renderContactBig(
 			ImGui::TextUnformatted("Connection state: unknown");
 		}
 
-		// TODO: add a whole bunch more info
+		if (
+			const auto* slt = c.try_get<Contact::Components::StatusText>();
+			slt != nullptr &&
+			!slt->text.empty()
+		) {
+			ImGui::SeparatorText("Status Text");
+			//ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_TextDisabled]);
+			ImGui::TextUnformatted(slt->text.c_str());
+			//ImGui::PopStyleColor();
+		}
 
+		// TODO: add a whole bunch more info
 		ImGui::EndTooltip();
 	}
 
@@ -194,45 +208,45 @@ bool renderContactBig(
 		orig_curser_pos.y + ImGui::GetStyle().FramePadding.y
 	};
 
-	float img_y {
-		//(post_curser_pos.y - orig_curser_pos.y) - ImGui::GetStyle().FramePadding.y*2
-		TEXT_BASE_HEIGHT*line_height - ImGui::GetStyle().FramePadding.y*2
-	};
+	float img_y {TEXT_BASE_HEIGHT*line_height - ImGui::GetStyle().FramePadding.y*2};
 
 	ImGui::SetCursorPos(img_curser);
 
-	{ // avatar stuff
+	renderAvatar(th, contact_tc, c, {img_y, img_y});
 
-		// icon pos
-		auto p0 = ImGui::GetCursorScreenPos();
-		p0.x += img_y * 0.5f;
-		p0.y += img_y * 0.5f;
-		ImVec2 p1_o = {img_y, img_y};;
-		p1_o.x *= 0.5f;
-		p1_o.y *= 0.5f;
-
-		renderAvatar(th, contact_tc, c, {img_y, img_y});
-
-		if (cstate != nullptr) {
-			if (cstate->state == Contact::Components::ConnectionState::direct) { // direct icon
-				const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.8f});
-				const ImU32 col_main = ImGui::GetColorU32({0.1f, 1.f, 0.1f, 1.0f});
-
-				drawIconDirect(p0, p1_o, col_main, col_back);
-			} else if (cstate->state == Contact::Components::ConnectionState::cloud) { // cloud icon
-				const ImU32 col_back = ImGui::GetColorU32({0.0f, 0.0f, 0.0f, 0.8f});
-				const ImU32 col_main = ImGui::GetColorU32({0.5f, 1.f, 0.1f, 1.0f});
-
-				drawIconCloud(p0, p1_o, col_main, col_back);
-			}
-		}
-	}
-
-	ImGui::SameLine();
+	const float same_line_spacing = ImGui::GetStyle().ItemSpacing.x*0.5f;
+	ImGui::SameLine(0.f, same_line_spacing);
 	ImGui::BeginGroup();
 	{
-		// line 1
-		ImGui::Text("%s%s", unread?"* ":"", (c.all_of<Contact::Components::Name>() ? c.get<Contact::Components::Name>().name.c_str() : "<unk>"));
+		{ // line 1
+			if (line_height == 1 && cstate != nullptr) {
+				// icon pos
+				auto p0 = ImGui::GetCursorScreenPos();
+				p0.y += ImGui::GetStyle().FramePadding.y;
+				ImVec2 p1_o = {img_y, img_y}; // img_y is 1 line_height in this case
+
+				const ImU32 col_back = ImGui::GetColorU32(th.getColor<ThemeCol_Contact::icon_backdrop>());
+				if (cstate->state == Contact::Components::ConnectionState::direct) { // direct icon
+					drawIconDirect(
+						p0,
+						p1_o,
+						ImGui::GetColorU32(th.getColor<ThemeCol_Contact::avatar_online_direct>()),
+						col_back
+					);
+				} else if (cstate->state == Contact::Components::ConnectionState::cloud) { // cloud icon
+					drawIconCloud(
+						p0,
+						p1_o,
+						ImGui::GetColorU32(th.getColor<ThemeCol_Contact::avatar_online_cloud>()),
+						col_back
+					);
+				}
+				ImGui::Dummy(p1_o);
+				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>"));
+		}
 
 		// line 2
 		if (line_height >= 2) {
@@ -241,7 +255,46 @@ bool renderContactBig(
 			} else if (request_outgoing) {
 				ImGui::TextUnformatted("Outgoing request/invite");
 			} else {
-				ImGui::TextDisabled("status message...");
+				if (cstate != nullptr) {
+					// icon pos
+					auto p0 = ImGui::GetCursorScreenPos();
+					p0.y += ImGui::GetStyle().FramePadding.y;
+					const float box_hight = TEXT_BASE_HEIGHT - ImGui::GetStyle().FramePadding.y*2;
+					ImVec2 p1_o = {box_hight, box_hight};
+
+					const ImU32 col_back = ImGui::GetColorU32(th.getColor<ThemeCol_Contact::icon_backdrop>());
+					if (cstate->state == Contact::Components::ConnectionState::direct) { // direct icon
+						drawIconDirect(
+							p0,
+							p1_o,
+							ImGui::GetColorU32(th.getColor<ThemeCol_Contact::avatar_online_direct>()),
+							col_back
+						);
+					} else if (cstate->state == Contact::Components::ConnectionState::cloud) { // cloud icon
+						drawIconCloud(
+							p0,
+							p1_o,
+							ImGui::GetColorU32(th.getColor<ThemeCol_Contact::avatar_online_cloud>()),
+							col_back
+						);
+					}
+					ImGui::Dummy(p1_o);
+					ImGui::SameLine(0.f, same_line_spacing);
+				}
+
+				if (
+					const auto* slt = c.try_get<Contact::Components::StatusText>();
+					slt != nullptr &&
+					!slt->text.empty() &&
+					slt->first_line_length > 0 &&
+					slt->first_line_length <= slt->text.size()
+				) {
+					ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_TextDisabled]);
+					ImGui::TextUnformatted(slt->text.c_str(), slt->text.c_str() + slt->first_line_length);
+					ImGui::PopStyleColor();
+				} else {
+					ImGui::TextDisabled(" "); // or dummy?
+				}
 			}
 
 			// line 3
@@ -255,6 +308,7 @@ bool renderContactBig(
 
 	ImGui::SetCursorPos(post_curser_pos);
 
+	ImGui::EndGroup();
 	return got_selected;
 }
 

src/chat_gui/contact_list.hpp

@@ -13,8 +13,17 @@ enum class ThemeCol_Contact {
 	avatar_online_direct,
 	avatar_online_cloud,
 	avatar_offline,
+
+	icon_backdrop,
 };
 
+void renderAvatar(
+	const Theme& th,
+	ContactTextureCache& contact_tc,
+	const Contact3Handle c,
+	ImVec2 box
+);
+
 // returns true if clicked, if selectable, will highlight on hover and respect selected
 // TODO: refine
 // +------+

src/chat_gui/theme.cpp

@@ -41,12 +41,14 @@ 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.3, 1, 0, 1});
-	t.setColor<ThemeCol_Contact::avatar_online_cloud>({0, 1, 0.8, 1});
-	t.setColor<ThemeCol_Contact::avatar_offline>({0.4, 0.4, 0.4, 1});
+	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::icon_backdrop				>({0.0f, 0.0f, 0.0f, 0.4f});
 
 	return t;
 }

src/chat_gui4.cpp

@@ -227,12 +227,13 @@ float ChatGui4::render(float time_delta) {
 
 				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)) {
+						if (ImGui::BeginChild("subcontacts", {TEXT_BASE_WIDTH * 18.f, -100.f}, true)) {
 							ImGui::Text("subs: %zu", sub_contacts->size());
 							ImGui::Separator();
 							for (const auto& c : *sub_contacts) {
 								// TODO: can a sub be selected? no
-								if (renderSubContactListContact(c, _selected_contact.has_value() && *_selected_contact == c)) {
+								//if (renderSubContactListContact(c, _selected_contact.has_value() && *_selected_contact == c)) {
+								if (renderContactBig(_theme, _contact_tc, {_cr, c}, 1)) {
 									_text_input_buffer.insert(0, (_cr.all_of<Contact::Components::Name>(c) ? _cr.get<Contact::Components::Name>(c).name : "<unk>") + ": ");
 								}
 							}
@@ -297,7 +298,7 @@ float ChatGui4::render(float time_delta) {
 						ImGuiTableFlags_SizingFixedFit
 					;
 					if (msg_reg_ptr != nullptr && ImGui::BeginTable("chat_table", 5, table_flags)) {
-						ImGui::TableSetupColumn("name", 0, TEXT_BASE_WIDTH * 15.f);
+						ImGui::TableSetupColumn("name", 0, TEXT_BASE_WIDTH * 16.f);
 						ImGui::TableSetupColumn("message", ImGuiTableColumnFlags_WidthStretch);
 						ImGui::TableSetupColumn("delivered/read");
 						ImGui::TableSetupColumn("timestamp");
@@ -325,7 +326,7 @@ float ChatGui4::render(float time_delta) {
 							msg_reg.view<Components::UnreadFade>().each([&to_remove, time_delta](const Message3 e, Components::UnreadFade& fade) {
 								// TODO: configurable
 								const float fade_duration = 7.5f;
-								fade.fade -= 1.f/fade_duration * std::min<float>(time_delta, 1.f/10.f); // fps but not below 10 for smooth fade
+								fade.fade -= 1.f/fade_duration * std::min<float>(time_delta, 1.f/8.f); // fps but not below 8 for smooth-ish fade
 								if (fade.fade <= 0.f) {
 									to_remove.push_back(e);
 								}
@@ -385,6 +386,10 @@ float ChatGui4::render(float time_delta) {
 
 							// name
 							if (ImGui::TableNextColumn()) {
+								const float img_y {TEXT_BASE_HEIGHT - ImGui::GetStyle().FramePadding.y*2};
+								renderAvatar(_theme, _contact_tc, {_cr, c_from.c}, {img_y, img_y});
+								ImGui::SameLine(0.f, ImGui::GetStyle().ItemSpacing.x*0.5f);
+
 								if (_cr.all_of<Contact::Components::Name>(c_from.c)) {
 									ImGui::TextUnformatted(_cr.get<Contact::Components::Name>(c_from.c).name.c_str());
 								} else {
@@ -1115,6 +1120,7 @@ bool ChatGui4::renderContactListContactSmall(const Contact3 c, const bool select
 	return ImGui::Selectable(label.c_str(), selected);
 }
 
+#if 0
 bool ChatGui4::renderSubContactListContact(const Contact3 c, const bool selected) const {
 	std::string label;
 
@@ -1137,6 +1143,7 @@ bool ChatGui4::renderSubContactListContact(const Contact3 c, const bool selected
 
 	return ImGui::Selectable(label.c_str(), selected);
 }
+#endif
 
 void ChatGui4::pasteFile(const char* mime_type) {
 	size_t data_size = 0;

src/chat_gui4.hpp

@@ -79,7 +79,7 @@ class ChatGui4 {
 
 		void renderContactList(void);
 		bool renderContactListContactSmall(const Contact3 c, const bool selected) const;
-		bool renderSubContactListContact(const Contact3 c, const bool selected) const;
+		//bool renderSubContactListContact(const Contact3 c, const bool selected) const;
 
 		void pasteFile(const char* mime_type);
 };

src/tox_avatar_loader.cpp

@@ -187,7 +187,8 @@ std::optional<TextureEntry> ToxAvatarLoader::load(TextureUploaderI& tu, Contact3
 	if (!_cr.any_of<
 		Contact::Components::ToxFriendPersistent,
 		Contact::Components::ToxGroupPersistent,
-		Contact::Components::ToxGroupPeerPersistent
+		Contact::Components::ToxGroupPeerPersistent,
+		Contact::Components::ID
 	>(c)) {
 		return std::nullopt;
 	}
@@ -199,6 +200,12 @@ std::optional<TextureEntry> ToxAvatarLoader::load(TextureUploaderI& tu, Contact3
 		pixels = generateToxIdenticon(_cr.get<Contact::Components::ToxGroupPersistent>(c).chat_id);
 	} else if (_cr.all_of<Contact::Components::ToxGroupPeerPersistent>(c)) {
 		pixels = generateToxIdenticon(_cr.get<Contact::Components::ToxGroupPeerPersistent>(c).peer_key);
+	} else if (_cr.all_of<Contact::Components::ID>(c)) {
+		// TODO: should we really use toxidenticons for other protocols?
+		// (this is required for self)
+		auto id_copy = _cr.get<Contact::Components::ID>(c).data;
+		id_copy.resize(32);
+		pixels = generateToxIdenticon(id_copy);
 	}
 
 	TextureEntry new_entry;

src/tox_client.cpp

@@ -3,7 +3,7 @@
 // meh, change this
 #include <exception>
 #include <system_error>
-#include <toxencryptsave/toxencryptsave.h>
+#include <tox/toxencryptsave.h>
 
 #include <sodium.h>