Display and control your Android device
Extend value range for SDK mouse scrolling
Romain Vimont7c8bdccbdc24
diff --git a/app/src/control_msg.c b/app/src/control_msg.cindex e78f0c57..e46c6165 100644--- a/app/src/control_msg.c+++ b/app/src/control_msg.c@@ -127,10 +127,14 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {return 32;case SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:write_position(&buf[1], &msg->inject_scroll_event.position);- int16_t hscroll =- sc_float_to_i16fp(msg->inject_scroll_event.hscroll);- int16_t vscroll =- sc_float_to_i16fp(msg->inject_scroll_event.vscroll);+ // Accept values in the range [-16, 16].+ // Normalize to [-1, 1] in order to use sc_float_to_i16fp().+ float hscroll_norm = msg->inject_scroll_event.hscroll / 16;+ hscroll_norm = CLAMP(hscroll_norm, -1, 1);+ float vscroll_norm = msg->inject_scroll_event.vscroll / 16;+ vscroll_norm = CLAMP(vscroll_norm, -1, 1);+ int16_t hscroll = sc_float_to_i16fp(hscroll_norm);+ int16_t vscroll = sc_float_to_i16fp(vscroll_norm);sc_write16be(&buf[13], (uint16_t) hscroll);sc_write16be(&buf[15], (uint16_t) vscroll);sc_write32be(&buf[17], msg->inject_scroll_event.buttons);diff --git a/app/src/mouse_sdk.c b/app/src/mouse_sdk.cindex 1b05d02b..7eceffa7 100644--- a/app/src/mouse_sdk.c+++ b/app/src/mouse_sdk.c@@ -113,8 +113,8 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,.type = SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,.inject_scroll_event = {.position = event->position,- .hscroll = CLAMP(event->hscroll, -1, 1),- .vscroll = CLAMP(event->vscroll, -1, 1),+ .hscroll = event->hscroll,+ .vscroll = event->vscroll,.buttons = convert_mouse_buttons(event->buttons_state),},};diff --git a/app/tests/test_control_msg_serialize.c b/app/tests/test_control_msg_serialize.cindex af97182d..0d19919e 100644--- a/app/tests/test_control_msg_serialize.c+++ b/app/tests/test_control_msg_serialize.c@@ -127,8 +127,8 @@ static void test_serialize_inject_scroll_event(void) {.height = 1920,},},- .hscroll = 1,- .vscroll = -1,+ .hscroll = 16,+ .vscroll = -16,.buttons = 1,},};@@ -141,8 +141,8 @@ static void test_serialize_inject_scroll_event(void) {SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 10260x04, 0x38, 0x07, 0x80, // 1080 1920- 0x7F, 0xFF, // 1 (float encoded as i16)- 0x80, 0x00, // -1 (float encoded as i16)+ 0x7F, 0xFF, // 16 (float encoded as i16 in the range [-16, 16])+ 0x80, 0x00, // -16 (float encoded as i16 in the range [-16, 16])0x00, 0x00, 0x00, 0x01, // 1};assert(!memcmp(buf, expected, sizeof(expected)));diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.javaindex e503ec61..830a7ec7 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java@@ -112,8 +112,9 @@ public class ControlMessageReader {private ControlMessage parseInjectScrollEvent() throws IOException {Position position = parsePosition();- float hScroll = Binary.i16FixedPointToFloat(dis.readShort());- float vScroll = Binary.i16FixedPointToFloat(dis.readShort());+ // Binary.i16FixedPointToFloat() decodes values assuming the full range is [-1, 1], but the actual range is [-16, 16].+ float hScroll = Binary.i16FixedPointToFloat(dis.readShort()) * 16;+ float vScroll = Binary.i16FixedPointToFloat(dis.readShort()) * 16;int buttons = dis.readInt();return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll, buttons);}diff --git a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.javaindex 74df064f..0cc0a6b5 100644--- a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java@@ -125,7 +125,7 @@ public class ControlMessageReaderTest {dos.writeShort(1080);dos.writeShort(1920);dos.writeShort(0); // 0.0f encoded as i16- dos.writeShort(0x8000); // -1.0f encoded as i16+ dos.writeShort(0x8000); // -16.0f encoded as i16 (the range is [-16, 16])dos.writeInt(1);byte[] packet = bos.toByteArray();@@ -139,7 +139,7 @@ public class ControlMessageReaderTest {Assert.assertEquals(1080, event.getPosition().getScreenSize().getWidth());Assert.assertEquals(1920, event.getPosition().getScreenSize().getHeight());Assert.assertEquals(0f, event.getHScroll(), 0f);- Assert.assertEquals(-1f, event.getVScroll(), 0f);+ Assert.assertEquals(-16f, event.getVScroll(), 0f);Assert.assertEquals(1, event.getButtons());Assert.assertEquals(-1, bis.read()); // EOS