Display and control your Android device
Use Xbox 360 gamepad name
Withoutruless7418fd06626a
diff --git a/app/src/hid/hid_event.h b/app/src/hid/hid_event.hindex 37c3611b..d6818e30 100644--- a/app/src/hid/hid_event.h+++ b/app/src/hid/hid_event.h@@ -15,7 +15,6 @@ struct sc_hid_input {struct sc_hid_open {uint16_t hid_id;- const char *name; // pointer to static memoryconst uint8_t *report_desc; // pointer to static memorysize_t report_desc_size;};diff --git a/app/src/hid/hid_gamepad.c b/app/src/hid/hid_gamepad.cindex 892d21f2..8f4e4527 100644--- a/app/src/hid/hid_gamepad.c+++ b/app/src/hid/hid_gamepad.c@@ -246,14 +246,8 @@ sc_hid_gamepad_generate_open(struct sc_hid_gamepad *hid,sc_hid_gamepad_slot_init(&hid->slots[slot_idx], gamepad_id);- SDL_GameController* game_controller =- SDL_GameControllerFromInstanceID(gamepad_id);- assert(game_controller);- const char *name = SDL_GameControllerName(game_controller);-uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);hid_open->hid_id = hid_id;- hid_open->name = name;hid_open->report_desc = SC_HID_GAMEPAD_REPORT_DESC;hid_open->report_desc_size = sizeof(SC_HID_GAMEPAD_REPORT_DESC);diff --git a/app/src/hid/hid_keyboard.c b/app/src/hid/hid_keyboard.cindex 2109224a..961ad790 100644--- a/app/src/hid/hid_keyboard.c+++ b/app/src/hid/hid_keyboard.c@@ -335,7 +335,6 @@ sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,void sc_hid_keyboard_generate_open(struct sc_hid_open *hid_open) {hid_open->hid_id = SC_HID_ID_KEYBOARD;- hid_open->name = NULL; // No name specified after "scrcpy"hid_open->report_desc = SC_HID_KEYBOARD_REPORT_DESC;hid_open->report_desc_size = sizeof(SC_HID_KEYBOARD_REPORT_DESC);}diff --git a/app/src/hid/hid_mouse.c b/app/src/hid/hid_mouse.cindex ac215165..7acc413b 100644--- a/app/src/hid/hid_mouse.c+++ b/app/src/hid/hid_mouse.c@@ -190,7 +190,6 @@ sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,void sc_hid_mouse_generate_open(struct sc_hid_open *hid_open) {hid_open->hid_id = SC_HID_ID_MOUSE;- hid_open->name = NULL; // No name specified after "scrcpy"hid_open->report_desc = SC_HID_MOUSE_REPORT_DESC;hid_open->report_desc_size = sizeof(SC_HID_MOUSE_REPORT_DESC);}diff --git a/app/src/uhid/gamepad_uhid.c b/app/src/uhid/gamepad_uhid.cindex 2a063af5..4da4a21e 100644--- a/app/src/uhid/gamepad_uhid.c+++ b/app/src/uhid/gamepad_uhid.c@@ -10,6 +10,7 @@// Xbox 360#define SC_GAMEPAD_UHID_VENDOR_ID UINT16_C(0x045e)#define SC_GAMEPAD_UHID_PRODUCT_ID UINT16_C(0x028e)+#define SC_GAMEPAD_UHID_NAME "Microsoft X-Box 360 Pad"static voidsc_gamepad_uhid_send_input(struct sc_gamepad_uhid *gamepad,@@ -36,7 +37,7 @@ sc_gamepad_uhid_send_open(struct sc_gamepad_uhid *gamepad,msg.uhid_create.id = hid_open->hid_id;msg.uhid_create.vendor_id = SC_GAMEPAD_UHID_VENDOR_ID;msg.uhid_create.product_id = SC_GAMEPAD_UHID_PRODUCT_ID;- msg.uhid_create.name = hid_open->name;+ msg.uhid_create.name = SC_GAMEPAD_UHID_NAME;msg.uhid_create.report_desc = hid_open->report_desc;msg.uhid_create.report_desc_size = hid_open->report_desc_size;diff --git a/app/src/uhid/keyboard_uhid.c b/app/src/uhid/keyboard_uhid.cindex 4d2c978d..76d70cc5 100644--- a/app/src/uhid/keyboard_uhid.c+++ b/app/src/uhid/keyboard_uhid.c@@ -143,7 +143,7 @@ sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,msg.uhid_create.id = SC_HID_ID_KEYBOARD;msg.uhid_create.vendor_id = 0;msg.uhid_create.product_id = 0;- msg.uhid_create.name = hid_open.name;+ msg.uhid_create.name = NULL;msg.uhid_create.report_desc = hid_open.report_desc;msg.uhid_create.report_desc_size = hid_open.report_desc_size;if (!sc_controller_push_msg(controller, &msg)) {diff --git a/app/src/uhid/mouse_uhid.c b/app/src/uhid/mouse_uhid.cindex d6044bdc..471030e7 100644--- a/app/src/uhid/mouse_uhid.c+++ b/app/src/uhid/mouse_uhid.c@@ -83,7 +83,7 @@ sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,msg.uhid_create.id = SC_HID_ID_MOUSE;msg.uhid_create.vendor_id = 0;msg.uhid_create.product_id = 0;- msg.uhid_create.name = hid_open.name;+ msg.uhid_create.name = NULL;msg.uhid_create.report_desc = hid_open.report_desc;msg.uhid_create.report_desc_size = hid_open.report_desc_size;if (!sc_controller_push_msg(controller, &msg)) {diff --git a/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.javaindex 1d7678ec..c4867a3f 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java@@ -174,7 +174,7 @@ public final class UhidManager {ByteBuffer buf = ByteBuffer.allocate(280 + reportDesc.length).order(ByteOrder.nativeOrder());buf.putInt(UHID_CREATE2);- String actualName = name.isEmpty() ? "scrcpy" : "scrcpy: " + name;+ String actualName = name.isEmpty() ? "scrcpy" : name;byte[] utf8Name = actualName.getBytes(StandardCharsets.UTF_8);int len = StringUtils.getUtf8TruncationIndex(utf8Name, 127);assert len <= 127;