Merge "Make sure that touches are within the physical frame." into pi-dev (22f1e9cf) · Commits · e / os / android_frameworks_native-old

services/inputflinger/InputReader.cpp

+26 −7

Original line number	Diff line number	Diff line
		@@ -3089,6 +3089,7 @@ TouchInputMapper::TouchInputMapper(InputDevice* device) :
		InputMapper(device),
		mSource(0), mDeviceMode(DEVICE_MODE_DISABLED),
		mSurfaceWidth(-1), mSurfaceHeight(-1), mSurfaceLeft(0), mSurfaceTop(0),
		mPhysicalWidth(-1), mPhysicalHeight(-1), mPhysicalLeft(0), mPhysicalTop(0),
		mSurfaceOrientation(DISPLAY_ORIENTATION_0) {
		}

		@@ -3596,6 +3597,11 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
		break;
		}

		mPhysicalWidth = naturalPhysicalWidth;
		mPhysicalHeight = naturalPhysicalHeight;
		mPhysicalLeft = naturalPhysicalLeft;
		mPhysicalTop = naturalPhysicalTop;

		mSurfaceWidth = naturalLogicalWidth * naturalDeviceWidth / naturalPhysicalWidth;
		mSurfaceHeight = naturalLogicalHeight * naturalDeviceHeight / naturalPhysicalHeight;
		mSurfaceLeft = naturalPhysicalLeft * naturalLogicalWidth / naturalPhysicalWidth;
		@@ -3604,6 +3610,11 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
		mSurfaceOrientation = mParameters.orientationAware ?
		mViewport.orientation : DISPLAY_ORIENTATION_0;
		} else {
		mPhysicalWidth = rawWidth;
		mPhysicalHeight = rawHeight;
		mPhysicalLeft = 0;
		mPhysicalTop = 0;

		mSurfaceWidth = rawWidth;
		mSurfaceHeight = rawHeight;
		mSurfaceLeft = 0;
		@@ -3914,6 +3925,10 @@ void TouchInputMapper::dumpSurface(std::string& dump) {
		dump += StringPrintf(INDENT3 "SurfaceHeight: %dpx\n", mSurfaceHeight);
		dump += StringPrintf(INDENT3 "SurfaceLeft: %d\n", mSurfaceLeft);
		dump += StringPrintf(INDENT3 "SurfaceTop: %d\n", mSurfaceTop);
		dump += StringPrintf(INDENT3 "PhysicalWidth: %dpx\n", mPhysicalWidth);
		dump += StringPrintf(INDENT3 "PhysicalHeight: %dpx\n", mPhysicalHeight);
		dump += StringPrintf(INDENT3 "PhysicalLeft: %d\n", mPhysicalLeft);
		dump += StringPrintf(INDENT3 "PhysicalTop: %d\n", mPhysicalTop);
		dump += StringPrintf(INDENT3 "SurfaceOrientation: %d\n", mSurfaceOrientation);
		}

		@@ -5118,10 +5133,10 @@ void TouchInputMapper::cookPointerData() {
		}
		break;
		case DISPLAY_ORIENTATION_180:
		x = float(mRawPointerAxes.x.maxValue - xTransformed) * mXScale + mXTranslate;
		x = float(mRawPointerAxes.x.maxValue - xTransformed) * mXScale;
		y = float(mRawPointerAxes.y.maxValue - yTransformed) * mYScale + mYTranslate;
		left = float(mRawPointerAxes.x.maxValue - rawRight) * mXScale + mXTranslate;
		right = float(mRawPointerAxes.x.maxValue - rawLeft) * mXScale + mXTranslate;
		left = float(mRawPointerAxes.x.maxValue - rawRight) * mXScale;
		right = float(mRawPointerAxes.x.maxValue - rawLeft) * mXScale;
		bottom = float(mRawPointerAxes.y.maxValue - rawTop) * mYScale + mYTranslate;
		top = float(mRawPointerAxes.y.maxValue - rawBottom) * mYScale + mYTranslate;
		orientation -= M_PI;
		@@ -5130,10 +5145,10 @@ void TouchInputMapper::cookPointerData() {
		}
		break;
		case DISPLAY_ORIENTATION_270:
		x = float(mRawPointerAxes.y.maxValue - yTransformed) * mYScale + mYTranslate;
		x = float(mRawPointerAxes.y.maxValue - yTransformed) * mYScale;
		y = float(xTransformed - mRawPointerAxes.x.minValue) * mXScale + mXTranslate;
		left = float(mRawPointerAxes.y.maxValue - rawBottom) * mYScale + mYTranslate;
		right = float(mRawPointerAxes.y.maxValue - rawTop) * mYScale + mYTranslate;
		left = float(mRawPointerAxes.y.maxValue - rawBottom) * mYScale;
		right = float(mRawPointerAxes.y.maxValue - rawTop) * mYScale;
		bottom = float(rawRight - mRawPointerAxes.x.minValue) * mXScale + mXTranslate;
		top = float(rawLeft - mRawPointerAxes.x.minValue) * mXScale + mXTranslate;
		orientation += M_PI_2;
		@@ -6531,8 +6546,12 @@ void TouchInputMapper::cancelTouch(nsecs_t when) {
		}

		bool TouchInputMapper::isPointInsideSurface(int32_t x, int32_t y) {
		const float scaledX = x * mXScale;
		const float scaledY = x * mYScale;
		return x >= mRawPointerAxes.x.minValue && x <= mRawPointerAxes.x.maxValue
		&& y >= mRawPointerAxes.y.minValue && y <= mRawPointerAxes.y.maxValue;
		&& scaledX >= mPhysicalLeft && scaledX <= mPhysicalLeft + mPhysicalWidth
		&& y >= mRawPointerAxes.y.minValue && y <= mRawPointerAxes.y.maxValue
		&& scaledY >= mPhysicalTop && scaledY <= mPhysicalTop + mPhysicalHeight;
		}

		const TouchInputMapper::VirtualKey* TouchInputMapper::findVirtualKeyHit(

services/inputflinger/InputReader.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -1517,13 +1517,21 @@ private:
		// in the natural orientation.
		// The surface origin specifies how the surface coordinates should be translated
		// to align with the logical display coordinate space.
		// The orientation may be different from the viewport orientation as it specifies
		// the rotation of the surface coordinates required to produce the viewport's
		// requested orientation, so it will depend on whether the device is orientation aware.
		int32_t mSurfaceWidth;
		int32_t mSurfaceHeight;
		int32_t mSurfaceLeft;
		int32_t mSurfaceTop;

		// Similar to the surface coordinates, but in the raw display coordinate space rather than in
		// the logical coordinate space.
		int32_t mPhysicalWidth;
		int32_t mPhysicalHeight;
		int32_t mPhysicalLeft;
		int32_t mPhysicalTop;

		// The orientation may be different from the viewport orientation as it specifies
		// the rotation of the surface coordinates required to produce the viewport's
		// requested orientation, so it will depend on whether the device is orientation aware.
		int32_t mSurfaceOrientation;

		// Translation and scaling factors, orientation-independent.