YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix signal server member list error when rejoin same one connection

Browse Source
This commit is contained in:
dijunkun
2023-10-11 14:26:57 +08:00
parent b887fcbf86
commit f246ab8720
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
remote_desk_gui/main.cpp
View File

@@ -98,24 +98,24 @@ inline int ProcessMouseKeyEven(SDL_Event &ev) {
if (SDL_KEYDOWN == ev.type) // SDL_KEYUP if (SDL_KEYDOWN == ev.type) // SDL_KEYUP
{ {
printf("SDLK_DOWN: %d\n", SDL_KeyCode(ev.key.keysym.sym)); // printf("SDLK_DOWN: %d\n", SDL_KeyCode(ev.key.keysym.sym));
if (SDLK_DOWN == ev.key.keysym.sym) { if (SDLK_DOWN == ev.key.keysym.sym) {
printf("SDLK_DOWN \n"); // printf("SDLK_DOWN \n");
} else if (SDLK_UP == ev.key.keysym.sym) { } else if (SDLK_UP == ev.key.keysym.sym) {
printf("SDLK_UP \n"); // printf("SDLK_UP \n");
} else if (SDLK_LEFT == ev.key.keysym.sym) { } else if (SDLK_LEFT == ev.key.keysym.sym) {
printf("SDLK_LEFT \n"); // printf("SDLK_LEFT \n");
} else if (SDLK_RIGHT == ev.key.keysym.sym) { } else if (SDLK_RIGHT == ev.key.keysym.sym) {
printf("SDLK_RIGHT \n"); // printf("SDLK_RIGHT \n");
} }
} else if (SDL_MOUSEBUTTONDOWN == ev.type) { } else if (SDL_MOUSEBUTTONDOWN == ev.type) {
if (SDL_BUTTON_LEFT == ev.button.button) { if (SDL_BUTTON_LEFT == ev.button.button) {
int px = ev.button.x; int px = ev.button.x;
int py = ev.button.y; int py = ev.button.y;
printf("SDL_MOUSEBUTTONDOWN x, y %d %d \n", px, py); // printf("SDL_MOUSEBUTTONDOWN x, y %d %d \n", px, py);
remote_action.type = ControlType::mouse; remote_action.type = ControlType::mouse;
remote_action.m.flag = MouseFlag::left_down; remote_action.m.flag = MouseFlag::left_down;
@@ -128,7 +128,7 @@ inline int ProcessMouseKeyEven(SDL_Event &ev) {
} else if (SDL_BUTTON_RIGHT == ev.button.button) { } else if (SDL_BUTTON_RIGHT == ev.button.button) {
int px = ev.button.x; int px = ev.button.x;
int py = ev.button.y; int py = ev.button.y;
printf("SDL_BUTTON_RIGHT x, y %d %d \n", px, py); // printf("SDL_BUTTON_RIGHT x, y %d %d \n", px, py);
remote_action.type = ControlType::mouse; remote_action.type = ControlType::mouse;
remote_action.m.flag = MouseFlag::right_down; remote_action.m.flag = MouseFlag::right_down;
@@ -142,7 +142,7 @@ inline int ProcessMouseKeyEven(SDL_Event &ev) {
if (SDL_BUTTON_LEFT == ev.button.button) { if (SDL_BUTTON_LEFT == ev.button.button) {
int px = ev.button.x; int px = ev.button.x;
int py = ev.button.y; int py = ev.button.y;
printf("SDL_MOUSEBUTTONUP x, y %d %d \n", px, py); // printf("SDL_MOUSEBUTTONUP x, y %d %d \n", px, py);
remote_action.type = ControlType::mouse; remote_action.type = ControlType::mouse;
remote_action.m.flag = MouseFlag::left_up; remote_action.m.flag = MouseFlag::left_up;
@@ -155,7 +155,7 @@ inline int ProcessMouseKeyEven(SDL_Event &ev) {
} else if (SDL_BUTTON_RIGHT == ev.button.button) { } else if (SDL_BUTTON_RIGHT == ev.button.button) {
int px = ev.button.x; int px = ev.button.x;
int py = ev.button.y; int py = ev.button.y;
printf("SDL_MOUSEBUTTONUP x, y %d %d \n", px, py); // printf("SDL_MOUSEBUTTONUP x, y %d %d \n", px, py);
remote_action.type = ControlType::mouse; remote_action.type = ControlType::mouse;
remote_action.m.flag = MouseFlag::right_up; remote_action.m.flag = MouseFlag::right_up;
@@ -169,7 +169,7 @@ inline int ProcessMouseKeyEven(SDL_Event &ev) {
int px = ev.motion.x; int px = ev.motion.x;
int py = ev.motion.y; int py = ev.motion.y;
printf("SDL_MOUSEMOTION x, y %d %d \n", px, py); // printf("SDL_MOUSEMOTION x, y %d %d \n", px, py);
remote_action.type = ControlType::mouse; remote_action.type = ControlType::mouse;
remote_action.m.flag = MouseFlag::move; remote_action.m.flag = MouseFlag::move;
@@ -213,9 +213,9 @@ void ReceiveDataBuffer(const char *data, size_t size, const char *user_id,
RemoteAction remote_action; RemoteAction remote_action;
memcpy(&remote_action, data, sizeof(remote_action)); memcpy(&remote_action, data, sizeof(remote_action));
std::cout << "remote_action: " << remote_action.type << " " // std::cout << "remote_action: " << remote_action.type << " "
<< remote_action.m.flag << " " << remote_action.m.x << " " // << remote_action.m.flag << " " << remote_action.m.x << " "
<< remote_action.m.y << std::endl; // << remote_action.m.y << std::endl;
#ifdef _WIN32 #ifdef _WIN32
INPUT ip; INPUT ip;
@@ -238,15 +238,15 @@ void ReceiveDataBuffer(const char *data, size_t size, const char *user_id,
ip.mi.time = 0; ip.mi.time = 0;
// Set cursor pos // Set cursor pos
// SetCursorPos(ip.mi.dx, ip.mi.dy); SetCursorPos(ip.mi.dx, ip.mi.dy);
// Send the press // Send the press
if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) { if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) {
// SendInput(1, &ip, sizeof(INPUT)); SendInput(1, &ip, sizeof(INPUT));
} }
std::cout << "Receive data from [" << user << "], " << ip.type << " " // std::cout << "Receive data from [" << user << "], " << ip.type << " "
<< ip.mi.dwFlags << " " << ip.mi.dx << " " << ip.mi.dy // << ip.mi.dwFlags << " " << ip.mi.dx << " " << ip.mi.dy
<< std::endl; // << std::endl;
} }
#endif #endif
} }
@@ -538,11 +538,13 @@ int main() {
static bool connect_button_pressed = false; static bool connect_button_pressed = false;
static const char *connect_label = "Connect"; static const char *connect_label = "Connect";
{ {
static char buf[20] = ""; static char remote_id[20] = "";
strcpy(remote_id, GetMac(mac_addr).c_str());
ImGui::Text("REMOTE ID:"); ImGui::Text("REMOTE ID:");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(110); ImGui::SetNextItemWidth(110);
ImGui::InputTextWithHint("id_buf", "000002", buf, IM_ARRAYSIZE(buf), ImGui::InputTextWithHint("id_buf", "000002", remote_id,
IM_ARRAYSIZE(remote_id),
ImGuiInputTextFlags_AllowTabInput); ImGuiInputTextFlags_AllowTabInput);
ImGui::Spacing(); ImGui::Spacing();
@@ -559,7 +561,7 @@ int main() {
if (ImGui::Button(connect_label)) { if (ImGui::Button(connect_label)) {
if (strcmp(connect_label, "Connect") == 0 && !joined) { if (strcmp(connect_label, "Connect") == 0 && !joined) {
std::string user_id = "C-" + std::string(GetMac(mac_addr)); std::string user_id = "C-" + std::string(GetMac(mac_addr));
JoinConnection(peer_client, buf); JoinConnection(peer_client, remote_id);
joined = true; joined = true;
} else if (strcmp(connect_label, "Disconnect") == 0 && joined) { } else if (strcmp(connect_label, "Disconnect") == 0 && joined) {
LeaveConnection(peer_client); LeaveConnection(peer_client);