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

fix single pointer touch

Browse Source
This commit is contained in:
侯歌 2024-04-22 22:09:45 +08:00
parent 079e7149e9
commit ec9a8f64c1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,6 +361,7 @@ void TouchDevice::setAxisValue(int raw_axis,int value,bool isRelative){
}else if(mScreenWidth != mTPWidth){
value = (value * mScreenWidth)/mTPWidth;
}
mSlotID=0;mTrackID=0;
break;
case MotionEvent::AXIS_Y:
switch(rotation){
@ -377,6 +378,7 @@ void TouchDevice::setAxisValue(int raw_axis,int value,bool isRelative){
}else{
value = (value * mScreenHeight)/mTPHeight;
}
mSlotID=0;mTrackID=0;
break;
case MotionEvent::AXIS_Z:break;
default:if(raw_axis==ABS_MT_TRACKING_ID){
@ -416,10 +418,9 @@ int TouchDevice::isValidEvent(int type,int code,int value){
}
static int getActionByBits(BitSet32&last,BitSet32&cur,int& pointIndex){
uint32_t diffbits = last.value^cur.value;
pointIndex = BitSet32::firstMarkedBit(diffbits);
const uint32_t diffbits = last.value^cur.value;
pointIndex = BitSet32::firstMarkedBit(diffbits?diffbits:cur.value);
if(last.count()==cur.count()){
pointIndex= BitSet32::firstMarkedBit(cur.value);
return MotionEvent::ACTION_MOVE;
}else if(last.count()<cur.count()){
return cur.count()>1?MotionEvent::ACTION_POINTER_DOWN:MotionEvent::ACTION_DOWN;
@ -441,7 +442,8 @@ int TouchDevice::putRawEvent(const struct timeval&tv,int type,int code,int value
case BTN_TOUCH :
case BTN_STYLUS:
mEvent.setActionButton(MotionEvent::BUTTON_PRIMARY);
mEvent.setAction(value ? MotionEvent::ACTION_DOWN : MotionEvent::ACTION_UP);
//mEvent.setAction(value ? MotionEvent::ACTION_DOWN : MotionEvent::ACTION_UP);
if(value)mCurrBits.markBit(0);else mCurrBits.clearBit(0);
if(value){
mMoveTime = mDownTime = tv.tv_sec * 1000 + tv.tv_usec/1000;
mEvent.setButtonState(MotionEvent::BUTTON_PRIMARY);
@ -462,7 +464,7 @@ int TouchDevice::putRawEvent(const struct timeval&tv,int type,int code,int value
}break;
case EV_ABS:
switch(code){
case ABS_X ... ABS_Z :
case ABS_X ... ABS_Z :
mMoveTime = tv.tv_sec * 1000LL + tv.tv_usec/1000;
setAxisValue(code,value,false) ; break;
//case ABS_PRESSURE : setAxisValue(0,code,value,false) ; break;