catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better event handling

This commit is contained in:
georgemoralis 2023-09-14 18:47:42 +03:00
parent 61280cb6cf
commit da2a942415
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/emulator.cpp
View File

@ -5,6 +5,7 @@
namespace Emulator { namespace Emulator {
static WindowCtx* g_window_ctx = nullptr; static WindowCtx* g_window_ctx = nullptr;
bool m_emu_needs_exit = false;
void emuInit(u32 width, u32 height) { void emuInit(u32 width, u32 height) {
g_window_ctx = new WindowCtx; g_window_ctx = new WindowCtx;
@ -23,17 +24,17 @@ static void CreateSdlWindow(WindowCtx* ctx) {
} }
ctx->m_window = SDL_CreateWindowWithPosition("shadps4", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, ctx->m_window = SDL_CreateWindowWithPosition("shadps4", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height,
(static_cast<uint32_t>(SDL_WINDOW_HIDDEN) | static_cast<uint32_t>(SDL_WINDOW_VULKAN))); (static_cast<uint32_t>(SDL_WINDOW_HIDDEN) | static_cast<uint32_t>(SDL_WINDOW_VULKAN)));
ctx->is_window_hidden = true;//hide window until we need to show something (should draw something in buffers) ctx->is_window_hidden = true; // hide window until we need to show something (should draw something in buffers)
if (ctx->m_window == nullptr) { if (ctx->m_window == nullptr) {
printf("%s\n", SDL_GetError()); printf("%s\n", SDL_GetError());
std::_Exit(0); std::_Exit(0);
} }
SDL_SetWindowResizable(ctx->m_window, SDL_FALSE);//we don't support resizable atm SDL_SetWindowResizable(ctx->m_window, SDL_FALSE); // we don't support resizable atm
SDL_ShowWindow(g_window_ctx->m_window);//TODO should be removed just left it over to make it fancy :D SDL_ShowWindow(g_window_ctx->m_window); // TODO should be removed just left it over to make it fancy :D
} }
void emuRun() { void emuRun() {
g_window_ctx->m_mutex.LockMutex(); g_window_ctx->m_mutex.LockMutex();
@ -44,25 +45,40 @@ void emuRun() {
g_window_ctx->m_graphic_initialized_cond.SignalCondVar(); g_window_ctx->m_graphic_initialized_cond.SignalCondVar();
} }
g_window_ctx->m_mutex.UnlockMutex(); g_window_ctx->m_mutex.UnlockMutex();
auto* pdata = new EmuPrivate; bool exit_loop = false;
pdata->m_graphic_ctx = static_cast<HLE::Libs::Graphics::GraphicCtx*>(&g_window_ctx->m_graphic_ctx);
pdata->data1 = pdata;
pdata->data2 = new SDL_Event;
pdata->m_screen_width = pdata->m_graphic_ctx->screen_width;
pdata->m_screen_height = pdata->m_graphic_ctx->screen_height;
for (;;) { for (;;) {
SDL_Event* ev = static_cast<SDL_Event*>(pdata->data2); if (exit_loop) {
if (SDL_PollEvent(ev)!= 0) break;
{ }
printf("Event: 0x%04\n", ev->type);
printf("]"); SDL_Event event;
if (SDL_PollEvent(&event) != 0) {
printf("Event: 0x%04\n", event.type);
switch (event.type) {
case SDL_EVENT_QUIT: m_emu_needs_exit = true; break;
case SDL_EVENT_TERMINATING: m_emu_needs_exit = true; break;
case SDL_EVENT_WILL_ENTER_BACKGROUND: break;
case SDL_EVENT_DID_ENTER_BACKGROUND: break;
case SDL_EVENT_WILL_ENTER_FOREGROUND: break;
case SDL_EVENT_DID_ENTER_FOREGROUND: break;
case SDL_EVENT_KEY_DOWN:
case SDL_EVENT_KEY_UP: break;
}
continue;
}
exit_loop = m_emu_needs_exit;
if (!exit_loop) {
HLE::Libs::Graphics::VideoOut::videoOutFlip(100000); // flip every 0.1 sec
} }
HLE::Libs::Graphics::VideoOut::videoOutFlip(100000); // flip every 0.1 sec
} }
std::_Exit(0); std::_Exit(0);
} }