Browse Source

inputsystem: fix UB in touch events callback, make touch more responsive

bullshit
nillerusr 1 year ago
parent
commit
4f10928299
  1. 2
      engine/sys_mainwind.cpp
  2. 20
      game/client/cdll_client_int.cpp
  3. 10
      inputsystem/inputsystem.cpp
  4. 7
      inputsystem/inputsystem.h
  5. 42
      inputsystem/touch_sdl.cpp
  6. 2
      public/cdll_int.h
  7. 1
      public/inputsystem/iinputsystem.h
  8. 23
      vguimatsurface/Input.cpp

2
engine/sys_mainwind.cpp

@ -355,7 +355,7 @@ void CGame::HandleMsg_Close( const InputEvent_t &event )
void CGame::DispatchInputEvent( const InputEvent_t &event ) void CGame::DispatchInputEvent( const InputEvent_t &event )
{ {
switch( event.m_nType & 0xFFFF ) switch( event.m_nType )
{ {
// Handle button events specially, // Handle button events specially,
// since we have all manner of crazy filtering going on when dealing with them // since we have all manner of crazy filtering going on when dealing with them

20
game/client/cdll_client_int.cpp

@ -729,7 +729,7 @@ public:
void PrecacheMaterial( const char *pMaterialName ); void PrecacheMaterial( const char *pMaterialName );
virtual bool IsConnectedUserInfoChangeAllowed( IConVar *pCvar ); virtual bool IsConnectedUserInfoChangeAllowed( IConVar *pCvar );
virtual void IN_TouchEvent( uint data, uint data2, uint data3, uint data4 ); virtual void IN_TouchEvent( int type, int fingerId, int x, int y );
private: private:
void UncacheAllMaterials( ); void UncacheAllMaterials( );
@ -2637,24 +2637,20 @@ CSteamID GetSteamIDForPlayerIndex( int iPlayerIndex )
#endif #endif
void CHLClient::IN_TouchEvent( uint data, uint data2, uint data3, uint data4 ) void CHLClient::IN_TouchEvent( int type, int fingerId, int x, int y )
{ {
if( enginevgui->IsGameUIVisible() ) if( enginevgui->IsGameUIVisible() )
return; return;
touch_event_t ev; touch_event_t ev;
ev.type = data & 0xFFFF; ev.type = type;
ev.fingerid = (data >> 16) & 0xFFFF; ev.fingerid = fingerId;
ev.x = (double)((data2 >> 16) & 0xFFFF) / 0xFFFF; memcpy( &ev.x, &x, sizeof(ev.x) );
ev.y = (double)(data2 & 0xFFFF) / 0xFFFF; memcpy( &ev.y, &y, sizeof(ev.y) );
union{uint i;float f;} ifconv; if( type == IE_FingerMotion )
ifconv.i = data3; inputsystem->GetTouchAccumulators( fingerId, ev.dx, ev.dy );
ev.dx = ifconv.f;
ifconv.i = data4;
ev.dy = ifconv.f;
gTouch.ProcessEvent( &ev ); gTouch.ProcessEvent( &ev );
} }

10
inputsystem/inputsystem.cpp

@ -1530,16 +1530,6 @@ bool CInputSystem::GetRawMouseAccumulators( int& accumX, int& accumY )
#endif #endif
} }
bool CInputSystem::GetTouchAccumulators( InputEventType_t &event, int &fingerId, int& accumX, int& accumY )
{
event = m_touchAccumEvent;
fingerId = m_touchAccumFingerId;
accumX = m_touchAccumX;
accumY = m_touchAccumY;
return m_bJoystickInitialized;
}
void CInputSystem::SetConsoleTextMode( bool bConsoleTextMode ) void CInputSystem::SetConsoleTextMode( bool bConsoleTextMode )
{ {
/* If someone calls this after init, shut it down. */ /* If someone calls this after init, shut it down. */

7
inputsystem/inputsystem.h

@ -44,6 +44,8 @@
#include "steam/steam_api.h" #include "steam/steam_api.h"
#define TOUCH_FINGER_MAX_COUNT 10
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Implementation of the input system // Implementation of the input system
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -101,7 +103,7 @@ public:
virtual void *GetHapticsInterfaceAddress() const { return NULL;} virtual void *GetHapticsInterfaceAddress() const { return NULL;}
#endif #endif
bool GetRawMouseAccumulators( int& accumX, int& accumY ); bool GetRawMouseAccumulators( int& accumX, int& accumY );
bool GetTouchAccumulators( InputEventType_t &event, int &fingerId, int& accumX, int& accumY ); virtual bool GetTouchAccumulators( int fingerId, float &dx, float &dy );
virtual void SetConsoleTextMode( bool bConsoleTextMode ); virtual void SetConsoleTextMode( bool bConsoleTextMode );
@ -458,8 +460,7 @@ public:
bool m_bRawInputSupported; bool m_bRawInputSupported;
int m_mouseRawAccumX, m_mouseRawAccumY; int m_mouseRawAccumX, m_mouseRawAccumY;
InputEventType_t m_touchAccumEvent; float m_touchAccumX[TOUCH_FINGER_MAX_COUNT], m_touchAccumY[TOUCH_FINGER_MAX_COUNT];
int m_touchAccumFingerId, m_touchAccumX, m_touchAccumY;
// For the 'SleepUntilInput' feature // For the 'SleepUntilInput' feature
HANDLE m_hEvent; HANDLE m_hEvent;

42
inputsystem/touch_sdl.cpp

@ -48,6 +48,9 @@ void CInputSystem::InitializeTouch( void )
// abort startup if user requests no touch // abort startup if user requests no touch
if ( CommandLine()->FindParm("-notouch") ) return; if ( CommandLine()->FindParm("-notouch") ) return;
memset( m_touchAccumX, 0, sizeof(m_touchAccumX) );
memset( m_touchAccumY, 0, sizeof(m_touchAccumY) );
m_bJoystickInitialized = true; m_bJoystickInitialized = true;
SDL_AddEventWatch(TouchSDLWatcher, this); SDL_AddEventWatch(TouchSDLWatcher, this);
} }
@ -61,20 +64,35 @@ void CInputSystem::ShutdownTouch()
m_bTouchInitialized = false; m_bTouchInitialized = false;
} }
void CInputSystem::FingerEvent(int eventType, int fingerId, float x, float y, float dx, float dy) bool CInputSystem::GetTouchAccumulators( int fingerId, float &dx, float &dy )
{ {
// Shit, but should work with arm/x86 dx = m_touchAccumX[fingerId];
dy = m_touchAccumY[fingerId];
int data0 = fingerId << 16 | eventType; m_touchAccumX[fingerId] = m_touchAccumY[fingerId] = 0.f;
int _x = (int)((double)x*0xFFFF);
int _y = (int)((double)y*0xFFFF);
int data1 = _x << 16 | (_y & 0xFFFF);
union{int i;float f;} ifconv; return true;
ifconv.f = dx; }
int _dx = ifconv.i;
ifconv.f = dy;
int _dy = ifconv.i;
PostEvent(data0, m_nLastSampleTick, data1, _dx, _dy); void CInputSystem::FingerEvent(int eventType, int fingerId, float x, float y, float dx, float dy)
{
if( fingerId >= TOUCH_FINGER_MAX_COUNT )
return;
if( eventType == IE_FingerUp )
{
m_touchAccumX[fingerId] = 0.f;
m_touchAccumY[fingerId] = 0.f;
}
else
{
m_touchAccumX[fingerId] += dx;
m_touchAccumY[fingerId] += dy;
}
int _x,_y;
memcpy( &_x, &x, sizeof(float) );
memcpy( &_y, &y, sizeof(float) );
PostEvent(eventType, m_nLastSampleTick, fingerId, _x, _y);
} }

2
public/cdll_int.h

@ -790,7 +790,7 @@ public:
virtual bool IsConnectedUserInfoChangeAllowed( IConVar *pCvar ) = 0; virtual bool IsConnectedUserInfoChangeAllowed( IConVar *pCvar ) = 0;
virtual void IN_TouchEvent( uint data, uint data2, uint data3, uint data4 ) = 0; virtual void IN_TouchEvent( int type, int fingerId, int x, int y ) = 0;
}; };
#define CLIENT_DLL_INTERFACE_VERSION "VClient017" #define CLIENT_DLL_INTERFACE_VERSION "VClient017"

1
public/inputsystem/iinputsystem.h

@ -119,6 +119,7 @@ public:
// read and clear accumulated raw input values // read and clear accumulated raw input values
virtual bool GetRawMouseAccumulators( int& accumX, int& accumY ) = 0; virtual bool GetRawMouseAccumulators( int& accumX, int& accumY ) = 0;
virtual bool GetTouchAccumulators( int fingerId, float &dx, float &dy ) = 0;
// tell the input system that we're not a game, we're console text mode. // tell the input system that we're not a game, we're console text mode.
// this is used for dedicated servers to not initialize joystick system. // this is used for dedicated servers to not initialize joystick system.

23
vguimatsurface/Input.cpp

@ -376,7 +376,7 @@ static vgui::MouseCode ButtonCodeToMouseCode( ButtonCode_t buttonCode )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool InputHandleInputEvent( const InputEvent_t &event ) bool InputHandleInputEvent( const InputEvent_t &event )
{ {
switch( event.m_nType & 0xFFFF ) switch( event.m_nType )
{ {
case IE_ButtonPressed: case IE_ButtonPressed:
{ {
@ -428,9 +428,10 @@ bool InputHandleInputEvent( const InputEvent_t &event )
case IE_FingerDown: case IE_FingerDown:
{ {
int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h); int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h);
uint data = (uint)event.m_nData; float _x, _y;
x = w*((double)((data >> 16) & 0xFFFF) / 0xFFFF); memcpy( &_x, &event.m_nData2, sizeof(_x) );
y = h*((double)(data & 0xFFFF) / 0xFFFF); memcpy( &_y, &event.m_nData3, sizeof(_y) );
x = w*_x; y = h*_y;
g_pIInput->UpdateCursorPosInternal( x, y ); g_pIInput->UpdateCursorPosInternal( x, y );
g_pIInput->SetMouseCodeState( MOUSE_LEFT, vgui::BUTTON_PRESSED ); g_pIInput->SetMouseCodeState( MOUSE_LEFT, vgui::BUTTON_PRESSED );
g_pIInput->InternalMousePressed( MOUSE_LEFT ); g_pIInput->InternalMousePressed( MOUSE_LEFT );
@ -439,9 +440,10 @@ bool InputHandleInputEvent( const InputEvent_t &event )
case IE_FingerUp: case IE_FingerUp:
{ {
int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h); int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h);
uint data = (uint)event.m_nData; float _x, _y;
x = w*((double)((data >> 16) & 0xFFFF) / 0xFFFF); memcpy( &_x, &event.m_nData2, sizeof(_x) );
y = h*((double)(data & 0xFFFF) / 0xFFFF); memcpy( &_y, &event.m_nData3, sizeof(_y) );
x = w*_x; y = h*_y;
g_pIInput->UpdateCursorPosInternal( x, y ); g_pIInput->UpdateCursorPosInternal( x, y );
g_pIInput->SetMouseCodeState( MOUSE_LEFT, vgui::BUTTON_RELEASED ); g_pIInput->SetMouseCodeState( MOUSE_LEFT, vgui::BUTTON_RELEASED );
g_pIInput->InternalMouseReleased( MOUSE_LEFT ); g_pIInput->InternalMouseReleased( MOUSE_LEFT );
@ -450,9 +452,10 @@ bool InputHandleInputEvent( const InputEvent_t &event )
case IE_FingerMotion: case IE_FingerMotion:
{ {
int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h); int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h);
uint data = (uint)event.m_nData; float _x, _y;
x = w*((double)((data >> 16) & 0xFFFF) / 0xFFFF); memcpy( &_x, &event.m_nData2, sizeof(_x) );
y = h*((double)(data & 0xFFFF) / 0xFFFF); memcpy( &_y, &event.m_nData3, sizeof(_y) );
x = w*_x; y = h*_y;
g_pIInput->InternalCursorMoved( x, y ); g_pIInput->InternalCursorMoved( x, y );
} }
return true; return true;

Loading…
Cancel
Save