X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=2d2551a22444c5e1ae83b237a034b01d84c30027;hb=c42db18f39053cf2ec85943c37a20b8caa742d09;hp=5be4c0dc173c9ea57455fcba7a3046eb8b88af36;hpb=c8689f0335cd584d24570046c6eb5a3b75701305;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 5be4c0dc..2d2551a2 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -69,12 +69,14 @@ static void FinalizeScreen(int draw_target)
 
 static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay)
 {
-  static unsigned int update_screen_delay = 0;
-  unsigned int update_screen_delay_value = 50;		// (milliseconds)
+  if (program.headless)
+    return;
+
+  static DelayCounter update_screen_delay = { 50 };	// (milliseconds)
   SDL_Surface *screen = backbuffer->surface;
 
   if (limit_screen_updates &&
-      !DelayReached(&update_screen_delay, update_screen_delay_value))
+      !DelayReached(&update_screen_delay))
     return;
 
   LimitScreenUpdates(FALSE);
@@ -154,24 +156,23 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay)
   SDL_Rect src_rect_up = { 0, 0,  video.width, video.height };
   SDL_Rect dst_rect_up = dst_rect_screen;
 
-  if (video.shifted_up || video.shifted_up_delay)
+  if (video.shifted_up || video.shifted_up_delay.count)
   {
     int time_current = SDL_GetTicks();
     int pos = video.shifted_up_pos;
     int pos_last = video.shifted_up_pos_last;
 
-    if (!DelayReachedExt(&video.shifted_up_delay, video.shifted_up_delay_value,
-			 time_current))
+    if (!DelayReachedExt(&video.shifted_up_delay, time_current))
     {
-      int delay = time_current - video.shifted_up_delay;
-      int delay_value = video.shifted_up_delay_value;
+      int delay_count = time_current - video.shifted_up_delay.count;
+      int delay_value = video.shifted_up_delay.value;
 
-      pos = pos_last + (pos - pos_last) * delay / delay_value;
+      pos = pos_last + (pos - pos_last) * delay_count / delay_value;
     }
     else
     {
       video.shifted_up_pos_last = pos;
-      video.shifted_up_delay = 0;
+      video.shifted_up_delay.count = 0;
     }
 
     src_rect_up.y = pos;
@@ -225,7 +226,7 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay)
 
   // global synchronization point of the game to align video frame delay
   if (with_frame_delay)
-    WaitUntilDelayReached(&video.frame_delay, video.frame_delay_value);
+    WaitUntilDelayReached(&video.frame_delay);
 
   video.frame_counter++;
 
@@ -555,6 +556,7 @@ static boolean SDLCreateScreen(boolean fullscreen)
   int screen_height = video.screen_height;
   int surface_flags = (fullscreen ? surface_flags_fullscreen :
 		       surface_flags_window);
+  int display_nr = options.display_nr;
 
   // default window size is unscaled
   video.window_width  = screen_width;
@@ -590,15 +592,14 @@ static boolean SDLCreateScreen(boolean fullscreen)
 
     if (sdl_window)
     {
-      SDL_DestroyWindow(sdl_window);
-      sdl_window = NULL;
+      SDL_SetWindowSize(sdl_window, video.window_width, video.window_height);
     }
   }
 
   if (sdl_window == NULL)
     sdl_window = SDL_CreateWindow(program.window_title,
-				  SDL_WINDOWPOS_CENTERED,
-				  SDL_WINDOWPOS_CENTERED,
+				  SDL_WINDOWPOS_CENTERED_DISPLAY(display_nr),
+				  SDL_WINDOWPOS_CENTERED_DISPLAY(display_nr),
 				  video.window_width,
 				  video.window_height,
 				  surface_flags);
@@ -798,7 +799,8 @@ void SDLSetWindowFullscreen(boolean fullscreen)
   {
     SDLSetWindowScaling(setup.window_scaling_percent);
     SDL_SetWindowPosition(sdl_window,
-			  SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
+			  SDL_WINDOWPOS_CENTERED_DISPLAY(options.display_nr),
+			  SDL_WINDOWPOS_CENTERED_DISPLAY(options.display_nr));
 
     video.fullscreen_initial = FALSE;
   }
@@ -1452,14 +1454,14 @@ static void _PutPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
       case 1:
       {
 	// Assuming 8-bpp
-	*((Uint8 *)surface->pixels + y*surface->pitch + x) = color;
+	*((Uint8 *)surface->pixels + y * surface->pitch + x) = color;
       }
       break;
 
       case 2:
       {
 	// Probably 15-bpp or 16-bpp
-	*((Uint16 *)surface->pixels + y*surface->pitch/2 + x) = color;
+	*((Uint16 *)surface->pixels + y * surface->pitch / 2 + x) = color;
       }
       break;
 
@@ -1470,20 +1472,20 @@ static void _PutPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
 	int shift;
 
 	// Gack - slow, but endian correct
-	pix = (Uint8 *)surface->pixels + y * surface->pitch + x*3;
+	pix = (Uint8 *)surface->pixels + y * surface->pitch + x * 3;
 	shift = surface->format->Rshift;
-	*(pix+shift/8) = color>>shift;
+	*(pix + shift / 8) = color>>shift;
 	shift = surface->format->Gshift;
-	*(pix+shift/8) = color>>shift;
+	*(pix + shift / 8) = color>>shift;
 	shift = surface->format->Bshift;
-	*(pix+shift/8) = color>>shift;
+	*(pix + shift / 8) = color>>shift;
       }
       break;
 
       case 4:
       {
 	// Probably 32-bpp
-	*((Uint32 *)surface->pixels + y*surface->pitch/4 + x) = color;
+	*((Uint32 *)surface->pixels + y * surface->pitch / 4 + x) = color;
       }
       break;
     }
@@ -1499,12 +1501,12 @@ static void _PutPixelRGB(SDL_Surface *surface, Sint16 x, Sint16 y,
 
 static void _PutPixel8(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
 {
-  *((Uint8 *)surface->pixels + y*surface->pitch + x) = color;
+  *((Uint8 *)surface->pixels + y * surface->pitch + x) = color;
 }
 
 static void _PutPixel16(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
 {
-  *((Uint16 *)surface->pixels + y*surface->pitch/2 + x) = color;
+  *((Uint16 *)surface->pixels + y * surface->pitch / 2 + x) = color;
 }
 
 static void _PutPixel24(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
@@ -1513,38 +1515,38 @@ static void _PutPixel24(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
   int shift;
 
   // Gack - slow, but endian correct
-  pix = (Uint8 *)surface->pixels + y * surface->pitch + x*3;
+  pix = (Uint8 *)surface->pixels + y * surface->pitch + x * 3;
   shift = surface->format->Rshift;
-  *(pix+shift/8) = color>>shift;
+  *(pix + shift / 8) = color>>shift;
   shift = surface->format->Gshift;
-  *(pix+shift/8) = color>>shift;
+  *(pix + shift / 8) = color>>shift;
   shift = surface->format->Bshift;
-  *(pix+shift/8) = color>>shift;
+  *(pix + shift / 8) = color>>shift;
 }
 
 static void _PutPixel32(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
 {
-  *((Uint32 *)surface->pixels + y*surface->pitch/4 + x) = color;
+  *((Uint32 *)surface->pixels + y * surface->pitch / 4 + x) = color;
 }
 
-static void _PutPixelX(SDL_Surface *dest,Sint16 x,Sint16 y,Uint32 color)
+static void _PutPixelX(SDL_Surface *dest, Sint16 x, Sint16 y, Uint32 color)
 {
   switch (dest->format->BytesPerPixel)
   {
     case 1:
-      *((Uint8 *)dest->pixels + y*dest->pitch + x) = color;
+      *((Uint8 *)dest->pixels + y * dest->pitch + x) = color;
       break;
 
     case 2:
-      *((Uint16 *)dest->pixels + y*dest->pitch/2 + x) = color;
+      *((Uint16 *)dest->pixels + y * dest->pitch / 2 + x) = color;
       break;
 
     case 3:
-      _PutPixel24(dest,x,y,color);
+      _PutPixel24(dest, x, y, color);
       break;
 
     case 4:
-      *((Uint32 *)dest->pixels + y*dest->pitch/4 + x) = color;
+      *((Uint32 *)dest->pixels + y * dest->pitch / 4 + x) = color;
       break;
   }
 }
@@ -1582,19 +1584,19 @@ static Sint32 sge_CalcYPitch(SDL_Surface *dest, Sint16 y)
     switch (dest->format->BytesPerPixel)
     {
       case 1:
-	return y*dest->pitch;
+	return y * dest->pitch;
 	break;
 
       case 2:
-	return y*dest->pitch/2;
+	return y * dest->pitch / 2;
 	break;
 
       case 3:
-	return y*dest->pitch;
+	return y * dest->pitch;
 	break;
 
       case 4:
-	return y*dest->pitch/4;
+	return y * dest->pitch / 4;
 	break;
     }
   }
@@ -1630,13 +1632,13 @@ static void sge_pPutPixel(SDL_Surface *surface, Sint16 x, Sint32 ypitch,
 	int shift;
 
 	// Gack - slow, but endian correct
-	pix = (Uint8 *)surface->pixels + ypitch + x*3;
+	pix = (Uint8 *)surface->pixels + ypitch + x * 3;
 	shift = surface->format->Rshift;
-	*(pix+shift/8) = color>>shift;
+	*(pix + shift / 8) = color>>shift;
 	shift = surface->format->Gshift;
-	*(pix+shift/8) = color>>shift;
+	*(pix + shift / 8) = color>>shift;
 	shift = surface->format->Bshift;
-	*(pix+shift/8) = color>>shift;
+	*(pix + shift / 8) = color>>shift;
       }
       break;
 
@@ -1904,22 +1906,6 @@ void SDLPutPixel(Bitmap *dst_bitmap, int x, int y, Pixel pixel)
 // quick (no, it's slow) and dirty hack to "invert" rectangle inside SDL surface
 // ----------------------------------------------------------------------------
 
-void SDLInvertArea(Bitmap *bitmap, int src_x, int src_y,
-		   int width, int height, Uint32 color)
-{
-  int x, y;
-
-  for (y = src_y; y < src_y + height; y++)
-  {
-    for (x = src_x; x < src_x + width; x++)
-    {
-      Uint32 pixel = SDLGetPixel(bitmap, x, y);
-
-      SDLPutPixel(bitmap, x, y, pixel == BLACK_PIXEL ? color : BLACK_PIXEL);
-    }
-  }
-}
-
 void SDLCopyInverseMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 			  int src_x, int src_y, int width, int height,
 			  int dst_x, int dst_y)