pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add defines to disable setlocale and fork. Disable that code by default for now.

Browse source
This commit is contained in:
Michael Sartain 2013-02-05 12:10:54 -08:00
parent f398faa548
commit 079d0ee977
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/video/x11/SDL_x11messagebox.c
View file

@ -31,7 +31,8 @@
#include <locale.h> #include <locale.h>
#define SDL_FORK_MESSAGEBOX 1 #define SDL_FORK_MESSAGEBOX 0
#define SDL_SET_LOCALE 0
#if SDL_FORK_MESSAGEBOX #if SDL_FORK_MESSAGEBOX
#include <sys/types.h> #include <sys/types.h>
@ -645,13 +646,16 @@ X11_ShowMessageBoxImpl(const SDL_MessageBoxData *messageboxdata, int *buttonid)
{ {
int ret; int ret;
SDL_MessageBoxDataX11 data; SDL_MessageBoxDataX11 data;
#if SDL_SET_LOCALE
char *origlocale; char *origlocale;
#endif
SDL_zero(data); SDL_zero(data);
if ( !SDL_X11_LoadSymbols() ) if ( !SDL_X11_LoadSymbols() )
return -1; return -1;
#if SDL_SET_LOCALE
origlocale = setlocale(LC_ALL, NULL); origlocale = setlocale(LC_ALL, NULL);
if (origlocale != NULL) { if (origlocale != NULL) {
origlocale = SDL_strdup(origlocale); origlocale = SDL_strdup(origlocale);
@ -661,6 +665,7 @@ X11_ShowMessageBoxImpl(const SDL_MessageBoxData *messageboxdata, int *buttonid)
} }
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
} }
#endif
/* This code could get called from multiple threads maybe? */ /* This code could get called from multiple threads maybe? */
XInitThreads(); XInitThreads();
@ -682,10 +687,12 @@ X11_ShowMessageBoxImpl(const SDL_MessageBoxData *messageboxdata, int *buttonid)
X11_MessageBoxShutdown( &data ); X11_MessageBoxShutdown( &data );
#if SDL_SET_LOCALE
if (origlocale) { if (origlocale) {
setlocale(LC_ALL, origlocale); setlocale(LC_ALL, origlocale);
SDL_free(origlocale); SDL_free(origlocale);
} }
#endif
return ret; return ret;
} }
@ -700,6 +707,9 @@ X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
int fds[2]; int fds[2];
int status = 0; int status = 0;
/* Need to flush here in case someone has turned grab off and it hasn't gone through yet, etc. */
XFlush(data->display);
if (pipe(fds) == -1) { if (pipe(fds) == -1) {
return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */ return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */
} }