libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-25 19:30:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Add way to exit cleanly through a message. Warning fix.

Browse Source
This commit is contained in:
Henrik Rydgård 2014-02-07 11:33:31 +01:00
parent cf52650724
commit 4a743ca627
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
base/PCMain.cpp
View File

@ -47,7 +47,8 @@ GlobalUIState lastUIState = UISTATE_MENU;
#endif #endif
static SDL_Surface* g_Screen = NULL; static SDL_Surface* g_Screen = NULL;
bool g_ToggleFullScreenNextFrame = false; static bool g_ToggleFullScreenNextFrame = false;
static int g_QuitRequested = 0;
#if defined(MAEMO) || defined(PANDORA) #if defined(MAEMO) || defined(PANDORA)
#define EGL #define EGL
@ -214,6 +215,9 @@ void Vibrate(int length_ms) {
void System_SendMessage(const char *command, const char *parameter) { void System_SendMessage(const char *command, const char *parameter) {
if (!strcmp(command, "toggle_fullscreen")) { if (!strcmp(command, "toggle_fullscreen")) {
g_ToggleFullScreenNextFrame = true; g_ToggleFullScreenNextFrame = true;
} else if (!strcmp(command, "finish")) {
// Do a clean exit
g_QuitRequested = true;
} }
} }
@ -381,7 +385,10 @@ void ToggleFullScreenIfFlagSet() {
#undef main #undef main
#endif #endif
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
putenv("SDL_VIDEO_CENTERED=1"); // Avoid warning about conversion from const char * to char *
char envTemp[256];
strcpy(envTemp, "SDL_VIDEO_CENTERED=1");
putenv(envTemp);
std::string app_name; std::string app_name;
std::string app_name_nice; std::string app_name_nice;
@ -588,7 +595,6 @@ int main(int argc, char *argv[]) {
while (true) { while (true) {
input_state.accelerometer_valid = false; input_state.accelerometer_valid = false;
input_state.mouse_valid = true; input_state.mouse_valid = true;
int quitRequested = 0;
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
@ -597,7 +603,7 @@ int main(int argc, char *argv[]) {
switch (event.type) { switch (event.type) {
case SDL_QUIT: case SDL_QUIT:
quitRequested = 1; g_QuitRequested = 1;
break; break;
case SDL_KEYDOWN: case SDL_KEYDOWN:
{ {
@ -738,7 +744,7 @@ int main(int argc, char *argv[]) {
} }
} }
if (quitRequested) if (g_QuitRequested)
break; break;
const uint8 *keys = (const uint8 *)SDL_GetKeyState(NULL); const uint8 *keys = (const uint8 *)SDL_GetKeyState(NULL);