[refactor] add namespace 'crossdesk' to codebase

This commit is contained in:
dijunkun
2025-10-27 21:09:39 +08:00
parent 3b34c26555
commit 401bfe4483
68 changed files with 313 additions and 606 deletions

View File

@@ -12,6 +12,9 @@
#if _WIN32
#include <Windows.h>
#endif
namespace crossdesk {
namespace localization {
static std::vector<std::string> local_desktop = {
@@ -169,4 +172,5 @@ static std::vector<std::string> minimize_to_tray = {
static std::vector<LPCWSTR> exit_program = {L"退出", L"Exit"};
#endif
} // namespace localization
} // namespace crossdesk
#endif

View File

@@ -5,6 +5,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
int Render::LocalWindow() {
ImGui::SetNextWindowPos(ImVec2(-1.0f, title_bar_height_), ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
@@ -287,4 +289,5 @@ int Render::LocalWindow() {
ImGui::PopStyleVar();
return 0;
}
}
} // namespace crossdesk

View File

@@ -2,6 +2,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
int Render::RecentConnectionsWindow() {
ImGui::SetNextWindowPos(
ImVec2(0, title_bar_height_ + local_window_height_ - 1.0f),
@@ -284,3 +286,4 @@ int Render::ConfirmDeleteConnection() {
ImGui::PopStyleVar();
return 0;
}
} // namespace crossdesk

View File

@@ -3,7 +3,9 @@
#include "rd_log.h"
#include "render.h"
static int InputTextCallback(ImGuiInputTextCallbackData *data);
namespace crossdesk {
static int InputTextCallback(ImGuiInputTextCallbackData* data);
int Render::RemoteWindow() {
ImGui::SetNextWindowPos(ImVec2(local_window_width_ + 1.0f, title_bar_height_),
@@ -77,7 +79,7 @@ int Render::RemoteWindow() {
enter_pressed) {
connect_button_pressed_ = true;
bool found = false;
for (auto &[id, props] : recent_connections_) {
for (auto& [id, props] : recent_connections_) {
if (id.find(remote_id) != std::string::npos) {
found = true;
if (client_properties_.find(remote_id) !=
@@ -101,7 +103,7 @@ int Render::RemoteWindow() {
if (need_to_rejoin_) {
need_to_rejoin_ = false;
for (const auto &[_, props] : client_properties_) {
for (const auto& [_, props] : client_properties_) {
if (props->rejoin_) {
ConnectTo(props->remote_id_, props->remote_password_,
props->remember_password_);
@@ -117,7 +119,7 @@ int Render::RemoteWindow() {
return 0;
}
static int InputTextCallback(ImGuiInputTextCallbackData *data) {
static int InputTextCallback(ImGuiInputTextCallbackData* data) {
if (data->BufTextLen > 3 && data->Buf[3] != ' ') {
data->InsertChars(3, " ");
}
@@ -129,7 +131,7 @@ static int InputTextCallback(ImGuiInputTextCallbackData *data) {
return 0;
}
int Render::ConnectTo(const std::string &remote_id, const char *password,
int Render::ConnectTo(const std::string& remote_id, const char* password,
bool remember_password) {
LOG_INFO("Connect to [{}]", remote_id);
focused_remote_id_ = remote_id;
@@ -178,4 +180,5 @@ int Render::ConnectTo(const std::string &remote_id, const char *password,
}
return 0;
}
}
} // namespace crossdesk

View File

@@ -21,6 +21,8 @@
#define MOUSE_GRAB_PADDING 5
namespace crossdesk {
std::vector<char> Render::SerializeRemoteAction(const RemoteAction& action) {
std::vector<char> buffer;
buffer.push_back(static_cast<char>(action.type));
@@ -1431,4 +1433,5 @@ void Render::ProcessSdlEvent(const SDL_Event& event) {
}
break;
}
}
}
} // namespace crossdesk

View File

@@ -33,6 +33,7 @@
#include "win_tray.h"
#endif
namespace crossdesk {
class Render {
public:
struct SubStreamWindowProperties {
@@ -469,5 +470,5 @@ class Render {
void CloseTab(decltype(client_properties_)::iterator& it);
/* ------ stream window property end ------ */
};
} // namespace crossdesk
#endif

View File

@@ -11,6 +11,8 @@
#define MOUSE_CONTROL 1
#endif
namespace crossdesk {
int Render::SendKeyCommand(int key_code, bool is_down) {
RemoteAction remote_action;
remote_action.type = ControlType::keyboard;
@@ -542,4 +544,5 @@ void Render::NetStatusReport(const char* client_id, size_t client_id_size,
if (!(render->peer_reserved_ && !strstr(client_id, "C-"))) {
props->net_traffic_stats_ = *net_traffic_stats;
}
}
}
} // namespace crossdesk

View File

@@ -3,6 +3,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
int CountDigits(int number) {
if (number == 0) return 1;
return (int)std::floor(std::log10(std::abs(number))) + 1;
@@ -324,3 +326,4 @@ int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
return 0;
}
} // namespace crossdesk

View File

@@ -1,6 +1,8 @@
#include "localization.h"
#include "render.h"
namespace crossdesk {
int Render::StatusBar() {
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
static bool a, b, c, d, e;
@@ -35,4 +37,5 @@ int Render::StatusBar() {
ImGui::PopStyleColor();
ImGui::EndChild();
return 0;
}
}
} // namespace crossdesk

View File

@@ -4,6 +4,8 @@
#define BUTTON_PADDING 36.0f
namespace crossdesk {
int Render::TitleBar(bool main_window) {
ImGui::PushStyleColor(ImGuiCol_MenuBarBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -171,4 +173,5 @@ int Render::TitleBar(bool main_window) {
ImGui::EndChild();
ImGui::PopStyleColor();
return 0;
}
}
} // namespace crossdesk

View File

@@ -4,6 +4,8 @@
#include "localization.h"
namespace crossdesk {
// callback for the message-only window that handles tray icon messages
static LRESULT CALLBACK MsgWndProc(HWND hwnd, UINT msg, WPARAM wParam,
LPARAM lParam) {
@@ -109,4 +111,5 @@ bool WinTray::HandleTrayMessage(MSG* msg) {
}
}
return true;
}
}
} // namespace crossdesk

View File

@@ -14,6 +14,8 @@
#define WM_TRAY_CALLBACK (WM_USER + 1)
namespace crossdesk {
class WinTray {
public:
WinTray(HWND app_hwnd, HICON icon, const std::wstring& tooltip,
@@ -32,5 +34,5 @@ class WinTray {
int language_index_;
NOTIFYICONDATA nid_;
};
} // namespace crossdesk
#endif

View File

@@ -3,9 +3,11 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
int Render::AboutWindow() {
if (show_about_window_) {
const ImGuiViewport *viewport = ImGui::GetMainViewport();
const ImGuiViewport* viewport = ImGui::GetMainViewport();
ImGui::SetNextWindowPos(ImVec2(
(viewport->WorkSize.x - viewport->WorkPos.x - about_window_width_) / 2,
@@ -58,4 +60,5 @@ int Render::AboutWindow() {
ImGui::PopStyleColor();
}
return 0;
}
}
} // namespace crossdesk

View File

@@ -3,9 +3,11 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
bool Render::ConnectionStatusWindow(
std::shared_ptr<SubStreamWindowProperties> &props) {
const ImGuiViewport *viewport = ImGui::GetMainViewport();
std::shared_ptr<SubStreamWindowProperties>& props) {
const ImGuiViewport* viewport = ImGui::GetMainViewport();
bool ret_flag = false;
ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
connection_status_window_width_) /
@@ -168,4 +170,5 @@ bool Render::ConnectionStatusWindow(
ImGui::PopStyleVar();
return ret_flag;
}
}
} // namespace crossdesk

View File

@@ -1,7 +1,9 @@
#include "rd_log.h"
#include "render.h"
int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
namespace crossdesk {
int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
double time_duration =
ImGui::GetTime() - props->control_bar_button_pressed_time_;
if (props->control_window_width_is_changing_) {
@@ -220,4 +222,5 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
ImGui::PopStyleColor();
return 0;
}
}
} // namespace crossdesk

View File

@@ -3,6 +3,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
int Render::SettingWindow() {
if (show_settings_window_) {
if (settings_window_pos_reset_) {
@@ -390,4 +392,5 @@ int Render::SettingWindow() {
}
return 0;
}
}
} // namespace crossdesk

View File

@@ -2,6 +2,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
int Render::MainWindow() {
ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_), ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
@@ -47,3 +49,4 @@ int Render::MainWindow() {
return 0;
}
} // namespace crossdesk

View File

@@ -10,6 +10,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
std::vector<std::string> GetRootEntries() {
std::vector<std::string> roots;
#ifdef _WIN32
@@ -318,4 +320,5 @@ int Render::SelfHostedServerWindow() {
}
return 0;
}
}
} // namespace crossdesk

View File

@@ -2,6 +2,8 @@
#include "rd_log.h"
#include "render.h"
namespace crossdesk {
void Render::DrawConnectionStatusText(
std::shared_ptr<SubStreamWindowProperties>& props) {
std::string text;
@@ -199,4 +201,5 @@ int Render::StreamWindow() {
ImGui::End(); // End VideoBg
return 0;
}
}
} // namespace crossdesk