diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/input/Input.h | 14 | ||||
| -rw-r--r-- | include/input/InputTransport.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index 15c86ebd85..7c4379eda1 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -302,12 +302,18 @@ public: inline void setSource(int32_t source) { mSource = source; } + inline int32_t getDisplayId() const { return mDisplayId; } + + inline void setDisplayId(int32_t displayId) { mDisplayId = displayId; } + + protected: - void initialize(int32_t deviceId, int32_t source); + void initialize(int32_t deviceId, int32_t source, int32_t displayId); void initialize(const InputEvent& from); int32_t mDeviceId; int32_t mSource; + int32_t mDisplayId; }; /* @@ -343,6 +349,7 @@ public: void initialize( int32_t deviceId, int32_t source, + int32_t displayId, int32_t action, int32_t flags, int32_t keyCode, @@ -373,10 +380,6 @@ public: virtual int32_t getType() const { return AINPUT_EVENT_TYPE_MOTION; } - inline int32_t getDisplayId() const { return mDisplayId; } - - inline void setDisplayId(int32_t displayId) { mDisplayId = displayId; } - inline int32_t getAction() const { return mAction; } inline int32_t getActionMasked() const { return mAction & AMOTION_EVENT_ACTION_MASK; } @@ -614,7 +617,6 @@ public: static int32_t getAxisFromLabel(const char* label); protected: - int32_t mDisplayId; int32_t mAction; int32_t mActionButton; int32_t mFlags; diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h index ee5266108b..e8d1345096 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -64,6 +64,7 @@ struct InputMessage { nsecs_t eventTime __attribute__((aligned(8))); int32_t deviceId; int32_t source; + int32_t displayId; int32_t action; int32_t flags; int32_t keyCode; @@ -211,6 +212,7 @@ public: uint32_t seq, int32_t deviceId, int32_t source, + int32_t displayId, int32_t action, int32_t flags, int32_t keyCode, |