removed code and image for using virtual buttons from image file

[rocksndiamonds.git] / src / libgame / sdl.c

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index a4fc6fa09d0d6c6465606f2ef808c40e209e013e..4bd1987331b2a0d342f85c35ed666c2b5468fa33 100644 (file)
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -38,7 +38,7 @@ void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32);
 
 #if defined(USE_TOUCH_INPUT_OVERLAY)
 // functions to draw overlay graphics for touch device input
-static void DrawTouchInputOverlay();
+static void DrawTouchInputOverlay(void);
 #endif
 
 void SDLLimitScreenUpdates(boolean enable)
@@ -660,32 +660,6 @@ boolean SDLSetVideoMode(boolean fullscreen)
 
   SDLRedrawWindow();                   // map window
 
-#ifdef DEBUG
-#if defined(PLATFORM_WIN32)
-  // experimental drag and drop code
-
-  SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
-
-  {
-    SDL_SysWMinfo wminfo;
-    HWND hwnd;
-    boolean wminfo_success = FALSE;
-
-    SDL_VERSION(&wminfo.version);
-
-    if (sdl_window)
-      wminfo_success = SDL_GetWindowWMInfo(sdl_window, &wminfo);
-
-    if (wminfo_success)
-    {
-      hwnd = wminfo.info.win.window;
-
-      DragAcceptFiles(hwnd, TRUE);
-    }
-  }
-#endif
-#endif
-
   return success;
 }
 
@@ -2388,40 +2362,6 @@ void SDLWaitEvent(Event *event)
   SDL_WaitEvent(event);
 }
 
-void SDLHandleWindowManagerEvent(Event *event)
-{
-#ifdef DEBUG
-#if defined(PLATFORM_WIN32)
-  // experimental drag and drop code
-
-  SDL_SysWMEvent *syswmevent = (SDL_SysWMEvent *)event;
-  SDL_SysWMmsg *syswmmsg = (SDL_SysWMmsg *)(syswmevent->msg);
-
-  if (syswmmsg->msg.win.msg == WM_DROPFILES)
-  {
-    HDROP hdrop = (HDROP)syswmmsg->msg.win.wParam;
-    int i, num_files;
-
-    printf("::: SDL_SYSWMEVENT:\n");
-
-    num_files = DragQueryFile(hdrop, 0xffffffff, NULL, 0);
-
-    for (i = 0; i < num_files; i++)
-    {
-      int buffer_len = DragQueryFile(hdrop, i, NULL, 0);
-      char buffer[buffer_len + 1];
-
-      DragQueryFile(hdrop, i, buffer, buffer_len + 1);
-
-      printf("::: - '%s'\n", buffer);
-    }
-
-    DragFinish((HDROP)syswmmsg->msg.win.wParam);
-  }
-#endif
-#endif
-}
-
 
 // ============================================================================
 // joystick functions
@@ -2945,12 +2885,8 @@ static void DrawTouchInputOverlay_ShowGridButtons(int alpha)
 
 static void DrawTouchInputOverlay(void)
 {
-  static SDL_Texture *texture = NULL;
-  static boolean initialized = FALSE;
   static boolean deactivated = TRUE;
   static boolean show_grid = FALSE;
-  static int width = 0, height = 0;
-  static int alpha_last = -1;
   static int alpha = 0;
   int alpha_max = ALPHA_FROM_TRANSPARENCY(setup.touch.transparency);
   int alpha_step = ALPHA_FADING_STEPSIZE(alpha_max);
@@ -2983,72 +2919,5 @@ static void DrawTouchInputOverlay(void)
     DrawTouchInputOverlay_ShowGrid(alpha);
 
   DrawTouchInputOverlay_ShowGridButtons(alpha);
-
-  return;
-
-
-  // !!! VIRTUAL BUTTONS FROM IMAGE FILE NOT USED ANYMORE !!!
-
-  if (!initialized)
-  {
-    char *basename = "overlay/VirtualButtons.png";
-    char *filename = getCustomImageFilename(basename);
-
-    if (filename == NULL)
-      Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
-
-    SDL_Surface *surface;
-
-    if ((surface = IMG_Load(filename)) == NULL)
-      Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
-
-    width  = surface->w;
-    height = surface->h;
-
-    // set black pixel to transparent if no alpha channel / transparent color
-    if (!SDLHasAlpha(surface) &&
-       !SDLHasColorKey(surface))
-      SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL,
-                     SDL_MapRGB(surface->format, 0x00, 0x00, 0x00));
-
-    if ((texture = SDLCreateTextureFromSurface(surface)) == NULL)
-      Error(ERR_EXIT, "SDLCreateTextureFromSurface() failed");
-
-    SDL_FreeSurface(surface);
-
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-
-    initialized = TRUE;
-  }
-
-  if (alpha != alpha_last)
-    SDL_SetTextureAlphaMod(texture, alpha);
-
-  alpha_last = alpha;
-
-  float ratio_overlay = (float) width / height;
-  float ratio_screen = (float) video.screen_width / video.screen_height;
-  int width_scaled, height_scaled;
-  int xpos, ypos;
-
-  if (ratio_overlay > ratio_screen)
-  {
-    width_scaled = video.screen_width;
-    height_scaled = video.screen_height * ratio_screen / ratio_overlay;
-    xpos = 0;
-    ypos = video.screen_height - height_scaled;
-  }
-  else
-  {
-    width_scaled = video.screen_width * ratio_overlay / ratio_screen;
-    height_scaled = video.screen_height;
-    xpos = (video.screen_width - width_scaled) / 2;
-    ypos = 0;
-  }
-
-  SDL_Rect src_rect = { 0, 0, width, height };
-  SDL_Rect dst_rect = { xpos, ypos, width_scaled, height_scaled };
-
-  SDL_RenderCopy(sdl_renderer, texture, &src_rect, &dst_rect);
 }
 #endif