mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-01 22:03:09 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Conflicts: dix/getevents.c hw/xfree86/common/xf86Xinput.h Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
commit
88cb61e1e5
122 changed files with 845 additions and 2522 deletions
|
|
@ -99,7 +99,7 @@ struct _DeviceEvent
|
|||
struct {
|
||||
uint8_t mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */
|
||||
uint8_t mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/
|
||||
uint32_t data[MAX_VALUATORS]; /**< Valuator data */
|
||||
int32_t data[MAX_VALUATORS]; /**< Valuator data */
|
||||
int32_t data_frac[MAX_VALUATORS]; /**< Fractional part for data */
|
||||
} valuators;
|
||||
struct {
|
||||
|
|
|
|||
Loading…
Reference in a new issue