moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2026-06-24 05:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Several fixes for touch and pen APIs

Browse Source
This commit is contained in:
Cameron Gutman
2023-06-24 21:25:48 -05:00
parent 5cbb6f210d
commit de0efa861a
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Input.h
+2 -2
View File
@@ -145,8 +145,8 @@ typedef struct _SS_PEN_PACKET {
netfloat y; netfloat y;
netfloat pressure; netfloat pressure;
uint16_t rotation; uint16_t rotation;
int8_t tiltX; int8_t tilt;
int8_t tiltY; uint8_t zero2[1];
} SS_PEN_PACKET, *PSS_PEN_PACKET; } SS_PEN_PACKET, *PSS_PEN_PACKET;
#define SS_CONTROLLER_ARRIVAL_MAGIC 0x55000004 #define SS_CONTROLLER_ARRIVAL_MAGIC 0x55000004
src/InputStream.c
+3 -3
View File
@@ -1194,7 +1194,7 @@ int LiSendTouchEvent(uint8_t eventType, uint32_t pointerId, float x, float y, fl
int LiSendPenEvent(uint8_t eventType, uint8_t toolType, uint8_t penButtons, int LiSendPenEvent(uint8_t eventType, uint8_t toolType, uint8_t penButtons,
float x, float y, float pressure, float x, float y, float pressure,
uint16_t rotation, int8_t tiltX, int8_t tiltY) { uint16_t rotation, int8_t tilt) {
PPACKET_HOLDER holder; PPACKET_HOLDER holder;
int err; int err;
@@ -1222,8 +1222,8 @@ int LiSendPenEvent(uint8_t eventType, uint8_t toolType, uint8_t penButtons,
floatToNetfloat(y, holder->packet.touch.y); floatToNetfloat(y, holder->packet.touch.y);
floatToNetfloat(pressure, holder->packet.touch.pressure); floatToNetfloat(pressure, holder->packet.touch.pressure);
holder->packet.pen.rotation = LE16(rotation); holder->packet.pen.rotation = LE16(rotation);
holder->packet.pen.tiltX = tiltX; holder->packet.pen.tilt = tilt;
holder->packet.pen.tiltY = tiltY; memset(holder->packet.pen.zero2, 0, sizeof(holder->packet.pen.zero2));
err = LbqOfferQueueItem(&packetQueue, holder, &holder->entry); err = LbqOfferQueueItem(&packetQueue, holder, &holder->entry);
if (err != LBQ_SUCCESS) { if (err != LBQ_SUCCESS) {
src/Limelight.h
+10 -8
View File
@@ -580,26 +580,28 @@ int LiSendMouseMoveAsMousePositionEvent(short deltaX, short deltaY, short refere
// //
// If unsupported by the host, this will return LI_ERR_UNSUPPORTED and the caller should consider // If unsupported by the host, this will return LI_ERR_UNSUPPORTED and the caller should consider
// falling back to other functions to send this input (such as LiSendMousePositionEvent()). // falling back to other functions to send this input (such as LiSendMousePositionEvent()).
#define LI_TOUCH_EVENT_HOVER 0x00 #define LI_TOUCH_EVENT_HOVER 0x00
#define LI_TOUCH_EVENT_DOWN 0x01 #define LI_TOUCH_EVENT_DOWN 0x01
#define LI_TOUCH_EVENT_UP 0x02 #define LI_TOUCH_EVENT_UP 0x02
#define LI_TOUCH_EVENT_MOVE 0x03 #define LI_TOUCH_EVENT_MOVE 0x03
#define LI_TOUCH_EVENT_CANCEL 0x04 #define LI_TOUCH_EVENT_CANCEL 0x04
#define LI_TOUCH_EVENT_BUTTON_ONLY 0x05
int LiSendTouchEvent(uint8_t eventType, uint32_t pointerId, float x, float y, float pressure); int LiSendTouchEvent(uint8_t eventType, uint32_t pointerId, float x, float y, float pressure);
// This function is similar to LiSendTouchEvent() but allows additional parameters relevant for pen // This function is similar to LiSendTouchEvent() but allows additional parameters relevant for pen
// input, including rotation, tilt, and buttons. Rotation is in degrees from vertical in Y dimension // input, including rotation, tilt, and buttons. Rotation is in degrees from vertical in Y dimension
// (parallel to screen) and tilt is in degrees from vertical in Z dimension (perpendicular to screen). // (parallel to screen, 0..359) and tilt is in degrees from vertical in Z dimension (perpendicular
// to screen, -90..90).
#define LI_TOOL_TYPE_PEN 0x01 #define LI_TOOL_TYPE_PEN 0x01
#define LI_TOOL_TYPE_ERASER 0x02 #define LI_TOOL_TYPE_ERASER 0x02
#define LI_PEN_BUTTON_PRIMARY 0x01 #define LI_PEN_BUTTON_PRIMARY 0x01
#define LI_PEN_BUTTON_SECONDARY 0x02 #define LI_PEN_BUTTON_SECONDARY 0x02
#define LI_PEN_BUTTON_TERTIARY 0x04 #define LI_PEN_BUTTON_TERTIARY 0x04
#define LI_ROT_UNKNOWN 0xFFFF
#define LI_TILT_UNKNOWN 0xFF #define LI_TILT_UNKNOWN 0xFF
#define LI_ROT_UNKNOWN 0xFF
int LiSendPenEvent(uint8_t eventType, uint8_t toolType, uint8_t penButtons, int LiSendPenEvent(uint8_t eventType, uint8_t toolType, uint8_t penButtons,
float x, float y, float pressure, float x, float y, float pressure,
uint16_t rotation, int8_t tiltX, int8_t tiltY); uint16_t rotation, int8_t tilt);
// This function queues a mouse button event to be sent to the remote server. // This function queues a mouse button event to be sent to the remote server.
#define BUTTON_ACTION_PRESS 0x07 #define BUTTON_ACTION_PRESS 0x07