Return InputTargets instead of TouchedWindows
Before this CL, TouchedWindows were getting returned from
findTouchedWindowTargetsLocked, just to be converted immediately to
InputTargets.
However, TouchedWindows are actually an implementation detail of
TouchState, and should not leak out from there.
In this CL, the first step is taken to fix this abstraction by returning
InputTargets where TouchedWindows are getting returned.
This will allow:
1. Removal of goto from dispatcher
2. Diff-based approach for generating InputTargets from old and new
touch state
These updates will be attempted in follow-up CLs.
Bug: 211379801
Test: m inputflinger_tests && adb sync data && adb shell -t /data/nativetest64/inputflinger_tests/inputflinger_tests
Change-Id: I8b93719994ed383ad0f9bb848d84805470d95db9
diff --git a/services/inputflinger/dispatcher/TouchState.cpp b/services/inputflinger/dispatcher/TouchState.cpp
index f120fc9..ad37d02 100644
--- a/services/inputflinger/dispatcher/TouchState.cpp
+++ b/services/inputflinger/dispatcher/TouchState.cpp
@@ -37,6 +37,16 @@
}
}
+void TouchState::removeTouchedPointerFromWindow(
+ int32_t pointerId, const sp<android::gui::WindowInfoHandle>& windowHandle) {
+ for (TouchedWindow& touchedWindow : windows) {
+ if (touchedWindow.windowHandle == windowHandle) {
+ touchedWindow.pointerIds.clearBit(pointerId);
+ return;
+ }
+ }
+}
+
void TouchState::clearHoveringPointers() {
for (TouchedWindow& touchedWindow : windows) {
touchedWindow.clearHoveringPointers();
@@ -70,7 +80,6 @@
return;
}
}
-
TouchedWindow touchedWindow;
touchedWindow.windowHandle = windowHandle;
touchedWindow.targetFlags = targetFlags;
@@ -175,6 +184,13 @@
return nullptr;
}
+const TouchedWindow& TouchState::getTouchedWindow(const sp<WindowInfoHandle>& windowHandle) const {
+ auto it = std::find_if(windows.begin(), windows.end(),
+ [&](const TouchedWindow& w) { return w.windowHandle == windowHandle; });
+ LOG_ALWAYS_FATAL_IF(it == windows.end(), "Could not find %s", windowHandle->getName().c_str());
+ return *it;
+}
+
bool TouchState::isDown() const {
return std::any_of(windows.begin(), windows.end(),
[](const TouchedWindow& window) { return !window.pointerIds.isEmpty(); });