X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=df401b5a57a6ebea20d8f539f6eedff4be5076b9;hp=ecfc7fccf92f20733dbeb2b4fc97f542b3460016;hb=6c674ccdd458314ced75459649c6acf1489b6056;hpb=4dad971280a07058d01449d5e6db2b036470015d

diff --git a/src/libgame/system.c b/src/libgame/system.c
index ecfc7fcc..df401b5a 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -50,12 +50,12 @@ DrawBuffer	       *drawto = NULL;
 
 int			button_status = MB_NOT_PRESSED;
 boolean			motion_status = FALSE;
+int			wheel_steps = DEFAULT_WHEEL_STEPS;
 #if defined(TARGET_SDL2)
 boolean			keyrepeat_status = TRUE;
 #endif
 
 int			redraw_mask = REDRAW_NONE;
-int			redraw_tiles = 0;
 
 int			FrameCounter = 0;
 
@@ -64,8 +64,7 @@ int			FrameCounter = 0;
 /* init/close functions                                                      */
 /* ========================================================================= */
 
-void InitProgramInfo(char *argv0, char *config_filename,
-		     char *userdata_subdir, char *userdata_subdir_unix,
+void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir,
 		     char *program_title, char *icon_title,
 		     char *icon_filename, char *cookie_prefix,
 		     int program_version)
@@ -76,7 +75,6 @@ void InitProgramInfo(char *argv0, char *config_filename,
   program.config_filename = config_filename;
 
   program.userdata_subdir = userdata_subdir;
-  program.userdata_subdir_unix = userdata_subdir_unix;
   program.userdata_path = getUserGameDataDir();
 
   program.program_title = program_title;
@@ -121,7 +119,7 @@ void InitExitFunction(void (*exit_function)(int))
   program.exit_function = exit_function;
 
   /* set signal handlers to custom exit function */
-  signal(SIGINT, exit_function);
+  // signal(SIGINT, exit_function);
   signal(SIGTERM, exit_function);
 
   /* set exit function to automatically cleanup SDL stuff after exit() */
@@ -133,10 +131,6 @@ void InitPlatformDependentStuff(void)
   // this is initialized in GetOptions(), but may already be used before
   options.verbose = TRUE;
 
-#if defined(PLATFORM_MACOSX)
-  updateUserGameDataDir();
-#endif
-
   OpenLogFiles();
 
 #if defined(TARGET_SDL2)
@@ -172,8 +166,6 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
 
   gfx.field_save_buffer = field_save_buffer;
 
-  gfx.drawing_area_changed = FALSE;
-
   SetDrawDeactivationMask(REDRAW_NONE);		/* do not deactivate drawing */
   SetDrawBackgroundMask(REDRAW_NONE);		/* deactivate masked drawing */
 }
@@ -210,12 +202,26 @@ void InitGfxDoor3Info(int ex, int ey, int exsize, int eysize)
 
 void InitGfxWindowInfo(int win_xsize, int win_ysize)
 {
+  if (win_xsize != gfx.win_xsize || win_ysize != gfx.win_ysize)
+  {
+    ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize);
+
+#if defined(TARGET_SDL2)
+    ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize);
+#endif
+
+    ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize);
+    ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize);
+    ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize);
+    ReCreateBitmap(&gfx.fade_bitmap_black,  win_xsize, win_ysize);
+
+    ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize);
+  }
+
   gfx.win_xsize = win_xsize;
   gfx.win_ysize = win_ysize;
 
   gfx.background_bitmap_mask = REDRAW_NONE;
-
-  ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
 }
 
 void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height)
@@ -240,6 +246,16 @@ void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void))
   gfx.draw_busy_anim_function = draw_busy_anim_function;
 }
 
+void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int))
+{
+  gfx.draw_global_anim_function = draw_global_anim_function;
+}
+
+void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int))
+{
+  gfx.draw_global_border_function = draw_global_border_function;
+}
+
 void InitGfxCustomArtworkInfo()
 {
   gfx.override_level_graphics = FALSE;
@@ -320,9 +336,12 @@ inline static int GetRealDepth(int depth)
 }
 
 inline static void sysFillRectangle(Bitmap *bitmap, int x, int y,
-			       int width, int height, Pixel color)
+				    int width, int height, Pixel color)
 {
   SDLFillRectangle(bitmap, x, y, width, height, color);
+
+  if (bitmap == backbuffer)
+    SetRedrawMaskFromArea(x, y, width, height);
 }
 
 inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
@@ -331,6 +350,9 @@ inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 {
   SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
 	      dst_x, dst_y, mask_mode);
+
+  if (dst_bitmap == backbuffer)
+    SetRedrawMaskFromArea(dst_x, dst_y, width, height);
 }
 
 void LimitScreenUpdates(boolean enable)
@@ -361,7 +383,12 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
 
   video.window_scaling_available = WINDOW_SCALING_STATUS;
 
-  SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
+  video.frame_delay = 0;
+  video.frame_delay_value = GAME_FRAME_DELAY;
+
+  video.shifted_up = FALSE;
+
+  SDLInitVideoBuffer(fullscreen);
 
   video.initialized = TRUE;
 
@@ -402,7 +429,7 @@ void FreeBitmap(Bitmap *bitmap)
 
 Bitmap *CreateBitmapStruct(void)
 {
-  return checked_calloc(sizeof(struct SDLSurfaceInfo));
+  return checked_calloc(sizeof(Bitmap));
 }
 
 Bitmap *CreateBitmap(int width, int height, int depth)
@@ -420,9 +447,9 @@ Bitmap *CreateBitmap(int width, int height, int depth)
   return new_bitmap;
 }
 
-void ReCreateBitmap(Bitmap **bitmap, int width, int height, int depth)
+void ReCreateBitmap(Bitmap **bitmap, int width, int height)
 {
-  Bitmap *new_bitmap = CreateBitmap(width, height, depth);
+  Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH);
 
   if (*bitmap == NULL)
   {
@@ -439,6 +466,28 @@ void CloseWindow(DrawWindow *window)
 {
 }
 
+void SetRedrawMaskFromArea(int x, int y, int width, int height)
+{
+  int x1 = x;
+  int y1 = y;
+  int x2 = x + width - 1;
+  int y2 = y + height - 1;
+
+  if (width == 0 || height == 0)
+    return;
+
+  if (IN_GFX_FIELD_FULL(x1, y1) && IN_GFX_FIELD_FULL(x2, y2))
+    redraw_mask |= REDRAW_FIELD;
+  else if (IN_GFX_DOOR_1(x1, y1) && IN_GFX_DOOR_1(x2, y2))
+    redraw_mask |= REDRAW_DOOR_1;
+  else if (IN_GFX_DOOR_2(x1, y1) && IN_GFX_DOOR_2(x2, y2))
+    redraw_mask |= REDRAW_DOOR_2;
+  else if (IN_GFX_DOOR_3(x1, y1) && IN_GFX_DOOR_3(x2, y2))
+    redraw_mask |= REDRAW_DOOR_3;
+  else
+    redraw_mask = REDRAW_ALL;
+}
+
 inline static boolean CheckDrawingArea(int x, int y, int width, int height,
 				       int draw_mask)
 {
@@ -474,16 +523,6 @@ boolean DrawingOnBackground(int x, int y)
 	  CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
 }
 
-boolean DrawingAreaChanged()
-{
-  int drawing_area_changed = gfx.drawing_area_changed;
-
-  // reset flag for change of drawing area after querying it
-  gfx.drawing_area_changed = FALSE;
-
-  return drawing_area_changed;
-}
-
 static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y,
 				  int *width, int *height, boolean is_dest)
 {
@@ -638,7 +677,7 @@ void BlitBitmapTiled(Bitmap *src_bitmap, Bitmap *dst_bitmap,
   }
 }
 
-void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
+void FadeRectangle(int x, int y, int width, int height,
 		   int fade_mode, int fade_delay, int post_delay,
 		   void (*draw_border_function)(void))
 {
@@ -646,7 +685,7 @@ void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
   if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE))
     return;
 
-  SDLFadeRectangle(bitmap_cross, x, y, width, height,
+  SDLFadeRectangle(x, y, width, height,
 		   fade_mode, fade_delay, post_delay, draw_border_function);
 }
 
@@ -706,6 +745,56 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 	       dst_x, dst_y);
 }
 
+void BlitTexture(Bitmap *bitmap,
+		int src_x, int src_y, int width, int height,
+		int dst_x, int dst_y)
+{
+  if (bitmap == NULL)
+    return;
+
+  SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y,
+		 BLIT_OPAQUE);
+}
+
+void BlitTextureMasked(Bitmap *bitmap,
+		       int src_x, int src_y, int width, int height,
+		       int dst_x, int dst_y)
+{
+  if (bitmap == NULL)
+    return;
+
+  SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y,
+		 BLIT_MASKED);
+}
+
+void BlitToScreen(Bitmap *bitmap,
+		  int src_x, int src_y, int width, int height,
+		  int dst_x, int dst_y)
+{
+  if (bitmap == NULL)
+    return;
+
+  if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP)
+    BlitBitmap(bitmap, gfx.final_screen_bitmap, src_x, src_y,
+	       width, height, dst_x, dst_y);
+  else
+    BlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y);
+}
+
+void BlitToScreenMasked(Bitmap *bitmap,
+			int src_x, int src_y, int width, int height,
+			int dst_x, int dst_y)
+{
+  if (bitmap == NULL)
+    return;
+
+  if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP)
+    BlitBitmapMasked(bitmap, gfx.final_screen_bitmap, src_x, src_y,
+		     width, height, dst_x, dst_y);
+  else
+    BlitTextureMasked(bitmap, src_x, src_y, width, height, dst_x, dst_y);
+}
+
 void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y,
 			 int to_x, int to_y)
 {
@@ -801,14 +890,19 @@ void KeyboardAutoRepeatOff(void)
 #endif
 }
 
-boolean PointerInWindow(DrawWindow *window)
+boolean SetVideoMode(boolean fullscreen)
 {
-  return TRUE;
+  return SDLSetVideoMode(fullscreen);
 }
 
-boolean SetVideoMode(boolean fullscreen)
+void SetVideoFrameDelay(unsigned int frame_delay_value)
+{
+  video.frame_delay_value = frame_delay_value;
+}
+
+unsigned int GetVideoFrameDelay()
 {
-  return SDLSetVideoMode(&backbuffer, fullscreen);
+  return video.frame_delay_value;
 }
 
 boolean ChangeVideoModeIfNeeded(boolean fullscreen)
@@ -841,7 +935,7 @@ Bitmap *LoadCustomImage(char *basename)
     Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
 
   if ((new_bitmap = LoadImage(filename)) == NULL)
-    Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
+    Error(ERR_EXIT, "LoadImage('%s') failed: %s", basename, GetError());
 
   return new_bitmap;
 }
@@ -868,7 +962,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
 
   if ((new_bitmap = LoadImage(filename)) == NULL)
   {
-    Error(ERR_WARN, "LoadImage() failed: %s", GetError());
+    Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError());
     return;
   }
 
@@ -885,30 +979,9 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
   free(new_bitmap);
 }
 
-Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
-{
-  Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
-
-  return dst_bitmap;
-}
-
-static void SetMaskedBitmapSurface(Bitmap *bitmap)
+static Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
 {
-  if (bitmap == NULL)
-    return;
-
-  SDL_Surface *surface = bitmap->surface;
-
-  if (bitmap->surface_masked)
-    SDL_FreeSurface(bitmap->surface_masked);
-
-  SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL,
-		  SDL_MapRGB(surface->format, 0x00, 0x00, 0x00));
-
-  if ((bitmap->surface_masked = SDLGetNativeSurface(surface)) == NULL)
-    Error(ERR_EXIT, "SDL_DisplayFormat() failed");
-
-  SDL_SetColorKey(surface, UNSET_TRANSPARENT_PIXEL, 0);
+  return SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
 }
 
 void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
@@ -935,8 +1008,6 @@ void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
 
   bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new;
   bitmaps[IMG_BITMAP_GAME]   = bitmap_new;
-
-  SetMaskedBitmapSurface(bitmap_new);
 }
 
 static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
@@ -1104,12 +1175,6 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
     bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
   }
 
-  // create corresponding bitmaps for masked blitting
-  for (i = 0; i < NUM_IMG_BITMAPS; i++)
-    if (bitmaps[i] != NULL &&
-	bitmaps[i] != old_bitmap)
-      SetMaskedBitmapSurface(bitmaps[i]);
-
   UPDATE_BUSY_STATE();
 
   print_timestamp_done("CreateScaledBitmaps");
@@ -1121,6 +1186,16 @@ void CreateBitmapWithSmallBitmaps(Bitmap **bitmaps, int zoom_factor,
   CreateScaledBitmaps(bitmaps, zoom_factor, tile_size, TRUE);
 }
 
+void CreateBitmapTextures(Bitmap **bitmaps)
+{
+  SDLCreateBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]);
+}
+
+void FreeBitmapTextures(Bitmap **bitmaps)
+{
+  SDLFreeBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]);
+}
+
 void ScaleBitmap(Bitmap **bitmaps, int zoom_factor)
 {
   CreateScaledBitmaps(bitmaps, zoom_factor, 0, FALSE);
@@ -1438,6 +1513,29 @@ KeyMod GetKeyModStateFromEvents()
   return HandleKeyModState(KSYM_UNDEFINED, 0);
 }
 
+void StartTextInput(int x, int y)
+{
+#if defined(TARGET_SDL2)
+  SDL_StartTextInput();
+
+#if defined(HAS_SCREEN_KEYBOARD)
+  if (y > video.height / 2)
+    video.shifted_up = TRUE;
+#endif
+#endif
+}
+
+void StopTextInput()
+{
+#if defined(TARGET_SDL2)
+  SDL_StopTextInput();
+
+#if defined(HAS_SCREEN_KEYBOARD)
+  video.shifted_up = FALSE;
+#endif
+#endif
+}
+
 boolean CheckCloseWindowEvent(ClientMessageEvent *event)
 {
   if (event->type != EVENT_CLIENTMESSAGE)