diff --git a/apps/desktop/src/gui/application/gui_application.cpp b/apps/desktop/src/gui/application/gui_application.cpp index b8d989db..393bc658 100644 --- a/apps/desktop/src/gui/application/gui_application.cpp +++ b/apps/desktop/src/gui/application/gui_application.cpp @@ -1363,6 +1363,12 @@ void GuiApplication::BindMainCallbacks() { LOG_WARN("Copy local id failed: {}", SDL_GetError()); } }); + main->on_signal_reconnect_requested([this] { + LOG_INFO("Signal reconnect requested from the status bar"); + if (ForceSignalReconnect() != 0) { + LOG_WARN("Signal reconnect could not be started"); + } + }); main->on_toggle_password_visibility([this] { show_password_ = !show_password_; ui_->main->set_password_visible(show_password_); @@ -1880,6 +1886,7 @@ void GuiApplication::Tick() { HandlePasswordChangeResult(); HandleCredentialRecovery(); if (!peer_) { + signal_connection_indicator_.Reset(); CreateConnectionPeer(); } #ifdef __linux__ @@ -2471,7 +2478,10 @@ void GuiApplication::SyncMainWindow() { std::lock_guard lock(password_change_mutex_); ui_->main->set_password_change_pending(password_change_pending_); } - ui_->main->set_signal_connected(signal_connected_); + const bool signal_online = signal_connected_.load(); + ui_->main->set_signal_connected(signal_online); + ui_->main->set_signal_reconnecting( + signal_connection_indicator_.Update(signal_online)); ui_->main->set_signal_tls_error(signal_status_ == SignalStatus::SignalTlsCertError); ui_->main->set_update_available(update_available_); diff --git a/apps/desktop/src/gui/application/gui_application.h b/apps/desktop/src/gui/application/gui_application.h index 4a840c1d..31c2a771 100644 --- a/apps/desktop/src/gui/application/gui_application.h +++ b/apps/desktop/src/gui/application/gui_application.h @@ -14,6 +14,7 @@ #include +#include "application/signal_connection_indicator.h" #include "runtime/cursor_state_provider.h" #include "runtime/gui_runtime.h" @@ -106,6 +107,7 @@ private: cursor_delivery_states_; uint32_t cursor_state_sequence_ = 0; std::chrono::steady_clock::time_point next_video_frame_time_{}; + SignalConnectionIndicator signal_connection_indicator_; #if defined(__linux__) && !defined(__APPLE__) bool use_xwayland_gui_ = false; bool use_x11_custom_titlebar_ = false; diff --git a/apps/desktop/src/gui/application/signal_connection_indicator.h b/apps/desktop/src/gui/application/signal_connection_indicator.h new file mode 100644 index 00000000..cf78030d --- /dev/null +++ b/apps/desktop/src/gui/application/signal_connection_indicator.h @@ -0,0 +1,38 @@ +#ifndef CROSSDESK_SIGNAL_CONNECTION_INDICATOR_H_ +#define CROSSDESK_SIGNAL_CONNECTION_INDICATOR_H_ + +#include +#include + +namespace crossdesk { + +// Presentation state only. The actual connected flag remains authoritative +// for actions and other UI consumers, including the announcement inbox. +class SignalConnectionIndicator { + public: + using Clock = std::chrono::steady_clock; + + bool Update(bool connected, Clock::time_point now = Clock::now()) { + if (connected) { + disconnected_at_.reset(); + } else if (was_connected_) { + disconnected_at_ = now; + } + was_connected_ = connected; + return disconnected_at_ && + now - *disconnected_at_ < std::chrono::seconds(10); + } + + void Reset() { + was_connected_ = false; + disconnected_at_.reset(); + } + + private: + bool was_connected_ = false; + std::optional disconnected_at_; +}; + +} // namespace crossdesk + +#endif diff --git a/apps/desktop/src/gui/assets/localization/localization_data.h b/apps/desktop/src/gui/assets/localization/localization_data.h index e923cc5b..52139d78 100644 --- a/apps/desktop/src/gui/assets/localization/localization_data.h +++ b/apps/desktop/src/gui/assets/localization/localization_data.h @@ -258,6 +258,9 @@ struct TranslationRow { X(signal_connected, u8"已连接服务器", "Connected", u8"Подключено к серверу") \ X(signal_disconnected, u8"未连接服务器", "Disconnected", \ u8"Нет подключения к серверу") \ + X(signal_reconnect, u8"重新连接", "Reconnect", u8"Переподключиться") \ + X(signal_reconnecting, u8"正在重新连接...", "Reconnecting...", \ + u8"Переподключение...") \ X(signal_tls_cert_error, u8"证书验证失败,请重新安装自托管根证书", \ "Certificate verification failed. Reinstall the self-hosted root " \ "certificate.", \ diff --git a/apps/desktop/src/gui/runtime/connection_runtime.cpp b/apps/desktop/src/gui/runtime/connection_runtime.cpp index 3859f2f3..eb12ea4c 100644 --- a/apps/desktop/src/gui/runtime/connection_runtime.cpp +++ b/apps/desktop/src/gui/runtime/connection_runtime.cpp @@ -227,6 +227,14 @@ int GuiRuntime::RequestSingleDevicePresence(const std::string& remote_id, return ret; } +int GuiRuntime::ForceSignalReconnect() { + if (!peer_) { + LOG_WARN("Signal reconnect requested with no connection peer"); + return -1; + } + return ReconnectSignal(peer_); +} + void GuiRuntime::CloseRemoteSession(std::shared_ptr props) { if (!props || props->closing_.exchange(true)) return; if (props->peer_events_) props->peer_events_->Deactivate(); diff --git a/apps/desktop/src/gui/runtime/gui_runtime.h b/apps/desktop/src/gui/runtime/gui_runtime.h index 1e4e12c2..9452b488 100644 --- a/apps/desktop/src/gui/runtime/gui_runtime.h +++ b/apps/desktop/src/gui/runtime/gui_runtime.h @@ -54,6 +54,7 @@ class GuiRuntime : protected gui_detail::GuiState { bool remember_password, bool bypass_presence_check = false); int RequestSingleDevicePresence(const std::string& remote_id, const char* password, bool remember_password); + int ForceSignalReconnect(); void HandleRecentConnections(); void HandleConnectionStatusChange(); diff --git a/apps/desktop/src/gui/ui/main_window.slint b/apps/desktop/src/gui/ui/main_window.slint index 64b9769c..767c1f43 100644 --- a/apps/desktop/src/gui/ui/main_window.slint +++ b/apps/desktop/src/gui/ui/main_window.slint @@ -65,6 +65,8 @@ export global UiStrings { in-out property signal-connected: "Signal server connected"; in-out property signal-disconnected: "Signal server disconnected"; in-out property tls-error: "Signal server TLS certificate error"; + in-out property signal-reconnect: "Reconnect"; + in-out property signal-reconnecting: "Reconnecting..."; in-out property update-available: "A new version is available"; in-out property new-version: "New version"; in-out property check-for-updates: "Check for updates"; @@ -305,6 +307,7 @@ export component MainWindow inherits Window { in property password-visible: true; in property password-change-pending: false; in property signal-connected: false; + in property signal-reconnecting: false; in property signal-tls-error: false; in property <[RecentConnection]> recent-connections; in property <[AnnouncementItem]> announcements; @@ -402,6 +405,7 @@ export component MainWindow inherits Window { callback browse-save-path; callback open-download; callback check-for-updates; + callback signal-reconnect-requested; callback connection-cancel; callback connection-acknowledge; callback connection-submit-password(string, bool); @@ -1209,7 +1213,7 @@ export component MainWindow inherits Window { width: 8px; height: 8px; border-radius: 4px; - background: root.signal-tls-error ? #f59e0b : #ef4444; + background: root.signal-tls-error || root.signal-reconnecting ? #f59e0b : #ef4444; } Text { x: 28px; @@ -1217,11 +1221,31 @@ export component MainWindow inherits Window { height: 18px; text: root.signal-tls-error ? UiStrings.tls-error : root.signal-connected ? UiStrings.signal-connected + : root.signal-reconnecting ? UiStrings.signal-reconnecting : UiStrings.signal-disconnected; color: #343941; font-size: ImGuiFontStyle.base; vertical-alignment: center; } + if !root.signal-connected && !root.signal-tls-error: Rectangle { + x: parent.width - self.width - 12px; + y: 3px; + height: 18px; + width: reconnect-label.preferred-width; + reconnect-label := Text { + text: UiStrings.signal-reconnect; + color: #2563eb; + font-size: ImGuiFontStyle.base; + horizontal-alignment: center; + vertical-alignment: center; + } + TouchArea { + mouse-cursor: pointer; + clicked => { + root.signal-reconnect-requested(); + } + } + } } } diff --git a/apps/desktop/src/gui/ui/ui_localization.h b/apps/desktop/src/gui/ui/ui_localization.h index 7001449a..06c5426e 100644 --- a/apps/desktop/src/gui/ui/ui_localization.h +++ b/apps/desktop/src/gui/ui/ui_localization.h @@ -110,6 +110,10 @@ inline int ApplyMainWindowStrings( strings.set_signal_disconnected( Text(localization::signal_disconnected[language])); strings.set_tls_error(Text(localization::signal_tls_cert_error[language])); + strings.set_signal_reconnect( + Text(localization::signal_reconnect[language])); + strings.set_signal_reconnecting( + Text(localization::signal_reconnecting[language])); strings.set_update_available( Text(localization::new_version_available[language])); strings.set_new_version(Text(localization::new_version[language])); diff --git a/deps/submodules/minirtc b/deps/submodules/minirtc index 9d5860df..029e31c6 160000 --- a/deps/submodules/minirtc +++ b/deps/submodules/minirtc @@ -1 +1 @@ -Subproject commit 9d5860dfe601417b87d54a3a164146ee890c27cf +Subproject commit 029e31c6aa512cd65ed552b9a3adab55f9b82235