X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=eee5d59ac56cee2d054f4ecbd79fa788982569c5;hb=db63673f22dc3107dfdb431c2881235039285e07;hp=df5b32425fe870d6c0d9547b19bafdc5b5e1bdcd;hpb=22c1545e660b56b81728829aec43de128934ae04;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index df5b3242..eee5d59a 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -245,6 +245,20 @@ static void UpdateScreen_WithoutFrameDelay(SDL_Rect *rect)
   UpdateScreenExt(rect, FALSE);
 }
 
+void Delay_WithScreenUpdates(unsigned int delay)
+{
+  unsigned int time_current = SDL_GetTicks();
+  unsigned int time_delayed = time_current + delay;
+
+  while (time_current < time_delayed)
+  {
+    // updating the screen contains waiting for frame delay (non-busy)
+    UpdateScreen_WithFrameDelay(NULL);
+
+    time_current = SDL_GetTicks();
+  }
+}
+
 static void SDLSetWindowIcon(char *basename)
 {
   /* (setting the window icon on Mac OS X would replace the high-quality
@@ -1389,20 +1403,7 @@ void SDLFadeRectangle(int x, int y, int width, int height,
   }
 
   if (post_delay > 0)
-  {
-    unsigned int time_post_delay;
-
-    time_current = SDL_GetTicks();
-    time_post_delay = time_current + post_delay;
-
-    while (time_current < time_post_delay)
-    {
-      // updating the screen contains waiting for frame delay (non-busy)
-      UpdateScreen_WithFrameDelay(NULL);
-
-      time_current = SDL_GetTicks();
-    }
-  }
+    Delay_WithScreenUpdates(post_delay);
 
   // restore function for drawing global masked border
   gfx.draw_global_border_function = draw_global_border_function;
@@ -3012,6 +3013,13 @@ static void DrawTouchInputOverlay_ShowGrid(int alpha)
   SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 255);
 }
 
+static void RenderFillRectangle(int x, int y, int width, int height)
+{
+  SDL_Rect rect = { x, y, width, height };
+
+  SDL_RenderFillRect(sdl_renderer, &rect);
+}
+
 static void DrawTouchInputOverlay_ShowGridButtons(int alpha)
 {
   static int alpha_direction = 0;
@@ -3052,44 +3060,91 @@ static void DrawTouchInputOverlay_ShowGridButtons(int alpha)
   {
     for (y = 0; y < grid_ysize; y++)
     {
+      int grid_button = overlay.grid_button[x][y];
+      int grid_button_action = GET_ACTION_FROM_GRID_BUTTON(grid_button);
+      int alpha_draw = alpha;
+      int outline_border = MV_NONE;
+      int border_size = 2;
+      boolean draw_outlined = setup.touch.draw_outlined;
+      boolean draw_pressed = setup.touch.draw_pressed;
+
+      if (grid_button == CHAR_GRID_BUTTON_NONE)
+	continue;
+
+      if (grid_button == overlay.grid_button_highlight)
+	alpha_draw = alpha_highlight;
+
+      if (draw_pressed && overlay.grid_button_action & grid_button_action)
+      {
+	if (draw_outlined)
+	  draw_outlined = FALSE;
+	else
+	  alpha_draw = MIN((float)alpha_draw * 1.5, SDL_ALPHA_OPAQUE);
+      }
+
+      SDL_SetRenderDrawColor(sdl_renderer, 255, 255, 255, alpha_draw);
+
       rect.x = (x + 0) * video.screen_width  / grid_xsize;
       rect.y = (y + 0) * video.screen_height / grid_ysize;
       rect.w = (x + 1) * video.screen_width  / grid_xsize - rect.x;
       rect.h = (y + 1) * video.screen_height / grid_ysize - rect.y;
 
-      if (x == 0 ||
-	  overlay.grid_button[x - 1][y] != overlay.grid_button[x][y])
+      if (x == 0 || overlay.grid_button[x - 1][y] != grid_button)
       {
-	rect.x += 2;
-	rect.w -= 2;
+	rect.x += border_size;
+	rect.w -= border_size;
+
+	outline_border |= MV_LEFT;
       }
 
-      if (x == grid_xsize - 1 ||
-	  overlay.grid_button[x + 1][y] != overlay.grid_button[x][y])
+      if (x == grid_xsize - 1 || overlay.grid_button[x + 1][y] != grid_button)
       {
-	rect.w -= 2;
+	rect.w -= border_size;
+
+	outline_border |= MV_RIGHT;
       }
 
-      if (y == 0 ||
-	  overlay.grid_button[x][y - 1] != overlay.grid_button[x][y])
+      if (y == 0 || overlay.grid_button[x][y - 1] != grid_button)
       {
-	rect.y += 2;
-	rect.h -= 2;
+	rect.y += border_size;
+	rect.h -= border_size;
+
+	outline_border |= MV_UP;
       }
 
-      if (y == grid_ysize - 1 ||
-	  overlay.grid_button[x][y + 1] != overlay.grid_button[x][y])
+      if (y == grid_ysize - 1 || overlay.grid_button[x][y + 1] != grid_button)
       {
-	rect.h -= 2;
+	rect.h -= border_size;
+
+	outline_border |= MV_DOWN;
       }
 
-      if (overlay.grid_button[x][y] == overlay.grid_button_highlight)
-	SDL_SetRenderDrawColor(sdl_renderer, 255, 255, 255, alpha_highlight);
-      else
-	SDL_SetRenderDrawColor(sdl_renderer, 255, 255, 255, alpha);
+      if (draw_outlined)
+      {
+	int rect_x = rect.x +
+	  (outline_border & MV_LEFT  ? border_size : 0);
+	int rect_w = rect.w -
+	  (outline_border & MV_LEFT  ? border_size : 0) -
+	  (outline_border & MV_RIGHT ? border_size : 0);
+
+	if (outline_border & MV_LEFT)
+	  RenderFillRectangle(rect.x, rect.y, border_size, rect.h);
+
+	if (outline_border & MV_RIGHT)
+	  RenderFillRectangle(rect.x + rect.w - border_size, rect.y,
+			      border_size, rect.h);
 
-      if (overlay.grid_button[x][y] != CHAR_GRID_BUTTON_NONE)
+	if (outline_border & MV_UP)
+	  RenderFillRectangle(rect_x, rect.y, rect_w, border_size);
+
+	if (outline_border & MV_DOWN)
+	  RenderFillRectangle(rect_x, rect.y + rect.h - border_size,
+			      rect_w, border_size);
+      }
+      else
+      {
 	SDL_RenderFillRect(sdl_renderer, &rect);
+      }
     }
   }