RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-10 06:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: client: touch: generalise touch emulation code

Browse Source 
* fix doubleclicks and wheels in VGUI
This commit is contained in:
Alibek Omarov
2022-10-12 05:18:19 +03:00
parent 5a0fcfffb0
commit 2d2523df4a
9 changed files with 185 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/platform/linux/in_evdev.c
+7 -14
View File
@@ -343,23 +343,16 @@ void IN_EvdevFrame ( void )
{
switch ( ev.code )
{
case REL_X: dx += ev.value;
case REL_X:
dx += ev.value;
break;
case REL_Y: dy += ev.value;
case REL_Y:
dy += ev.value;
break;
case REL_WHEEL:
if( ev.value > 0)
{
Key_Event( K_MWHEELDOWN, 1 );
Key_Event( K_MWHEELDOWN, 0 );
}
else
{
Key_Event( K_MWHEELUP, 1 );
Key_Event( K_MWHEELUP, 0 );
}
case REL_WHEEL:
IN_MWheelEvent( ev.value );
break;
}
}
@@ -367,7 +360,7 @@ void IN_EvdevFrame ( void )
{
int key = KeycodeFromEvdev( ev.code, ev.value );
if( CVAR_TO_BOOL(evdev_keydebug) )
if( CVAR_TO_BOOL( evdev_keydebug ))
Con_Printf( "key %d %d %d\n", ev.code, key, ev.value );
Key_Event( key , ev.value );
engine/platform/sdl/events.c
+13 -24
View File
@@ -250,18 +250,6 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
Key_Event( keynum, down );
}
static void SDLash_MouseKey( int key, int down, int istouch )
{
if( CVAR_TO_BOOL( touch_emulate ) )
{
Touch_KeyEvent( key, down );
}
else if( in_mouseinitialized && !m_ignore->value && !istouch )
{
Key_Event( key, down );
}
}
/*
=============
SDLash_MouseEvent
@@ -270,14 +258,20 @@ SDLash_MouseEvent
*/
static void SDLash_MouseEvent( SDL_MouseButtonEvent button )
{
int down = button.state != SDL_RELEASED;
uint mstate = 0;
int down;
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
if( button.which == SDL_TOUCH_MOUSEID )
return;
#endif
if( button.state == SDL_RELEASED )
down = 0;
else if( button.clicks >= 2 )
down = 2; // special state for double-click in UI
else
down = 1;
switch( button.button )
{
case SDL_BUTTON_LEFT:
@@ -297,10 +291,10 @@ static void SDLash_MouseEvent( SDL_MouseButtonEvent button )
break;
#if ! SDL_VERSION_ATLEAST( 2, 0, 0 )
case SDL_BUTTON_WHEELUP:
Key_Event( K_MWHEELUP, down );
IN_MWheelEvent( -1 );
break;
case SDL_BUTTON_WHEELDOWN:
Key_Event( K_MWHEELDOWN, down );
IN_MWheelEvent( 1 );
break;
#endif // ! SDL_VERSION_ATLEAST( 2, 0, 0 )
default:
@@ -435,9 +429,7 @@ static void SDLash_EventFilter( SDL_Event *event )
/* Mouse events */
case SDL_MOUSEMOTION:
if( host.mouse_visible )
{
SDL_GetRelativeMouseState( NULL, NULL );
}
break;
case SDL_MOUSEBUTTONUP:
@@ -478,12 +470,8 @@ static void SDLash_EventFilter( SDL_Event *event )
break;
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
case SDL_MOUSEWHEEL:
{
int wheelbutton = event->wheel.y < 0 ? K_MWHEELDOWN : K_MWHEELUP;
Key_Event( wheelbutton, true );
Key_Event( wheelbutton, false );
IN_MWheelEvent( event->wheel.y );
break;
}
/* Touch events */
case SDL_FINGERDOWN:
@@ -556,7 +544,8 @@ static void SDLash_EventFilter( SDL_Event *event )
{
// Swap axis to follow default axis binding:
// LeftX, LeftY, RightX, RightY, TriggerRight, TriggerLeft
static int sdlControllerAxisToEngine[] = {
static int sdlControllerAxisToEngine[] =
{
JOY_AXIS_SIDE, // SDL_CONTROLLER_AXIS_LEFTX,
JOY_AXIS_FWD, // SDL_CONTROLLER_AXIS_LEFTY,
JOY_AXIS_PITCH, // SDL_CONTROLLER_AXIS_RIGHTX,
engine/platform/sdl/in_sdl.c
+4 -3
View File
@@ -333,11 +333,12 @@ void Platform_SetCursorType( VGUI_DefaultCursor type )
break;
}
host.mouse_visible = visible;
if( CVAR_TO_BOOL( touch_emulate ))
// never disable cursor in touch emulation mode
if( !visible && touch_emulate.value )
return;
host.mouse_visible = visible;
#if SDL_VERSION_ATLEAST( 2, 0, 0 )
if( host.mouse_visible )
{