gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ui_sdl] remove mouse motion event handling

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-06-12 14:23:55 +02:00
parent 7700923cae
commit 835a88eba7
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 5 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/ui_sdl.c
View file

@ -1229,7 +1229,8 @@ static inline void draw_row( long addr, int row )
void sdl_get_event( void ) void sdl_get_event( void )
{ {
SDL_Event event; SDL_Event event;
int hpkey;
int hpkey = -1;
static int lasthpkey = -1; // last key that was pressed or -1 for none static int lasthpkey = -1; // last key that was pressed or -1 for none
static int lastticks = -1; // time at which a key was pressed or -1 if timer expired static int lastticks = -1; // time at which a key was pressed or -1 if timer expired
static bool lastislongpress = false; // last key press was a long press static bool lastislongpress = false; // last key press was a long press
@ -1242,61 +1243,20 @@ void sdl_get_event( void )
lastticks = -1; lastticks = -1;
// Check that the mouse is still on the same last key // Check that the mouse is still on the same last key
int x, y, state; int x, y;
state = SDL_GetMouseState( &x, &y ); int state = SDL_GetMouseState( &x, &y );
if ( state & SDL_BUTTON( 1 ) && mouse_click_to_hpkey( x, y ) == lasthpkey ) if ( state & SDL_BUTTON( 1 ) && mouse_click_to_hpkey( x, y ) == lasthpkey )
lastislongpress = true; lastislongpress = true;
} }
// Iterate as long as there are events // Iterate as long as there are events
// while( SDL_PollEvent( &event ) ) while ( SDL_PollEvent( &event ) ) {
if ( SDL_PollEvent( &event ) ) {
switch ( event.type ) { switch ( event.type ) {
case SDL_QUIT: case SDL_QUIT:
please_exit = true; please_exit = true;
break; break;
// Mouse move: react to state changes in the BUTTONS that are
// pressed
case SDL_MOUSEMOTION:
hpkey = mouse_click_to_hpkey( event.motion.x, event.motion.y );
if ( event.motion.state & SDL_BUTTON( 1 ) ) {
// Mouse moves on a key different from the last key
// (state change):
// - release last (if last was pressed)
// - press new (if new is pressed)
if ( hpkey != lasthpkey ) {
pressed_hpkey = hpkey;
if ( lasthpkey != -1 ) {
if ( !lastislongpress ) {
release_all_keys();
/* rv = true; */
}
// Stop timer, clear long key press
lastticks = -1;
lastislongpress = false;
}
if ( hpkey != -1 ) {
if ( !keyboard[ hpkey ].pressed ) // If a key is down, it
// can't be down another
// time
{
press_key( hpkey );
// Start timer
lastticks = SDL_GetTicks();
}
}
}
lasthpkey = hpkey;
}
if ( hpkey == -1 ) // Needed to avoid pressing and moving
// outside of a button releases
lasthpkey = -1;
break;
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
hpkey = mouse_click_to_hpkey( event.button.x, event.button.y ); hpkey = mouse_click_to_hpkey( event.button.x, event.button.y );
// React to mouse up/down when click over a button // React to mouse up/down when click over a button
@ -1309,7 +1269,6 @@ void sdl_get_event( void )
// Start timer // Start timer
lastticks = SDL_GetTicks(); lastticks = SDL_GetTicks();
break; break;
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
hpkey = mouse_click_to_hpkey( event.button.x, event.button.y ); hpkey = mouse_click_to_hpkey( event.button.x, event.button.y );
// React to mouse up/down when click over a button // React to mouse up/down when click over a button