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

Add ID input gui

Browse Source
This commit is contained in:
dijunkun
2023-10-09 16:31:47 +08:00
parent 4e06d111fa
commit 50c6a24e26
2 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
application/remote_desk/remote_desk_gui/main.cpp
View File

@@ -291,7 +291,6 @@ int main() {
std::string user_id = "C-" + std::string(GetMac(mac_addr)); std::string user_id = "C-" + std::string(GetMac(mac_addr));
peer = CreatePeer(&params); peer = CreatePeer(&params);
// JoinConnection(peer, transmission_id.c_str(), user_id.c_str());
// Setup SDL // Setup SDL
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) !=
@@ -359,45 +358,36 @@ int main() {
ImGui_ImplSDL2_NewFrame(); ImGui_ImplSDL2_NewFrame();
ImGui::NewFrame(); ImGui::NewFrame();
ImGui::BeginMainMenuBar(); {
static float f = 0.0f;
static int counter = 0;
if (ImGui::BeginMenu("Main Menu", true)) { const ImGuiViewport *main_viewport = ImGui::GetMainViewport();
if (ImGui::MenuItem("Connect") && !joined) { ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Once);
JoinConnection(peer, transmission_id.c_str(), user_id.c_str()); ImGui::SetNextWindowSize(ImVec2(160, 85));
ImGui::Begin("Menu", nullptr, ImGuiWindowFlags_NoResize);
static char buf[10] = "";
ImGui::Text("ID:");
ImGui::SameLine();
ImGui::SetNextItemWidth(114);
ImGui::InputTextWithHint("", "000000", buf, IM_ARRAYSIZE(buf));
ImGui::Spacing();
if (ImGui::Button("Connect") && !joined) {
JoinConnection(peer, buf, user_id.c_str());
joined = true; joined = true;
} }
ImGui::Separator(); ImGui::SameLine();
if (ImGui::MenuItem("Disconnect")) { if (ImGui::Button("Disconnect")) {
LeaveConnection(peer); LeaveConnection(peer);
joined = false; joined = false;
} }
ImGui::EndMenu();
ImGui::End();
} }
// ImGui::Separator();
// if (ImGui::BeginMenu("Second Menu", true)) {
// if (ImGui::MenuItem("Item 1", "item 1")) {
// }
// ImGui::Separator();
// if (ImGui::MenuItem("Item 2", "item 2")) {
// }
// ImGui::EndMenu();
// }
// ImGui::Separator();
// if (ImGui::BeginMenu("Third Menu", true)) {
// if (ImGui::MenuItem("Item 3", "item 3")) {
// }
// ImGui::Separator();
// if (ImGui::MenuItem("Item 4", "item 4")) {
// }
// ImGui::EndMenu();
// }
ImGui::EndMainMenuBar();
// Rendering // Rendering
ImGui::Render(); ImGui::Render();
SDL_RenderSetScale(sdlRenderer, io.DisplayFramebufferScale.x, SDL_RenderSetScale(sdlRenderer, io.DisplayFramebufferScale.x,
@@ -410,18 +400,18 @@ int main() {
done = true; done = true;
} else if (event.type == SDL_WINDOWEVENT && } else if (event.type == SDL_WINDOWEVENT &&
event.window.event == SDL_WINDOWEVENT_RESIZED) { event.window.event == SDL_WINDOWEVENT_RESIZED) {
int new_screen_w = 0; // int new_screen_w = 0;
int new_screen_h = 0; // int new_screen_h = 0;
SDL_GetWindowSize(window, &new_screen_w, &new_screen_h); // SDL_GetWindowSize(window, &new_screen_w, &new_screen_h);
if (new_screen_w != screen_w) { // if (new_screen_w != screen_w) {
screen_w = new_screen_w; // screen_w = new_screen_w;
screen_h = new_screen_w * 9 / 16; // screen_h = new_screen_w * 9 / 16;
} else if (new_screen_h != screen_h) { // } else if (new_screen_h != screen_h) {
screen_w = new_screen_h * 16 / 9; // screen_w = new_screen_h * 16 / 9;
screen_h = new_screen_h; // screen_h = new_screen_h;
} // }
SDL_SetWindowSize(window, screen_w, screen_h); // SDL_SetWindowSize(window, screen_w, screen_h);
printf("Resize windows: %dx%d\n", screen_w, screen_h); printf("Resize windows: %dx%d\n", screen_w, screen_h);
} else if (event.type == SDL_WINDOWEVENT && } else if (event.type == SDL_WINDOWEVENT &&
event.window.event == SDL_WINDOWEVENT_CLOSE && event.window.event == SDL_WINDOWEVENT_CLOSE &&

2
application/remote_desk/remote_desk_server/remote_desk_server.cpp
View File

@@ -193,7 +193,7 @@ int RemoteDeskServer::Init() {
params.on_receive_audio_buffer = ReceiveAudioBuffer; params.on_receive_audio_buffer = ReceiveAudioBuffer;
params.on_receive_data_buffer = ReceiveDataBuffer; params.on_receive_data_buffer = ReceiveDataBuffer;
std::string transmission_id = "000001"; std::string transmission_id = "666666";
char mac_addr[10]; char mac_addr[10];
std::string user_id = "S-" + std::string(GetMac(mac_addr)); std::string user_id = "S-" + std::string(GetMac(mac_addr));
peer = CreatePeer(&params); peer = CreatePeer(&params);