X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=341da455c5f8f7487613279510d42362bf7e30e9;hb=d2098db6b7b0cee3b43e341c012beec5bc6ef6bd;hp=7ee3e857872d332b18b2a5083c8d1028f11fdc99;hpb=ae32fd8a4316c5d7f18fe6966f999ebf5509df94;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 7ee3e857..341da455 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -12,6 +12,7 @@
 ***********************************************************/
 
 #include <string.h>
+#include <signal.h>
 
 #include "platform.h"
 
@@ -56,7 +57,7 @@ int		FrameCounter = 0;
 
 
 /* ========================================================================= */
-/* init functions                                                            */
+/* init/close functions                                                      */
 /* ========================================================================= */
 
 void InitCommandName(char *argv0)
@@ -68,6 +69,15 @@ void InitCommandName(char *argv0)
 void InitExitFunction(void (*exit_function)(int))
 {
   program.exit_function = exit_function;
+
+  /* set signal handlers to custom exit function */
+  signal(SIGINT, exit_function);
+  signal(SIGTERM, exit_function);
+
+#if defined(TARGET_SDL)
+  /* set exit function to automatically cleanup SDL stuff after exit() */
+  atexit(SDL_Quit);
+#endif
 }
 
 void InitPlatformDependantStuff(void)
@@ -75,6 +85,22 @@ void InitPlatformDependantStuff(void)
 #if defined(PLATFORM_MSDOS)
   _fmode = O_BINARY;
 #endif
+
+#if !defined(PLATFORM_UNIX)
+  initErrorFile();
+#endif
+
+#if defined(TARGET_SDL)
+  if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0)
+    Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
+#endif
+}
+
+void ClosePlatformDependantStuff(void)
+{
+#if !defined(PLATFORM_UNIX)
+  dumpErrorFile();
+#endif
 }
 
 void InitProgramInfo(char *unix_userdata_directory, char *program_title,
@@ -159,6 +185,14 @@ inline void InitVideoDisplay(void)
 #endif
 }
 
+inline void CloseVideoDisplay(void)
+{
+#if defined(TARGET_X11)
+  if (display)
+    XCloseDisplay(display);
+#endif
+}
+
 inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
 			    int width, int height, int depth,
 			    boolean fullscreen)
@@ -452,7 +486,8 @@ inline void KeyboardAutoRepeatOn(void)
 		      SDL_DEFAULT_REPEAT_INTERVAL / 2);
   SDL_EnableUNICODE(1);
 #else
-  XAutoRepeatOn(display);
+  if (display)
+    XAutoRepeatOn(display);
 #endif
 }
 
@@ -462,7 +497,8 @@ inline void KeyboardAutoRepeatOff(void)
   SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
   SDL_EnableUNICODE(0);
 #else
-  XAutoRepeatOff(display);
+  if (display)
+    XAutoRepeatOff(display);
 #endif
 }