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

merge GetEvent() and SDLGetEvent() into get_ui_event()

Browse source
This commit is contained in:
Gwenhael Le Moine 2023-05-03 09:40:52 +02:00
parent 4e357f1cb1
commit ba5a83e730
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
4 changed files with 895 additions and 902 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/actions.c
View file

@ -412,12 +412,7 @@ void do_shutdown( void ) {
set_t1 = ticks.t1_ticks; set_t1 = ticks.t1_ticks;
interrupt_called = 0; interrupt_called = 0;
#if defined( GUI_IS_X11 ) if ( get_ui_event() ) {
if ( GetEvent() ) {
#endif
#if defined( GUI_IS_SDL1 )
if ( SDLGetEvent() ) {
#endif
if ( interrupt_called ) if ( interrupt_called )
wake = 1; wake = 1;
} }

9
src/emulate.c
View file

@ -2444,16 +2444,13 @@ inline void schedule( void ) {
if ( got_alarm ) { if ( got_alarm ) {
got_alarm = 0; got_alarm = 0;
#if defined( GUI_IS_X11 )
#ifdef HAVE_XSHM #ifdef HAVE_XSHM
if ( disp.display_update ) if ( disp.display_update )
refresh_display(); refresh_display();
#endif #endif
GetEvent();
#endif get_ui_event();
#if defined( GUI_IS_SDL1 )
SDLGetEvent();
#endif
} }
} }

1778
src/x48_gui.c
View file

File diff suppressed because it is too large Load diff

3
src/x48_gui.h
View file

@ -252,7 +252,7 @@ extern int InitDisplay( int argc, char** argv );
extern void SDLCreateHP(); extern void SDLCreateHP();
#endif #endif
extern int GetEvent( void ); extern int get_ui_event( void );
extern void adjust_contrast( int contrast ); extern void adjust_contrast( int contrast );
#if defined( GUI_IS_X11 ) #if defined( GUI_IS_X11 )
@ -272,7 +272,6 @@ extern void refresh_display( void );
#elif defined( GUI_IS_SDL1 ) #elif defined( GUI_IS_SDL1 )
extern unsigned int ARGBColors[ BLACK + 1 ]; extern unsigned int ARGBColors[ BLACK + 1 ];
extern int SDLGetEvent();
extern SDL_Surface* sdlwindow; extern SDL_Surface* sdlwindow;
extern SDL_Surface* sdlsurface; extern SDL_Surface* sdlsurface;