X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=07d4de7986f2d164aef559a12e4bda7c2893f68a;hb=2ae6ae8ed951e87fcba7c363705cd6ddea8de91c;hp=bc7d5a13c304116bacf57da84c57e721dc069ae5;hpb=998be01ad92a672b69b11e24d472f6c0c076817f;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index bc7d5a13..07d4de79 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -12,6 +12,7 @@
 ***********************************************************/
 
 #include <string.h>
+#include <signal.h>
 
 #include "platform.h"
 
@@ -42,9 +43,9 @@ Visual	       *visual = NULL;
 int		screen = 0;
 Colormap	cmap = None;
 
-DrawWindow	window = NULL;
-DrawBuffer	backbuffer = NULL;
-DrawBuffer	drawto = NULL;
+DrawWindow     *window = NULL;
+DrawBuffer     *backbuffer = NULL;
+DrawBuffer     *drawto = NULL;
 
 int		button_status = MB_NOT_PRESSED;
 boolean		motion_status = FALSE;
@@ -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,17 @@ void InitPlatformDependantStuff(void)
 #if defined(PLATFORM_MSDOS)
   _fmode = O_BINARY;
 #endif
+
+#if !defined(PLATFORM_UNIX)
+  initErrorFile();
+#endif
+}
+
+void ClosePlatformDependantStuff(void)
+{
+#if !defined(PLATFORM_UNIX)
+  dumpErrorFile();
+#endif
 }
 
 void InitProgramInfo(char *unix_userdata_directory, char *program_title,
@@ -159,7 +180,15 @@ inline void InitVideoDisplay(void)
 #endif
 }
 
-inline void InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window,
+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)
 {
@@ -176,7 +205,7 @@ inline void InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window,
 #endif
 }
 
-inline Bitmap CreateBitmapStruct(void)
+inline Bitmap *CreateBitmapStruct(void)
 {
 #ifdef TARGET_SDL
   return checked_calloc(sizeof(struct SDLSurfaceInfo));
@@ -185,9 +214,9 @@ inline Bitmap CreateBitmapStruct(void)
 #endif
 }
 
-inline Bitmap CreateBitmap(int width, int height, int depth)
+inline Bitmap *CreateBitmap(int width, int height, int depth)
 {
-  Bitmap new_bitmap = CreateBitmapStruct();
+  Bitmap *new_bitmap = CreateBitmapStruct();
   int real_depth = GetRealDepth(depth);
 
 #ifdef TARGET_SDL
@@ -226,7 +255,7 @@ inline Bitmap CreateBitmap(int width, int height, int depth)
   return new_bitmap;
 }
 
-inline void FreeBitmap(Bitmap bitmap)
+inline void FreeBitmap(Bitmap *bitmap)
 {
   if (bitmap == NULL)
     return;
@@ -248,7 +277,7 @@ inline void FreeBitmap(Bitmap bitmap)
   free(bitmap);
 }
 
-inline void CloseWindow(DrawWindow window)
+inline void CloseWindow(DrawWindow *window)
 {
 #ifdef TARGET_X11
   if (window->drawable)
@@ -261,7 +290,7 @@ inline void CloseWindow(DrawWindow window)
 #endif
 }
 
-inline void BlitBitmap(Bitmap src_bitmap, Bitmap dst_bitmap,
+inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 		       int src_x, int src_y,
 		       int width, int height,
 		       int dst_x, int dst_y)
@@ -275,7 +304,7 @@ inline void BlitBitmap(Bitmap src_bitmap, Bitmap dst_bitmap,
 #endif
 }
 
-inline void ClearRectangle(Bitmap bitmap, int x, int y, int width, int height)
+inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
 {
 #ifdef TARGET_SDL
   SDLFillRectangle(bitmap, x, y, width, height, 0x000000);
@@ -290,7 +319,7 @@ static GC last_clip_gc = 0;	/* needed for XCopyArea() through clip mask */
 #endif
 #endif
 
-inline void SetClipMask(Bitmap bitmap, GC clip_gc, Pixmap clip_pixmap)
+inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
 {
 #ifdef TARGET_X11
   if (clip_gc)
@@ -304,7 +333,7 @@ inline void SetClipMask(Bitmap bitmap, GC clip_gc, Pixmap clip_pixmap)
 #endif
 }
 
-inline void SetClipOrigin(Bitmap bitmap, GC clip_gc, int clip_x, int clip_y)
+inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
 {
 #ifdef TARGET_X11
   if (clip_gc)
@@ -318,7 +347,7 @@ inline void SetClipOrigin(Bitmap bitmap, GC clip_gc, int clip_x, int clip_y)
 #endif
 }
 
-inline void BlitBitmapMasked(Bitmap src_bitmap, Bitmap dst_bitmap,
+inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 			     int src_x, int src_y,
 			     int width, int height,
 			     int dst_x, int dst_y)
@@ -332,7 +361,7 @@ inline void BlitBitmapMasked(Bitmap src_bitmap, Bitmap dst_bitmap,
 #endif
 }
 
-inline void DrawSimpleWhiteLine(Bitmap bitmap, int from_x, int from_y,
+inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
 				int to_x, int to_y)
 {
 #ifdef TARGET_SDL
@@ -345,7 +374,7 @@ inline void DrawSimpleWhiteLine(Bitmap bitmap, int from_x, int from_y,
 }
 
 #if !defined(TARGET_X11_NATIVE)
-inline void DrawLine(Bitmap bitmap, int from_x, int from_y,
+inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
 		     int to_x, int to_y, Pixel pixel, int line_width)
 {
   int x, y;
@@ -375,7 +404,7 @@ inline void DrawLine(Bitmap bitmap, int from_x, int from_y,
 }
 #endif
 
-inline void DrawLines(Bitmap bitmap, struct XY *points, int num_points,
+inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
 		      Pixel pixel)
 {
 #if !defined(TARGET_X11_NATIVE)
@@ -399,7 +428,7 @@ inline void DrawLines(Bitmap bitmap, struct XY *points, int num_points,
 #endif
 }
 
-inline Pixel GetPixelFromRGB(Bitmap bitmap, unsigned int color_r,
+inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
 			     unsigned int color_g, unsigned int color_b)
 {
   Pixel pixel;
@@ -420,7 +449,7 @@ inline Pixel GetPixelFromRGB(Bitmap bitmap, unsigned int color_r,
   return pixel;
 }
 
-inline Pixel GetPixelFromRGBcompact(Bitmap bitmap, unsigned int color)
+inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
 {
   unsigned int color_r = (color >> 16) & 0xff;
   unsigned int color_g = (color >>  8) & 0xff;
@@ -452,7 +481,8 @@ inline void KeyboardAutoRepeatOn(void)
 		      SDL_DEFAULT_REPEAT_INTERVAL / 2);
   SDL_EnableUNICODE(1);
 #else
-  XAutoRepeatOn(display);
+  if (display)
+    XAutoRepeatOn(display);
 #endif
 }
 
@@ -462,11 +492,12 @@ inline void KeyboardAutoRepeatOff(void)
   SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
   SDL_EnableUNICODE(0);
 #else
-  XAutoRepeatOff(display);
+  if (display)
+    XAutoRepeatOff(display);
 #endif
 }
 
-inline boolean PointerInWindow(DrawWindow window)
+inline boolean PointerInWindow(DrawWindow *window)
 {
 #ifdef TARGET_SDL
   return TRUE;
@@ -515,6 +546,23 @@ inline boolean ChangeVideoModeIfNeeded(boolean fullscreen)
   return fullscreen;
 }
 
+Bitmap *LoadImage(char *basename)
+{
+  Bitmap *new_bitmap;
+  char filename[256];
+
+  sprintf(filename, "%s/%s/%s",
+	  options.ro_base_directory, GRAPHICS_DIRECTORY, basename);
+
+#if defined(TARGET_SDL)
+  new_bitmap = SDLLoadImage(filename);
+#else
+  new_bitmap = X11LoadImage(filename);
+#endif
+
+  return new_bitmap;
+}
+
 
 /* ========================================================================= */
 /* audio functions                                                           */