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

swat SDL_ready for a return bool

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-04-15 11:01:51 +02:00
parent 8ae1cc8ae4
commit 6503b906da
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gui.c
View file

@ -91,8 +91,6 @@ typedef struct {
static TTF_Font* ttffont = NULL; static TTF_Font* ttffont = NULL;
static TTF_Font* ttffont2 = NULL; static TTF_Font* ttffont2 = NULL;
bool SDL_ready = false;
SDL_Window* window = NULL; SDL_Window* window = NULL;
SDL_Renderer* renderer = NULL; SDL_Renderer* renderer = NULL;
SDL_Texture* texTarget = NULL; SDL_Texture* texTarget = NULL;
@ -1493,16 +1491,16 @@ bool gui_events()
return true; return true;
} }
void gui_init( void ) bool gui_init( void )
{ {
if ( SDL_Init( SDL_INIT_VIDEO | IMG_INIT_PNG | SDL_INIT_TIMER ) < 0 ) { if ( SDL_Init( SDL_INIT_VIDEO | IMG_INIT_PNG | SDL_INIT_TIMER ) < 0 ) {
printf( "SDL could not initialize! SDL_Error: %s\n", SDL_GetError() ); printf( "SDL could not initialize! SDL_Error: %s\n", SDL_GetError() );
return; return false;
} }
if ( TTF_Init() == -1 ) { if ( TTF_Init() == -1 ) {
fprintf( stderr, "Erreur d'initialisation de TTF_Init : %s\n", TTF_GetError() ); fprintf( stderr, "Erreur d'initialisation de TTF_Init : %s\n", TTF_GetError() );
exit( EXIT_FAILURE ); return false;
} }
ttffont = TTF_OpenFont( config.ui_font, 7 * UI_SCALE ); ttffont = TTF_OpenFont( config.ui_font, 7 * UI_SCALE );
@ -1514,17 +1512,17 @@ void gui_init( void )
window = SDL_CreateWindow( "hpemu", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, window_width, window_height, SDL_WINDOW_SHOWN ); window = SDL_CreateWindow( "hpemu", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, window_width, window_height, SDL_WINDOW_SHOWN );
if ( window == NULL ) { if ( window == NULL ) {
printf( "Window could not be created! SDL_Error: %s\n", SDL_GetError() ); printf( "Window could not be created! SDL_Error: %s\n", SDL_GetError() );
return; return false;
} }
renderer = SDL_CreateRenderer( window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC ); renderer = SDL_CreateRenderer( window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC );
if ( renderer == NULL ) { if ( renderer == NULL ) {
printf( "Erreur lors de la creation d'un renderer : %s", SDL_GetError() ); printf( "Erreur lors de la creation d'un renderer : %s", SDL_GetError() );
return; return false;
} }
tex2Target = SDL_CreateTexture( renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, 504, 1124 ); tex2Target = SDL_CreateTexture( renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, window_width, window_height );
texTarget = SDL_CreateTexture( renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, 504, 1124 ); texTarget = SDL_CreateTexture( renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, window_width, window_height );
SDL_UpdateWindowSurface( window ); SDL_UpdateWindowSurface( window );
@ -1532,10 +1530,10 @@ void gui_init( void )
printf( "init done\n" ); printf( "init done\n" );
SDL_ready = true; return true;
} }
void gui_exit( void ) bool gui_exit( void )
{ {
TTF_CloseFont( ttffont ); TTF_CloseFont( ttffont );
TTF_CloseFont( ttffont2 ); TTF_CloseFont( ttffont2 );
@ -1544,4 +1542,6 @@ void gui_exit( void )
SDL_DestroyRenderer( renderer ); SDL_DestroyRenderer( renderer );
SDL_DestroyWindow( window ); SDL_DestroyWindow( window );
SDL_Quit(); SDL_Quit();
return true;
} }

6
src/gui.h
View file

@ -3,11 +3,9 @@
#include <stdbool.h> #include <stdbool.h>
extern bool SDL_ready;
extern void SDL__display_show( void ); extern void SDL__display_show( void );
extern bool gui_events(); extern bool gui_events();
extern void gui_init( void ); extern bool gui_init( void );
extern void gui_exit( void ); extern bool gui_exit( void );
#endif #endif

6
src/main.c
View file

@ -22,11 +22,13 @@ int main( int argc, char* argv[] )
{ {
parse_args( argc, argv ); parse_args( argc, argv );
gui_init(); if ( !gui_init() )
exit( EXIT_FAILURE );
emulator_init( "rom", "ram", "port1", "port2" ); emulator_init( "rom", "ram", "port1", "port2" );
while ( !please_exit ) { while ( !please_exit ) {
if ( please_exit || !SDL_ready ) if ( please_exit )
break; break;
currentTime = SDL_GetTicks(); currentTime = SDL_GetTicks();