From 3f777e4662ff22afb03321c5ce775933e17c1600 Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Fri, 22 Nov 2024 16:45:14 +0800
Subject: [PATCH] [fix] fix compile error

---
 src/device_controller/keyboard/linux/keyboard_capturer.cpp | 4 +++-
 src/device_controller/keyboard/linux/keyboard_capturer.h   | 2 +-
 src/device_controller/keyboard/mac/keyboard_capturer.cpp   | 4 +++-
 src/device_controller/keyboard/mac/keyboard_capturer.h     | 2 +-
 src/single_window/recent_connections.cpp                   | 6 +++---
 xmake.lua                                                  | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/device_controller/keyboard/linux/keyboard_capturer.cpp b/src/device_controller/keyboard/linux/keyboard_capturer.cpp
index fbc75dd..a21b012 100644
--- a/src/device_controller/keyboard/linux/keyboard_capturer.cpp
+++ b/src/device_controller/keyboard/linux/keyboard_capturer.cpp
@@ -4,6 +4,8 @@ KeyboardCapturer::KeyboardCapturer() {}
 
 KeyboardCapturer::~KeyboardCapturer() {}
 
-int KeyboardCapturer::Hook() { return 0; }
+int KeyboardCapturer::Hook(OnKeyAction on_key_action, void *user_ptr) {
+  return 0;
+}
 
 int KeyboardCapturer::Unhook() { return 0; }
\ No newline at end of file
diff --git a/src/device_controller/keyboard/linux/keyboard_capturer.h b/src/device_controller/keyboard/linux/keyboard_capturer.h
index 3a45c84..b45d22e 100644
--- a/src/device_controller/keyboard/linux/keyboard_capturer.h
+++ b/src/device_controller/keyboard/linux/keyboard_capturer.h
@@ -15,7 +15,7 @@ class KeyboardCapturer : public DeviceController {
   virtual ~KeyboardCapturer();
 
  public:
-  virtual int Hook();
+  virtual int Hook(OnKeyAction on_key_action, void *user_ptr);
   virtual int Unhook();
 
  private:
diff --git a/src/device_controller/keyboard/mac/keyboard_capturer.cpp b/src/device_controller/keyboard/mac/keyboard_capturer.cpp
index fbc75dd..a21b012 100644
--- a/src/device_controller/keyboard/mac/keyboard_capturer.cpp
+++ b/src/device_controller/keyboard/mac/keyboard_capturer.cpp
@@ -4,6 +4,8 @@ KeyboardCapturer::KeyboardCapturer() {}
 
 KeyboardCapturer::~KeyboardCapturer() {}
 
-int KeyboardCapturer::Hook() { return 0; }
+int KeyboardCapturer::Hook(OnKeyAction on_key_action, void *user_ptr) {
+  return 0;
+}
 
 int KeyboardCapturer::Unhook() { return 0; }
\ No newline at end of file
diff --git a/src/device_controller/keyboard/mac/keyboard_capturer.h b/src/device_controller/keyboard/mac/keyboard_capturer.h
index 3a45c84..b45d22e 100644
--- a/src/device_controller/keyboard/mac/keyboard_capturer.h
+++ b/src/device_controller/keyboard/mac/keyboard_capturer.h
@@ -15,7 +15,7 @@ class KeyboardCapturer : public DeviceController {
   virtual ~KeyboardCapturer();
 
  public:
-  virtual int Hook();
+  virtual int Hook(OnKeyAction on_key_action, void *user_ptr);
   virtual int Unhook();
 
  private:
diff --git a/src/single_window/recent_connections.cpp b/src/single_window/recent_connections.cpp
index 25f1342..f72c650 100644
--- a/src/single_window/recent_connections.cpp
+++ b/src/single_window/recent_connections.cpp
@@ -123,14 +123,14 @@ int Render::ShowRecentConnections() {
       ImGui::SetCursorPos(
           ImVec2(dummy_button_pos.x + 2.0f, dummy_button_pos.y + 1.0f));
       ImGui::SetWindowFontScale(0.65f);
-      ImGui::Text(remote_id.c_str());
+      ImGui::Text("%s", remote_id.c_str());
       ImGui::SetWindowFontScale(1.0f);
       ImGui::PopStyleColor(3);
 
       if (ImGui::IsItemHovered()) {
         ImGui::BeginTooltip();
         ImGui::SetWindowFontScale(0.5f);
-        ImGui::Text(host_name.c_str());
+        ImGui::Text("%s", host_name.c_str());
         ImGui::SetWindowFontScale(1.0f);
         ImGui::EndTooltip();
       }
@@ -264,7 +264,7 @@ int Render::ConfirmDeleteConnection() {
   auto text_width = ImGui::CalcTextSize(text.c_str()).x;
   ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
   ImGui::SetCursorPosY(window_height * 0.2f);
-  ImGui::Text(text.c_str());
+  ImGui::Text("%s", text.c_str());
   ImGui::SetWindowFontScale(1.0f);
 
   ImGui::End();
diff --git a/xmake.lua b/xmake.lua
index 21a681e..81a4319 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -109,7 +109,7 @@ target("device_controller")
         "src/device_controller/keyboard/windows", {public = true})
     elseif is_os("macosx") then
         add_files("src/device_controller/mouse/mac/*.cpp",
-        "src/device_controller/mouse/keyboard/*.cpp")
+        "src/device_controller/keyboard/mac/*.cpp")
         add_includedirs("src/device_controller/mouse/mac",
         "src/device_controller/keyboard/mac", {public = true})
     elseif is_os("linux") then