test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-08 23:28:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix inputdevice's absinfo for x64

Browse Source
This commit is contained in:
houzh 2023-12-01 21:36:15 +08:00
parent a37477cf16
commit 983ff58e5a
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/core/inputdevice.cc
View File

@ -263,13 +263,13 @@ TouchDevice::TouchDevice(int fd):InputDevice(fd){
if(rangeX==nullptr) rangeX = mDeviceInfo.getMotionRange(ABS_MT_POSITION_X,0);
mTPWidth = ISRANGEVALID(rangeX)? (rangeX->max-rangeX->min) : mScreenWidth;
mMinX = ISRANGEVALID(rangeX) ? rangeX->min : 0;
mMaxX = ISRANGEVALID(rangeX) ? rangeX->max : 0;
mMaxX = ISRANGEVALID(rangeX) ? rangeX->max : mScreenWidth;
const InputDeviceInfo::MotionRange*rangeY = mDeviceInfo.getMotionRange(ABS_Y,0);
if(rangeY==nullptr) rangeY = mDeviceInfo.getMotionRange(ABS_MT_POSITION_Y,0);
mTPHeight = ISRANGEVALID(rangeY) ? (rangeY->max-rangeY->min) : mScreenHeight;
mMinY = ISRANGEVALID(rangeY) ? rangeY->min : 0;
mMaxY = ISRANGEVALID(rangeY) ? rangeY->max : 0;
mMaxY = ISRANGEVALID(rangeY) ? rangeY->max : mScreenHeight;
const std::string section = getName();
mInvertX = mInvertY = mSwitchXY = false;
@ -286,24 +286,6 @@ TouchDevice::TouchDevice(int fd):InputDevice(fd){
mTPHeight= (mMaxY!=mMinY)?std::abs(mMaxY - mMinY):mScreenHeight;
LOGI("screen(%d,%d) rotation=%d [%s] X(%d,%d) Y(%d,%d) invert=%d,%d switchXY=%d",mScreenWidth, mScreenHeight,
display.getRotation(),section.c_str(),mMinX,mMaxX,mMinY,mMaxY,mInvertX,mInvertY,mSwitchXY);
mMatrix = Cairo::identity_matrix();
//display rotation is defined as anticlockwise,but cairo use clockwise
switch(display.getRotation()){
case Display::ROTATION_0:/*do nothing*/break;
case Display::ROTATION_270:
mMatrix.rotate(-M_PI/2.f);
mMatrix.translate(-int(mScreenWidth),0);
break;
case Display::ROTATION_180:mMatrix.translate(mScreenWidth,mScreenHeight);
mMatrix.scale(-1,-1);
break;
case Display::ROTATION_90 :
mMatrix.translate(mScreenHeight,0);
mMatrix.rotate(M_PI/2.f);
break;
default:/**do nothing*/break;
}
}
static int ABS2AXIS(int absaxis){

1
src/gui/core/inputdevice.h
View File

@ -235,7 +235,6 @@ protected:
bool mSwitchXY;
bool mInvertX;
bool mInvertY;
Cairo::Matrix mMatrix;
std::map<int, TouchPoint>mPointMAP;
void setAxisValue(int index,int axis,int value,bool isRelative);
int isValidEvent(int type,int code,int value)override;