d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of git.sr.ht:~rabbits/uxn

This commit is contained in:
neauoire 2021-12-16 10:48:21 -08:00
parent ca1d830055 73c1ecccc0
commit 256e597e48
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/uxnemu.c
View File

@ -193,7 +193,6 @@ quit(void)
gRenderer = NULL; gRenderer = NULL;
SDL_DestroyWindow(gWindow); SDL_DestroyWindow(gWindow);
SDL_Quit(); SDL_Quit();
exit(0);
} }
static int static int
@ -227,6 +226,7 @@ init(void)
SDL_CreateThread(stdin_handler, "stdin", NULL); SDL_CreateThread(stdin_handler, "stdin", NULL);
SDL_StartTextInput(); SDL_StartTextInput();
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
return 1; return 1;
} }
@ -489,7 +489,8 @@ doctrl(Uxn *u, SDL_Event *event, int z)
case SDLK_F1: if(z) set_zoom(zoom > 2 ? 1 : zoom + 1); break; case SDLK_F1: if(z) set_zoom(zoom > 2 ? 1 : zoom + 1); break;
case SDLK_F2: if(z) devsystem->dat[0xe] = !devsystem->dat[0xe]; break; case SDLK_F2: if(z) devsystem->dat[0xe] = !devsystem->dat[0xe]; break;
case SDLK_F3: if(z) capture_screen(); break; case SDLK_F3: if(z) capture_screen(); break;
case SDLK_F4: if(z) restart(u); break; case SDLK_AC_BACK:
case SDLK_F4: if(z) restart(u); break;
} }
/* clang-format on */ /* clang-format on */
if(z) { if(z) {
@ -524,11 +525,16 @@ run(Uxn *u)
redraw(u); redraw(u);
while(!devsystem->dat[0xf]) { while(!devsystem->dat[0xf]) {
SDL_Event event; SDL_Event event;
double elapsed, start = 0; double elapsed, begin = 0;
if(!BENCH) if(!BENCH)
start = SDL_GetPerformanceCounter(); begin = SDL_GetPerformanceCounter();
while(SDL_PollEvent(&event) != 0) { while(SDL_PollEvent(&event) != 0) {
switch(event.type) { switch(event.type) {
case SDL_DROPFILE:
set_size(WIDTH, HEIGHT, 0);
start(u, event.drop.file);
SDL_free(event.drop.file);
break;
case SDL_QUIT: case SDL_QUIT:
return error("Run", "Quit."); return error("Run", "Quit.");
case SDL_TEXTINPUT: case SDL_TEXTINPUT:
@ -561,7 +567,7 @@ run(Uxn *u)
if(ppu.reqdraw || devsystem->dat[0xe]) if(ppu.reqdraw || devsystem->dat[0xe])
redraw(u); redraw(u);
if(!BENCH) { if(!BENCH) {
elapsed = (SDL_GetPerformanceCounter() - start) / (double)SDL_GetPerformanceFrequency() * 1000.0f; elapsed = (SDL_GetPerformanceCounter() - begin) / (double)SDL_GetPerformanceFrequency() * 1000.0f;
SDL_Delay(clamp(16.666f - elapsed, 0, 1000)); SDL_Delay(clamp(16.666f - elapsed, 0, 1000));
} }
} }