diff --git a/dix/input_priv.h b/dix/input_priv.h index 2025bfab6..478b2d6ef 100644 --- a/dix/input_priv.h +++ b/dix/input_priv.h @@ -55,6 +55,15 @@ SOFTWARE. #include "include/input.h" #include "include/inputstr.h" +typedef struct _DDXTouchPointInfo { + uint32_t client_id; /* touch ID as seen in client events */ + Bool active; /* whether or not the touch is active */ + uint32_t ddx_id; /* touch ID given by the DDX */ + Bool emulate_pointer; + + ValuatorMask *valuators; /* last axis values as posted, pre-transform */ +} DDXTouchPointInfoRec; + void InitCoreDevices(void); void InitXTestDevices(void); diff --git a/include/inputstr.h b/include/inputstr.h index 4508ffb96..c3bbfbe08 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -326,15 +326,6 @@ typedef struct _TouchPointInfo { size_t history_size; /* Size of history in elements */ } TouchPointInfoRec; -typedef struct _DDXTouchPointInfo { - uint32_t client_id; /* touch ID as seen in client events */ - Bool active; /* whether or not the touch is active */ - uint32_t ddx_id; /* touch ID given by the DDX */ - Bool emulate_pointer; - - ValuatorMask *valuators; /* last axis values as posted, pre-transform */ -} DDXTouchPointInfoRec; - typedef struct _TouchClassRec { int sourceid; TouchPointInfoPtr touches;