frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: Add flags to RawDeviceEvent 

Add a flags member which will be copied wholesale into the resultant
xXIRawEvent.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2011-06-09 16:02:47 +01:00 committed by Peter Hutterer
parent 5d62c32981
commit 60a766a96f
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/eventconvert.c
View File

@ -667,6 +667,7 @@ eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
raw->detail = ev->detail.button; raw->detail = ev->detail.button;
raw->deviceid = ev->deviceid; raw->deviceid = ev->deviceid;
raw->valuators_len = vallen; raw->valuators_len = vallen;
raw->flags = ev->flags;
ptr = (char*)&raw[1]; ptr = (char*)&raw[1];
axisval = (FP3232*)(ptr + raw->valuators_len * 4); axisval = (FP3232*)(ptr + raw->valuators_len * 4);

1
include/eventstr.h
View File

@ -204,6 +204,7 @@ struct _RawDeviceEvent
int32_t data_raw[MAX_VALUATORS]; /**< Valuator data as posted */ int32_t data_raw[MAX_VALUATORS]; /**< Valuator data as posted */
int32_t data_raw_frac[MAX_VALUATORS];/**< Fractional part for data_raw */ int32_t data_raw_frac[MAX_VALUATORS];/**< Fractional part for data_raw */
} valuators; } valuators;
uint32_t flags; /**< Flags to be copied into the generated event */
}; };
#ifdef XQUARTZ #ifdef XQUARTZ

1
test/xi2/protocol-eventconvert.c
View File

@ -51,6 +51,7 @@ static void test_values_XIRawEvent(RawDeviceEvent *in, xXIRawEvent *out,
swapl(&out->time); swapl(&out->time);
swapl(&out->detail); swapl(&out->detail);
swaps(&out->valuators_len); swaps(&out->valuators_len);
swapl(&out->flags);
} }