Commit 37c7923a authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

server: Add RIM_TYPEHID type / hid member to rawinput union.

parent 6d167b91
...@@ -279,6 +279,14 @@ union rawinput ...@@ -279,6 +279,14 @@ union rawinput
int y; int y;
unsigned int data; unsigned int data;
} mouse; } mouse;
struct
{
int type;
unsigned int device;
unsigned int param;
unsigned short usage_page;
unsigned short usage;
} hid;
}; };
struct hardware_msg_data struct hardware_msg_data
...@@ -6236,7 +6244,7 @@ union generic_reply ...@@ -6236,7 +6244,7 @@ union generic_reply
/* ### protocol_version begin ### */ /* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 699 #define SERVER_PROTOCOL_VERSION 700
/* ### protocol_version end ### */ /* ### protocol_version end ### */
......
...@@ -295,6 +295,14 @@ union rawinput ...@@ -295,6 +295,14 @@ union rawinput
int y; /* y coordinate */ int y; /* y coordinate */
unsigned int data; /* mouse data */ unsigned int data; /* mouse data */
} mouse; } mouse;
struct
{
int type; /* RIM_TYPEHID */
unsigned int device; /* rawinput device index */
unsigned int param; /* rawinput message param */
unsigned short usage_page;/* HID usage page */
unsigned short usage; /* HID usage */
} hid;
}; };
struct hardware_msg_data struct hardware_msg_data
......
...@@ -407,6 +407,11 @@ static void dump_rawinput( const char *prefix, const union rawinput *rawinput ) ...@@ -407,6 +407,11 @@ static void dump_rawinput( const char *prefix, const union rawinput *rawinput )
fprintf( stderr, "%s{type=KEYBOARD,message=%04x,vkey=%04hx,scan=%04hx}", prefix, fprintf( stderr, "%s{type=KEYBOARD,message=%04x,vkey=%04hx,scan=%04hx}", prefix,
rawinput->kbd.message, rawinput->kbd.vkey, rawinput->kbd.scan ); rawinput->kbd.message, rawinput->kbd.vkey, rawinput->kbd.scan );
break; break;
case RIM_TYPEHID:
fprintf( stderr, "%s{type=HID,device=%04x,param=%04x,page=%04hx,usage=%04hx}",
prefix, rawinput->hid.device, rawinput->hid.param, rawinput->hid.usage_page,
rawinput->hid.usage );
break;
default: default:
fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type ); fprintf( stderr, "%s{type=%04x}", prefix, rawinput->type );
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment